diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6ffad04..013eed0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 
 ### Description
 
-Version: `1.0.3`
+Version: `1.0.5`
 
 <!-- Describe what happened. Include as much detail as necessary. -->
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7d81687..354a617 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 
 ### Description
 
-- Version: `1.0.3`
+- Version: `1.0.5`
 - Filed By: @sgammon
 - Linked Issue: `Bloombox/OpenCannabis#1`
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e37e6d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+node_modules/
+languages/
+release/
+.DS_Store
+*.DS_Store
diff --git a/README.md b/README.md
index 5eed09f..503a168 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 
 # OpenCannabis
-## Release __1.0.3__
+## Release __1.0.5__
 
 _An Open Model for the Legal Cannabis Industry_
 
@@ -38,13 +38,11 @@ schema categories include:
 - `structs`: Commonly-referenced structures and enumerations such as `Grow` and `Species`.
              Pricing, testing, and other extensions are stored under `structs`.
 
-In the `languages` folder, you'll find a language implementation for the full set of schemas.
-Currently-supported languages include:
-
+After executing `make`, in the `languages` folder, you'll find a language implementation
+for the full set of schemas in each of the following languages.
 - [C++](https://github.com/Bloombox/OpenCannabis/tree/master/languages/cpp)
 - [C#](https://github.com/Bloombox/OpenCannabis/tree/master/languages/csharp)
 - [Java](https://github.com/Bloombox/OpenCannabis/tree/master/languages/java)
-- [JavaNano](https://github.com/Bloombox/OpenCannabis/tree/master/languages/javanano)
 - [JavaScript](https://github.com/Bloombox/OpenCannabis/tree/master/languages/js)
 - [PHP](https://github.com/Bloombox/OpenCannabis/tree/master/languages/php)
 - [Python](https://github.com/Bloombox/OpenCannabis/tree/master/languages/python)
@@ -62,3 +60,4 @@ Coming soon.
 ### Contributing
 
 Coming soon.
+
diff --git a/languages/cpp/Product.pb.cc b/languages/cpp/Product.pb.cc
deleted file mode 100644
index 0e32116..0000000
--- a/languages/cpp/Product.pb.cc
+++ /dev/null
@@ -1,802 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "Product.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ProductDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Product>
-     _instance;
-} _Product_default_instance_;
-
-namespace protobuf_Product_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, key_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, data_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Product)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Product_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "Product.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_base_2fProductKey_2eproto::InitDefaults();
-  ::protobuf_base_2fProductType_2eproto::InitDefaults();
-  ::google::protobuf::protobuf_google_2fprotobuf_2fany_2eproto::InitDefaults();
-  _Product_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Product_default_instance_);_Product_default_instance_._instance.get_mutable()->key_ = const_cast< ::ProductKey*>(
-      ::ProductKey::internal_default_instance());
-  _Product_default_instance_._instance.get_mutable()->type_ = const_cast< ::ProductType*>(
-      ::ProductType::internal_default_instance());
-  _Product_default_instance_._instance.get_mutable()->data_ = const_cast< ::google::protobuf::Any*>(
-      ::google::protobuf::Any::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\rProduct.proto\032\025base/ProductKey.proto\032\026"
-      "base/ProductType.proto\032\031google/protobuf/"
-      "any.proto\"c\n\007Product\022\030\n\003key\030\001 \001(\0132\013.Prod"
-      "uctKey\022\032\n\004type\030\002 \001(\0132\014.ProductType\022\"\n\004da"
-      "ta\030\003 \001(\0132\024.google.protobuf.AnyB-\n\027io.blo"
-      "ombox.schema.baseB\013BaseProductH\001P\001\370\001\001b\006p"
-      "roto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 245);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "Product.proto", &protobuf_RegisterTypes);
-  ::protobuf_base_2fProductKey_2eproto::AddDescriptors();
-  ::protobuf_base_2fProductType_2eproto::AddDescriptors();
-  ::google::protobuf::protobuf_google_2fprotobuf_2fany_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_Product_2eproto
-
-
-// ===================================================================
-
-void Product::_slow_mutable_key() {
-  key_ = ::google::protobuf::Arena::CreateMessage< ::ProductKey >(
-      GetArenaNoVirtual());
-}
-::ProductKey* Product::_slow_release_key() {
-  if (key_ == NULL) {
-    return NULL;
-  } else {
-    ::ProductKey* temp = new ::ProductKey(*key_);
-    key_ = NULL;
-    return temp;
-  }
-}
-::ProductKey* Product::unsafe_arena_release_key() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Product.key)
-  
-  ::ProductKey* temp = key_;
-  key_ = NULL;
-  return temp;
-}
-void Product::_slow_set_allocated_key(
-    ::google::protobuf::Arena* message_arena, ::ProductKey** key) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*key) == NULL) {
-      message_arena->Own(*key);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*key)) {
-      ::ProductKey* new_key = 
-            ::google::protobuf::Arena::CreateMessage< ::ProductKey >(
-            message_arena);
-      new_key->CopyFrom(**key);
-      *key = new_key;
-    }
-}
-void Product::unsafe_arena_set_allocated_key(
-    ::ProductKey* key) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete key_;
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Product.key)
-}
-void Product::_slow_mutable_type() {
-  type_ = ::google::protobuf::Arena::CreateMessage< ::ProductType >(
-      GetArenaNoVirtual());
-}
-::ProductType* Product::_slow_release_type() {
-  if (type_ == NULL) {
-    return NULL;
-  } else {
-    ::ProductType* temp = new ::ProductType(*type_);
-    type_ = NULL;
-    return temp;
-  }
-}
-::ProductType* Product::unsafe_arena_release_type() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Product.type)
-  
-  ::ProductType* temp = type_;
-  type_ = NULL;
-  return temp;
-}
-void Product::_slow_set_allocated_type(
-    ::google::protobuf::Arena* message_arena, ::ProductType** type) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*type) == NULL) {
-      message_arena->Own(*type);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*type)) {
-      ::ProductType* new_type = 
-            ::google::protobuf::Arena::CreateMessage< ::ProductType >(
-            message_arena);
-      new_type->CopyFrom(**type);
-      *type = new_type;
-    }
-}
-void Product::unsafe_arena_set_allocated_type(
-    ::ProductType* type) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete type_;
-  }
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Product.type)
-}
-void Product::_slow_mutable_data() {
-  data_ = ::google::protobuf::Arena::Create< ::google::protobuf::Any >(
-      GetArenaNoVirtual());
-}
-::google::protobuf::Any* Product::_slow_release_data() {
-  if (data_ == NULL) {
-    return NULL;
-  } else {
-    ::google::protobuf::Any* temp = new ::google::protobuf::Any(*data_);
-    data_ = NULL;
-    return temp;
-  }
-}
-::google::protobuf::Any* Product::unsafe_arena_release_data() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Product.data)
-  
-  ::google::protobuf::Any* temp = data_;
-  data_ = NULL;
-  return temp;
-}
-void Product::unsafe_arena_set_allocated_data(
-    ::google::protobuf::Any* data) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete data_;
-  }
-  data_ = data;
-  if (data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Product.data)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Product::kKeyFieldNumber;
-const int Product::kTypeFieldNumber;
-const int Product::kDataFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Product::Product()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_Product_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Product)
-}
-Product::Product(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_Product_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Product)
-}
-Product::Product(const Product& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_key()) {
-    key_ = new ::ProductKey(*from.key_);
-  } else {
-    key_ = NULL;
-  }
-  if (from.has_type()) {
-    type_ = new ::ProductType(*from.type_);
-  } else {
-    type_ = NULL;
-  }
-  if (from.has_data()) {
-    data_ = new ::google::protobuf::Any(*from.data_);
-  } else {
-    data_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:Product)
-}
-
-void Product::SharedCtor() {
-  ::memset(&key_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&data_) -
-      reinterpret_cast<char*>(&key_)) + sizeof(data_));
-  _cached_size_ = 0;
-}
-
-Product::~Product() {
-  // @@protoc_insertion_point(destructor:Product)
-  SharedDtor();
-}
-
-void Product::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete key_;
-  if (this != internal_default_instance()) delete type_;
-  if (this != internal_default_instance()) delete data_;
-}
-
-void Product::ArenaDtor(void* object) {
-  Product* _this = reinterpret_cast< Product* >(object);
-  (void)_this;
-}
-void Product::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Product::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Product::descriptor() {
-  protobuf_Product_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_Product_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Product& Product::default_instance() {
-  protobuf_Product_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Product* Product::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Product>(arena);
-}
-
-void Product::Clear() {
-// @@protoc_insertion_point(message_clear_start:Product)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) {
-    delete key_;
-  }
-  key_ = NULL;
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) {
-    delete type_;
-  }
-  type_ = NULL;
-  if (GetArenaNoVirtual() == NULL && data_ != NULL) {
-    delete data_;
-  }
-  data_ = NULL;
-  _internal_metadata_.Clear();
-}
-
-bool Product::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Product)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .ProductKey key = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_key()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .ProductType type = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_type()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .google.protobuf.Any data = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_data()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Product)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Product)
-  return false;
-#undef DO_
-}
-
-void Product::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Product)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->key_, output);
-  }
-
-  // .ProductType type = 2;
-  if (this->has_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->type_, output);
-  }
-
-  // .google.protobuf.Any data = 3;
-  if (this->has_data()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, *this->data_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Product)
-}
-
-::google::protobuf::uint8* Product::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Product)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->key_, deterministic, target);
-  }
-
-  // .ProductType type = 2;
-  if (this->has_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->type_, deterministic, target);
-  }
-
-  // .google.protobuf.Any data = 3;
-  if (this->has_data()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        3, *this->data_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Product)
-  return target;
-}
-
-size_t Product::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Product)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->key_);
-  }
-
-  // .ProductType type = 2;
-  if (this->has_type()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->type_);
-  }
-
-  // .google.protobuf.Any data = 3;
-  if (this->has_data()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->data_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Product::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Product)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Product* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Product>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Product)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Product)
-    MergeFrom(*source);
-  }
-}
-
-void Product::MergeFrom(const Product& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Product)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_key()) {
-    mutable_key()->::ProductKey::MergeFrom(from.key());
-  }
-  if (from.has_type()) {
-    mutable_type()->::ProductType::MergeFrom(from.type());
-  }
-  if (from.has_data()) {
-    mutable_data()->::google::protobuf::Any::MergeFrom(from.data());
-  }
-}
-
-void Product::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Product)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Product::CopyFrom(const Product& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Product)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Product::IsInitialized() const {
-  return true;
-}
-
-void Product::Swap(Product* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Product* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Product::UnsafeArenaSwap(Product* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Product::InternalSwap(Product* other) {
-  using std::swap;
-  swap(key_, other->key_);
-  swap(type_, other->type_);
-  swap(data_, other->data_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Product::GetMetadata() const {
-  protobuf_Product_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_Product_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Product
-
-// .ProductKey key = 1;
-bool Product::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-void Product::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-const ::ProductKey& Product::key() const {
-  const ::ProductKey* p = key_;
-  // @@protoc_insertion_point(field_get:Product.key)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductKey*>(
-      &::_ProductKey_default_instance_);
-}
-::ProductKey* Product::mutable_key() {
-  
-  if (key_ == NULL) {
-    _slow_mutable_key();
-  }
-  // @@protoc_insertion_point(field_mutable:Product.key)
-  return key_;
-}
-::ProductKey* Product::release_key() {
-  // @@protoc_insertion_point(field_release:Product.key)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_key();
-  } else {
-    ::ProductKey* temp = key_;
-    key_ = NULL;
-    return temp;
-  }
-}
- void Product::set_allocated_key(::ProductKey* key) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete key_;
-  }
-  if (key != NULL) {
-    _slow_set_allocated_key(message_arena, &key);
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.key)
-}
-
-// .ProductType type = 2;
-bool Product::has_type() const {
-  return this != internal_default_instance() && type_ != NULL;
-}
-void Product::clear_type() {
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) delete type_;
-  type_ = NULL;
-}
-const ::ProductType& Product::type() const {
-  const ::ProductType* p = type_;
-  // @@protoc_insertion_point(field_get:Product.type)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductType*>(
-      &::_ProductType_default_instance_);
-}
-::ProductType* Product::mutable_type() {
-  
-  if (type_ == NULL) {
-    _slow_mutable_type();
-  }
-  // @@protoc_insertion_point(field_mutable:Product.type)
-  return type_;
-}
-::ProductType* Product::release_type() {
-  // @@protoc_insertion_point(field_release:Product.type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_type();
-  } else {
-    ::ProductType* temp = type_;
-    type_ = NULL;
-    return temp;
-  }
-}
- void Product::set_allocated_type(::ProductType* type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete type_;
-  }
-  if (type != NULL) {
-    _slow_set_allocated_type(message_arena, &type);
-  }
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.type)
-}
-
-// .google.protobuf.Any data = 3;
-bool Product::has_data() const {
-  return this != internal_default_instance() && data_ != NULL;
-}
-void Product::clear_data() {
-  if (GetArenaNoVirtual() == NULL && data_ != NULL) delete data_;
-  data_ = NULL;
-}
-const ::google::protobuf::Any& Product::data() const {
-  const ::google::protobuf::Any* p = data_;
-  // @@protoc_insertion_point(field_get:Product.data)
-  return p != NULL ? *p : *reinterpret_cast<const ::google::protobuf::Any*>(
-      &::google::protobuf::_Any_default_instance_);
-}
-::google::protobuf::Any* Product::mutable_data() {
-  
-  if (data_ == NULL) {
-    _slow_mutable_data();
-  }
-  // @@protoc_insertion_point(field_mutable:Product.data)
-  return data_;
-}
-::google::protobuf::Any* Product::release_data() {
-  // @@protoc_insertion_point(field_release:Product.data)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_data();
-  } else {
-    ::google::protobuf::Any* temp = data_;
-    data_ = NULL;
-    return temp;
-  }
-}
- void Product::set_allocated_data(::google::protobuf::Any* data) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete data_;
-  }
-  if (data != NULL) {
-    if (message_arena != NULL) {
-      message_arena->Own(data);
-    }
-  }
-  data_ = data;
-  if (data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.data)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/Product.pb.h b/languages/cpp/Product.pb.h
deleted file mode 100644
index c55d246..0000000
--- a/languages/cpp/Product.pb.h
+++ /dev/null
@@ -1,389 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-#ifndef PROTOBUF_Product_2eproto__INCLUDED
-#define PROTOBUF_Product_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "base/ProductKey.pb.h"
-#include "base/ProductType.pb.h"
-#include <google/protobuf/any.pb.h>
-// @@protoc_insertion_point(includes)
-class Product;
-class ProductDefaultTypeInternal;
-extern ProductDefaultTypeInternal _Product_default_instance_;
-
-namespace protobuf_Product_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_Product_2eproto
-
-// ===================================================================
-
-class Product : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Product) */ {
- public:
-  Product();
-  virtual ~Product();
-
-  Product(const Product& from);
-
-  inline Product& operator=(const Product& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Product(Product&& from) noexcept
-    : Product() {
-    *this = ::std::move(from);
-  }
-
-  inline Product& operator=(Product&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Product& default_instance();
-
-  static inline const Product* internal_default_instance() {
-    return reinterpret_cast<const Product*>(
-               &_Product_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Product* other);
-  void Swap(Product* other);
-  friend void swap(Product& a, Product& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Product* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Product* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Product& from);
-  void MergeFrom(const Product& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Product* other);
-  protected:
-  explicit Product(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .ProductKey key = 1;
-  bool has_key() const;
-  void clear_key();
-  static const int kKeyFieldNumber = 1;
-  private:
-  void _slow_mutable_key();
-  void _slow_set_allocated_key(
-      ::google::protobuf::Arena* message_arena, ::ProductKey** key);
-  ::ProductKey* _slow_release_key();
-  public:
-  const ::ProductKey& key() const;
-  ::ProductKey* mutable_key();
-  ::ProductKey* release_key();
-  void set_allocated_key(::ProductKey* key);
-  ::ProductKey* unsafe_arena_release_key();
-  void unsafe_arena_set_allocated_key(
-      ::ProductKey* key);
-
-  // .ProductType type = 2;
-  bool has_type() const;
-  void clear_type();
-  static const int kTypeFieldNumber = 2;
-  private:
-  void _slow_mutable_type();
-  void _slow_set_allocated_type(
-      ::google::protobuf::Arena* message_arena, ::ProductType** type);
-  ::ProductType* _slow_release_type();
-  public:
-  const ::ProductType& type() const;
-  ::ProductType* mutable_type();
-  ::ProductType* release_type();
-  void set_allocated_type(::ProductType* type);
-  ::ProductType* unsafe_arena_release_type();
-  void unsafe_arena_set_allocated_type(
-      ::ProductType* type);
-
-  // .google.protobuf.Any data = 3;
-  bool has_data() const;
-  void clear_data();
-  static const int kDataFieldNumber = 3;
-  private:
-  void _slow_mutable_data();
-  ::google::protobuf::Any* _slow_release_data();
-  public:
-  const ::google::protobuf::Any& data() const;
-  ::google::protobuf::Any* mutable_data();
-  ::google::protobuf::Any* release_data();
-  void set_allocated_data(::google::protobuf::Any* data);
-  ::google::protobuf::Any* unsafe_arena_release_data();
-  void unsafe_arena_set_allocated_data(
-      ::google::protobuf::Any* data);
-
-  // @@protoc_insertion_point(class_scope:Product)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::ProductKey* key_;
-  ::ProductType* type_;
-  ::google::protobuf::Any* data_;
-  mutable int _cached_size_;
-  friend struct protobuf_Product_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Product
-
-// .ProductKey key = 1;
-inline bool Product::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-inline void Product::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-inline const ::ProductKey& Product::key() const {
-  const ::ProductKey* p = key_;
-  // @@protoc_insertion_point(field_get:Product.key)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductKey*>(
-      &::_ProductKey_default_instance_);
-}
-inline ::ProductKey* Product::mutable_key() {
-  
-  if (key_ == NULL) {
-    _slow_mutable_key();
-  }
-  // @@protoc_insertion_point(field_mutable:Product.key)
-  return key_;
-}
-inline ::ProductKey* Product::release_key() {
-  // @@protoc_insertion_point(field_release:Product.key)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_key();
-  } else {
-    ::ProductKey* temp = key_;
-    key_ = NULL;
-    return temp;
-  }
-}
-inline  void Product::set_allocated_key(::ProductKey* key) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete key_;
-  }
-  if (key != NULL) {
-    _slow_set_allocated_key(message_arena, &key);
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.key)
-}
-
-// .ProductType type = 2;
-inline bool Product::has_type() const {
-  return this != internal_default_instance() && type_ != NULL;
-}
-inline void Product::clear_type() {
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) delete type_;
-  type_ = NULL;
-}
-inline const ::ProductType& Product::type() const {
-  const ::ProductType* p = type_;
-  // @@protoc_insertion_point(field_get:Product.type)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductType*>(
-      &::_ProductType_default_instance_);
-}
-inline ::ProductType* Product::mutable_type() {
-  
-  if (type_ == NULL) {
-    _slow_mutable_type();
-  }
-  // @@protoc_insertion_point(field_mutable:Product.type)
-  return type_;
-}
-inline ::ProductType* Product::release_type() {
-  // @@protoc_insertion_point(field_release:Product.type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_type();
-  } else {
-    ::ProductType* temp = type_;
-    type_ = NULL;
-    return temp;
-  }
-}
-inline  void Product::set_allocated_type(::ProductType* type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete type_;
-  }
-  if (type != NULL) {
-    _slow_set_allocated_type(message_arena, &type);
-  }
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.type)
-}
-
-// .google.protobuf.Any data = 3;
-inline bool Product::has_data() const {
-  return this != internal_default_instance() && data_ != NULL;
-}
-inline void Product::clear_data() {
-  if (GetArenaNoVirtual() == NULL && data_ != NULL) delete data_;
-  data_ = NULL;
-}
-inline const ::google::protobuf::Any& Product::data() const {
-  const ::google::protobuf::Any* p = data_;
-  // @@protoc_insertion_point(field_get:Product.data)
-  return p != NULL ? *p : *reinterpret_cast<const ::google::protobuf::Any*>(
-      &::google::protobuf::_Any_default_instance_);
-}
-inline ::google::protobuf::Any* Product::mutable_data() {
-  
-  if (data_ == NULL) {
-    _slow_mutable_data();
-  }
-  // @@protoc_insertion_point(field_mutable:Product.data)
-  return data_;
-}
-inline ::google::protobuf::Any* Product::release_data() {
-  // @@protoc_insertion_point(field_release:Product.data)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_data();
-  } else {
-    ::google::protobuf::Any* temp = data_;
-    data_ = NULL;
-    return temp;
-  }
-}
-inline  void Product::set_allocated_data(::google::protobuf::Any* data) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete data_;
-  }
-  if (data != NULL) {
-    if (message_arena != NULL) {
-      message_arena->Own(data);
-    }
-  }
-  data_ = data;
-  if (data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.data)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_Product_2eproto__INCLUDED
diff --git a/languages/cpp/base/Compression.pb.cc b/languages/cpp/base/Compression.pb.cc
deleted file mode 100644
index f7235d6..0000000
--- a/languages/cpp/base/Compression.pb.cc
+++ /dev/null
@@ -1,493 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "base/Compression.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class CompressionDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Compression>
-     _instance;
-} _Compression_default_instance_;
-
-namespace protobuf_base_2fCompression_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Compression, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Compression, enabled_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Compression, type_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Compression)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Compression_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "base/Compression.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _Compression_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Compression_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\026base/Compression.proto\"Q\n\013Compression\022"
-      "\017\n\007enabled\030\001 \001(\010\022\037\n\004type\030\002 \001(\0162\021.Compres"
-      "sion.Type\"\020\n\004Type\022\010\n\004GZIP\020\000B1\n\027io.bloomb"
-      "ox.schema.baseB\017BaseCompressionH\001P\001\370\001\001b\006"
-      "proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 166);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "base/Compression.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_base_2fCompression_2eproto
-
-const ::google::protobuf::EnumDescriptor* Compression_Type_descriptor() {
-  protobuf_base_2fCompression_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fCompression_2eproto::file_level_enum_descriptors[0];
-}
-bool Compression_Type_IsValid(int value) {
-  switch (value) {
-    case 0:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const Compression_Type Compression::GZIP;
-const Compression_Type Compression::Type_MIN;
-const Compression_Type Compression::Type_MAX;
-const int Compression::Type_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Compression::kEnabledFieldNumber;
-const int Compression::kTypeFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Compression::Compression()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_base_2fCompression_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Compression)
-}
-Compression::Compression(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_base_2fCompression_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Compression)
-}
-Compression::Compression(const Compression& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::memcpy(&enabled_, &from.enabled_,
-    static_cast<size_t>(reinterpret_cast<char*>(&type_) -
-    reinterpret_cast<char*>(&enabled_)) + sizeof(type_));
-  // @@protoc_insertion_point(copy_constructor:Compression)
-}
-
-void Compression::SharedCtor() {
-  ::memset(&enabled_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&type_) -
-      reinterpret_cast<char*>(&enabled_)) + sizeof(type_));
-  _cached_size_ = 0;
-}
-
-Compression::~Compression() {
-  // @@protoc_insertion_point(destructor:Compression)
-  SharedDtor();
-}
-
-void Compression::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void Compression::ArenaDtor(void* object) {
-  Compression* _this = reinterpret_cast< Compression* >(object);
-  (void)_this;
-}
-void Compression::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Compression::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Compression::descriptor() {
-  protobuf_base_2fCompression_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fCompression_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Compression& Compression::default_instance() {
-  protobuf_base_2fCompression_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Compression* Compression::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Compression>(arena);
-}
-
-void Compression::Clear() {
-// @@protoc_insertion_point(message_clear_start:Compression)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&enabled_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&type_) -
-      reinterpret_cast<char*>(&enabled_)) + sizeof(type_));
-  _internal_metadata_.Clear();
-}
-
-bool Compression::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Compression)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // bool enabled = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &enabled_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Compression.Type type = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_type(static_cast< ::Compression_Type >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Compression)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Compression)
-  return false;
-#undef DO_
-}
-
-void Compression::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Compression)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool enabled = 1;
-  if (this->enabled() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->enabled(), output);
-  }
-
-  // .Compression.Type type = 2;
-  if (this->type() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->type(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Compression)
-}
-
-::google::protobuf::uint8* Compression::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Compression)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool enabled = 1;
-  if (this->enabled() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->enabled(), target);
-  }
-
-  // .Compression.Type type = 2;
-  if (this->type() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->type(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Compression)
-  return target;
-}
-
-size_t Compression::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Compression)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // bool enabled = 1;
-  if (this->enabled() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // .Compression.Type type = 2;
-  if (this->type() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Compression::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Compression)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Compression* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Compression>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Compression)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Compression)
-    MergeFrom(*source);
-  }
-}
-
-void Compression::MergeFrom(const Compression& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Compression)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.enabled() != 0) {
-    set_enabled(from.enabled());
-  }
-  if (from.type() != 0) {
-    set_type(from.type());
-  }
-}
-
-void Compression::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Compression)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Compression::CopyFrom(const Compression& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Compression)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Compression::IsInitialized() const {
-  return true;
-}
-
-void Compression::Swap(Compression* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Compression* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Compression::UnsafeArenaSwap(Compression* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Compression::InternalSwap(Compression* other) {
-  using std::swap;
-  swap(enabled_, other->enabled_);
-  swap(type_, other->type_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Compression::GetMetadata() const {
-  protobuf_base_2fCompression_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fCompression_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Compression
-
-// bool enabled = 1;
-void Compression::clear_enabled() {
-  enabled_ = false;
-}
-bool Compression::enabled() const {
-  // @@protoc_insertion_point(field_get:Compression.enabled)
-  return enabled_;
-}
-void Compression::set_enabled(bool value) {
-  
-  enabled_ = value;
-  // @@protoc_insertion_point(field_set:Compression.enabled)
-}
-
-// .Compression.Type type = 2;
-void Compression::clear_type() {
-  type_ = 0;
-}
-::Compression_Type Compression::type() const {
-  // @@protoc_insertion_point(field_get:Compression.type)
-  return static_cast< ::Compression_Type >(type_);
-}
-void Compression::set_type(::Compression_Type value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:Compression.type)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/base/Compression.pb.h b/languages/cpp/base/Compression.pb.h
deleted file mode 100644
index 5bcbbf5..0000000
--- a/languages/cpp/base/Compression.pb.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-#ifndef PROTOBUF_base_2fCompression_2eproto__INCLUDED
-#define PROTOBUF_base_2fCompression_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class Compression;
-class CompressionDefaultTypeInternal;
-extern CompressionDefaultTypeInternal _Compression_default_instance_;
-
-namespace protobuf_base_2fCompression_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_base_2fCompression_2eproto
-
-enum Compression_Type {
-  Compression_Type_GZIP = 0,
-  Compression_Type_Compression_Type_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  Compression_Type_Compression_Type_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool Compression_Type_IsValid(int value);
-const Compression_Type Compression_Type_Type_MIN = Compression_Type_GZIP;
-const Compression_Type Compression_Type_Type_MAX = Compression_Type_GZIP;
-const int Compression_Type_Type_ARRAYSIZE = Compression_Type_Type_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* Compression_Type_descriptor();
-inline const ::std::string& Compression_Type_Name(Compression_Type value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    Compression_Type_descriptor(), value);
-}
-inline bool Compression_Type_Parse(
-    const ::std::string& name, Compression_Type* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Compression_Type>(
-    Compression_Type_descriptor(), name, value);
-}
-// ===================================================================
-
-class Compression : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Compression) */ {
- public:
-  Compression();
-  virtual ~Compression();
-
-  Compression(const Compression& from);
-
-  inline Compression& operator=(const Compression& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Compression(Compression&& from) noexcept
-    : Compression() {
-    *this = ::std::move(from);
-  }
-
-  inline Compression& operator=(Compression&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Compression& default_instance();
-
-  static inline const Compression* internal_default_instance() {
-    return reinterpret_cast<const Compression*>(
-               &_Compression_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Compression* other);
-  void Swap(Compression* other);
-  friend void swap(Compression& a, Compression& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Compression* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Compression* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Compression& from);
-  void MergeFrom(const Compression& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Compression* other);
-  protected:
-  explicit Compression(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  typedef Compression_Type Type;
-  static const Type GZIP =
-    Compression_Type_GZIP;
-  static inline bool Type_IsValid(int value) {
-    return Compression_Type_IsValid(value);
-  }
-  static const Type Type_MIN =
-    Compression_Type_Type_MIN;
-  static const Type Type_MAX =
-    Compression_Type_Type_MAX;
-  static const int Type_ARRAYSIZE =
-    Compression_Type_Type_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  Type_descriptor() {
-    return Compression_Type_descriptor();
-  }
-  static inline const ::std::string& Type_Name(Type value) {
-    return Compression_Type_Name(value);
-  }
-  static inline bool Type_Parse(const ::std::string& name,
-      Type* value) {
-    return Compression_Type_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  // bool enabled = 1;
-  void clear_enabled();
-  static const int kEnabledFieldNumber = 1;
-  bool enabled() const;
-  void set_enabled(bool value);
-
-  // .Compression.Type type = 2;
-  void clear_type();
-  static const int kTypeFieldNumber = 2;
-  ::Compression_Type type() const;
-  void set_type(::Compression_Type value);
-
-  // @@protoc_insertion_point(class_scope:Compression)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  bool enabled_;
-  int type_;
-  mutable int _cached_size_;
-  friend struct protobuf_base_2fCompression_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Compression
-
-// bool enabled = 1;
-inline void Compression::clear_enabled() {
-  enabled_ = false;
-}
-inline bool Compression::enabled() const {
-  // @@protoc_insertion_point(field_get:Compression.enabled)
-  return enabled_;
-}
-inline void Compression::set_enabled(bool value) {
-  
-  enabled_ = value;
-  // @@protoc_insertion_point(field_set:Compression.enabled)
-}
-
-// .Compression.Type type = 2;
-inline void Compression::clear_type() {
-  type_ = 0;
-}
-inline ::Compression_Type Compression::type() const {
-  // @@protoc_insertion_point(field_get:Compression.type)
-  return static_cast< ::Compression_Type >(type_);
-}
-inline void Compression::set_type(::Compression_Type value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:Compression.type)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::Compression_Type> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::Compression_Type>() {
-  return ::Compression_Type_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_base_2fCompression_2eproto__INCLUDED
diff --git a/languages/cpp/base/Language.pb.cc b/languages/cpp/base/Language.pb.cc
deleted file mode 100644
index 999bcb2..0000000
--- a/languages/cpp/base/Language.pb.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "base/Language.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_base_2fLanguage_2eproto {
-
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[1] = {};
-static const ::google::protobuf::internal::MigrationSchema* schemas = NULL;
-static const ::google::protobuf::Message* const* file_default_instances = NULL;
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "base/Language.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      NULL, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\023base/Language.proto*0\n\010Language\022\013\n\007ENG"
-      "LISH\020\000\022\013\n\007SPANISH\020\001\022\n\n\006FRENCH\020\002B.\n\027io.bl"
-      "oombox.schema.baseB\014BaseLanguageH\001P\001\370\001\001b"
-      "\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 127);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "base/Language.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_base_2fLanguage_2eproto
-
-const ::google::protobuf::EnumDescriptor* Language_descriptor() {
-  protobuf_base_2fLanguage_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fLanguage_2eproto::file_level_enum_descriptors[0];
-}
-bool Language_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/base/Language.pb.h b/languages/cpp/base/Language.pb.h
deleted file mode 100644
index 2b94b4f..0000000
--- a/languages/cpp/base/Language.pb.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-#ifndef PROTOBUF_base_2fLanguage_2eproto__INCLUDED
-#define PROTOBUF_base_2fLanguage_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_base_2fLanguage_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_base_2fLanguage_2eproto
-
-enum Language {
-  ENGLISH = 0,
-  SPANISH = 1,
-  FRENCH = 2,
-  Language_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  Language_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool Language_IsValid(int value);
-const Language Language_MIN = ENGLISH;
-const Language Language_MAX = FRENCH;
-const int Language_ARRAYSIZE = Language_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* Language_descriptor();
-inline const ::std::string& Language_Name(Language value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    Language_descriptor(), value);
-}
-inline bool Language_Parse(
-    const ::std::string& name, Language* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Language>(
-    Language_descriptor(), name, value);
-}
-// ===================================================================
-
-
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::Language> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::Language>() {
-  return ::Language_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_base_2fLanguage_2eproto__INCLUDED
diff --git a/languages/cpp/base/Product.pb.cc b/languages/cpp/base/Product.pb.cc
deleted file mode 100644
index 20f81ba..0000000
--- a/languages/cpp/base/Product.pb.cc
+++ /dev/null
@@ -1,596 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Product.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "base/Product.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ProductDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Product> {
-} _Product_default_instance_;
-
-namespace protobuf_base_2fProduct_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] = {
-  { NULL, NULL, 0, -1, -1, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, key_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Product, data_),
-};
-
-static const ::google::protobuf::internal::MigrationSchema schemas[] = {
-  { 0, -1, sizeof(Product)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Product_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "base/Product.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-
-void TableStruct::Shutdown() {
-  _Product_default_instance_.Shutdown();
-  delete file_level_metadata[0].reflection;
-}
-
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_base_2fProductKey_2eproto::InitDefaults();
-  ::protobuf_base_2fProductType_2eproto::InitDefaults();
-  ::google::protobuf::protobuf_google_2fprotobuf_2fany_2eproto::InitDefaults();
-  _Product_default_instance_.DefaultConstruct();
-  _Product_default_instance_.get_mutable()->key_ = const_cast< ::ProductKey*>(
-      ::ProductKey::internal_default_instance());
-  _Product_default_instance_.get_mutable()->type_ = const_cast< ::ProductType*>(
-      ::ProductType::internal_default_instance());
-  _Product_default_instance_.get_mutable()->data_ = const_cast< ::google::protobuf::Any*>(
-      ::google::protobuf::Any::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] = {
-      "\n\022base/Product.proto\032\025base/ProductKey.pr"
-      "oto\032\026base/ProductType.proto\032\031google/prot"
-      "obuf/any.proto\"c\n\007Product\022\030\n\003key\030\001 \001(\0132\013"
-      ".ProductKey\022\032\n\004type\030\002 \001(\0132\014.ProductType\022"
-      "\"\n\004data\030\003 \001(\0132\024.google.protobuf.AnyB\033\n\027i"
-      "o.bloombox.schema.baseP\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 232);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "base/Product.proto", &protobuf_RegisterTypes);
-  ::protobuf_base_2fProductKey_2eproto::AddDescriptors();
-  ::protobuf_base_2fProductType_2eproto::AddDescriptors();
-  ::google::protobuf::protobuf_google_2fprotobuf_2fany_2eproto::AddDescriptors();
-  ::google::protobuf::internal::OnShutdown(&TableStruct::Shutdown);
-}
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_base_2fProduct_2eproto
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Product::kKeyFieldNumber;
-const int Product::kTypeFieldNumber;
-const int Product::kDataFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Product::Product()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_base_2fProduct_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Product)
-}
-Product::Product(const Product& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_key()) {
-    key_ = new ::ProductKey(*from.key_);
-  } else {
-    key_ = NULL;
-  }
-  if (from.has_type()) {
-    type_ = new ::ProductType(*from.type_);
-  } else {
-    type_ = NULL;
-  }
-  if (from.has_data()) {
-    data_ = new ::google::protobuf::Any(*from.data_);
-  } else {
-    data_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:Product)
-}
-
-void Product::SharedCtor() {
-  ::memset(&key_, 0, reinterpret_cast<char*>(&data_) -
-    reinterpret_cast<char*>(&key_) + sizeof(data_));
-  _cached_size_ = 0;
-}
-
-Product::~Product() {
-  // @@protoc_insertion_point(destructor:Product)
-  SharedDtor();
-}
-
-void Product::SharedDtor() {
-  if (this != internal_default_instance()) {
-    delete key_;
-  }
-  if (this != internal_default_instance()) {
-    delete type_;
-  }
-  if (this != internal_default_instance()) {
-    delete data_;
-  }
-}
-
-void Product::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Product::descriptor() {
-  protobuf_base_2fProduct_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProduct_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Product& Product::default_instance() {
-  protobuf_base_2fProduct_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Product* Product::New(::google::protobuf::Arena* arena) const {
-  Product* n = new Product;
-  if (arena != NULL) {
-    arena->Own(n);
-  }
-  return n;
-}
-
-void Product::Clear() {
-// @@protoc_insertion_point(message_clear_start:Product)
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) {
-    delete key_;
-  }
-  key_ = NULL;
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) {
-    delete type_;
-  }
-  type_ = NULL;
-  if (GetArenaNoVirtual() == NULL && data_ != NULL) {
-    delete data_;
-  }
-  data_ = NULL;
-}
-
-bool Product::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Product)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .ProductKey key = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_key()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .ProductType type = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_type()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .google.protobuf.Any data = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_data()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Product)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Product)
-  return false;
-#undef DO_
-}
-
-void Product::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Product)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->key_, output);
-  }
-
-  // .ProductType type = 2;
-  if (this->has_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->type_, output);
-  }
-
-  // .google.protobuf.Any data = 3;
-  if (this->has_data()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, *this->data_, output);
-  }
-
-  // @@protoc_insertion_point(serialize_end:Product)
-}
-
-::google::protobuf::uint8* Product::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Product)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->key_, deterministic, target);
-  }
-
-  // .ProductType type = 2;
-  if (this->has_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->type_, deterministic, target);
-  }
-
-  // .google.protobuf.Any data = 3;
-  if (this->has_data()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        3, *this->data_, deterministic, target);
-  }
-
-  // @@protoc_insertion_point(serialize_to_array_end:Product)
-  return target;
-}
-
-size_t Product::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Product)
-  size_t total_size = 0;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->key_);
-  }
-
-  // .ProductType type = 2;
-  if (this->has_type()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->type_);
-  }
-
-  // .google.protobuf.Any data = 3;
-  if (this->has_data()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->data_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Product::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Product)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Product* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Product>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Product)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Product)
-    MergeFrom(*source);
-  }
-}
-
-void Product::MergeFrom(const Product& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Product)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_key()) {
-    mutable_key()->::ProductKey::MergeFrom(from.key());
-  }
-  if (from.has_type()) {
-    mutable_type()->::ProductType::MergeFrom(from.type());
-  }
-  if (from.has_data()) {
-    mutable_data()->::google::protobuf::Any::MergeFrom(from.data());
-  }
-}
-
-void Product::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Product)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Product::CopyFrom(const Product& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Product)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Product::IsInitialized() const {
-  return true;
-}
-
-void Product::Swap(Product* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void Product::InternalSwap(Product* other) {
-  std::swap(key_, other->key_);
-  std::swap(type_, other->type_);
-  std::swap(data_, other->data_);
-  std::swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Product::GetMetadata() const {
-  protobuf_base_2fProduct_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProduct_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Product
-
-// .ProductKey key = 1;
-bool Product::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-void Product::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-const ::ProductKey& Product::key() const {
-  // @@protoc_insertion_point(field_get:Product.key)
-  return key_ != NULL ? *key_
-                         : *::ProductKey::internal_default_instance();
-}
-::ProductKey* Product::mutable_key() {
-  
-  if (key_ == NULL) {
-    key_ = new ::ProductKey;
-  }
-  // @@protoc_insertion_point(field_mutable:Product.key)
-  return key_;
-}
-::ProductKey* Product::release_key() {
-  // @@protoc_insertion_point(field_release:Product.key)
-  
-  ::ProductKey* temp = key_;
-  key_ = NULL;
-  return temp;
-}
-void Product::set_allocated_key(::ProductKey* key) {
-  delete key_;
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.key)
-}
-
-// .ProductType type = 2;
-bool Product::has_type() const {
-  return this != internal_default_instance() && type_ != NULL;
-}
-void Product::clear_type() {
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) delete type_;
-  type_ = NULL;
-}
-const ::ProductType& Product::type() const {
-  // @@protoc_insertion_point(field_get:Product.type)
-  return type_ != NULL ? *type_
-                         : *::ProductType::internal_default_instance();
-}
-::ProductType* Product::mutable_type() {
-  
-  if (type_ == NULL) {
-    type_ = new ::ProductType;
-  }
-  // @@protoc_insertion_point(field_mutable:Product.type)
-  return type_;
-}
-::ProductType* Product::release_type() {
-  // @@protoc_insertion_point(field_release:Product.type)
-  
-  ::ProductType* temp = type_;
-  type_ = NULL;
-  return temp;
-}
-void Product::set_allocated_type(::ProductType* type) {
-  delete type_;
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.type)
-}
-
-// .google.protobuf.Any data = 3;
-bool Product::has_data() const {
-  return this != internal_default_instance() && data_ != NULL;
-}
-void Product::clear_data() {
-  if (GetArenaNoVirtual() == NULL && data_ != NULL) delete data_;
-  data_ = NULL;
-}
-const ::google::protobuf::Any& Product::data() const {
-  // @@protoc_insertion_point(field_get:Product.data)
-  return data_ != NULL ? *data_
-                         : *::google::protobuf::Any::internal_default_instance();
-}
-::google::protobuf::Any* Product::mutable_data() {
-  
-  if (data_ == NULL) {
-    data_ = new ::google::protobuf::Any;
-  }
-  // @@protoc_insertion_point(field_mutable:Product.data)
-  return data_;
-}
-::google::protobuf::Any* Product::release_data() {
-  // @@protoc_insertion_point(field_release:Product.data)
-  
-  ::google::protobuf::Any* temp = data_;
-  data_ = NULL;
-  return temp;
-}
-void Product::set_allocated_data(::google::protobuf::Any* data) {
-  delete data_;
-  data_ = data;
-  if (data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.data)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/base/Product.pb.h b/languages/cpp/base/Product.pb.h
deleted file mode 100644
index 89b80d3..0000000
--- a/languages/cpp/base/Product.pb.h
+++ /dev/null
@@ -1,302 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Product.proto
-
-#ifndef PROTOBUF_base_2fProduct_2eproto__INCLUDED
-#define PROTOBUF_base_2fProduct_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3003000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3003002 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "base/ProductKey.pb.h"
-#include "base/ProductType.pb.h"
-#include <google/protobuf/any.pb.h>
-// @@protoc_insertion_point(includes)
-class Product;
-class ProductDefaultTypeInternal;
-extern ProductDefaultTypeInternal _Product_default_instance_;
-class ProductKey;
-class ProductKeyDefaultTypeInternal;
-extern ProductKeyDefaultTypeInternal _ProductKey_default_instance_;
-class ProductType;
-class ProductTypeDefaultTypeInternal;
-extern ProductTypeDefaultTypeInternal _ProductType_default_instance_;
-namespace google {
-namespace protobuf {
-class Any;
-class AnyDefaultTypeInternal;
-extern AnyDefaultTypeInternal _Any_default_instance_;
-}  // namespace protobuf
-}  // namespace google
-
-namespace protobuf_base_2fProduct_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static void InitDefaultsImpl();
-  static void Shutdown();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_base_2fProduct_2eproto
-
-// ===================================================================
-
-class Product : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Product) */ {
- public:
-  Product();
-  virtual ~Product();
-
-  Product(const Product& from);
-
-  inline Product& operator=(const Product& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Product& default_instance();
-
-  static inline const Product* internal_default_instance() {
-    return reinterpret_cast<const Product*>(
-               &_Product_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void Swap(Product* other);
-
-  // implements Message ----------------------------------------------
-
-  inline Product* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Product* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Product& from);
-  void MergeFrom(const Product& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Product* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
-  }
-  inline void* MaybeArenaPtr() const {
-    return NULL;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .ProductKey key = 1;
-  bool has_key() const;
-  void clear_key();
-  static const int kKeyFieldNumber = 1;
-  const ::ProductKey& key() const;
-  ::ProductKey* mutable_key();
-  ::ProductKey* release_key();
-  void set_allocated_key(::ProductKey* key);
-
-  // .ProductType type = 2;
-  bool has_type() const;
-  void clear_type();
-  static const int kTypeFieldNumber = 2;
-  const ::ProductType& type() const;
-  ::ProductType* mutable_type();
-  ::ProductType* release_type();
-  void set_allocated_type(::ProductType* type);
-
-  // .google.protobuf.Any data = 3;
-  bool has_data() const;
-  void clear_data();
-  static const int kDataFieldNumber = 3;
-  const ::google::protobuf::Any& data() const;
-  ::google::protobuf::Any* mutable_data();
-  ::google::protobuf::Any* release_data();
-  void set_allocated_data(::google::protobuf::Any* data);
-
-  // @@protoc_insertion_point(class_scope:Product)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::ProductKey* key_;
-  ::ProductType* type_;
-  ::google::protobuf::Any* data_;
-  mutable int _cached_size_;
-  friend struct protobuf_base_2fProduct_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-// Product
-
-// .ProductKey key = 1;
-inline bool Product::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-inline void Product::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-inline const ::ProductKey& Product::key() const {
-  // @@protoc_insertion_point(field_get:Product.key)
-  return key_ != NULL ? *key_
-                         : *::ProductKey::internal_default_instance();
-}
-inline ::ProductKey* Product::mutable_key() {
-  
-  if (key_ == NULL) {
-    key_ = new ::ProductKey;
-  }
-  // @@protoc_insertion_point(field_mutable:Product.key)
-  return key_;
-}
-inline ::ProductKey* Product::release_key() {
-  // @@protoc_insertion_point(field_release:Product.key)
-  
-  ::ProductKey* temp = key_;
-  key_ = NULL;
-  return temp;
-}
-inline void Product::set_allocated_key(::ProductKey* key) {
-  delete key_;
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.key)
-}
-
-// .ProductType type = 2;
-inline bool Product::has_type() const {
-  return this != internal_default_instance() && type_ != NULL;
-}
-inline void Product::clear_type() {
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) delete type_;
-  type_ = NULL;
-}
-inline const ::ProductType& Product::type() const {
-  // @@protoc_insertion_point(field_get:Product.type)
-  return type_ != NULL ? *type_
-                         : *::ProductType::internal_default_instance();
-}
-inline ::ProductType* Product::mutable_type() {
-  
-  if (type_ == NULL) {
-    type_ = new ::ProductType;
-  }
-  // @@protoc_insertion_point(field_mutable:Product.type)
-  return type_;
-}
-inline ::ProductType* Product::release_type() {
-  // @@protoc_insertion_point(field_release:Product.type)
-  
-  ::ProductType* temp = type_;
-  type_ = NULL;
-  return temp;
-}
-inline void Product::set_allocated_type(::ProductType* type) {
-  delete type_;
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.type)
-}
-
-// .google.protobuf.Any data = 3;
-inline bool Product::has_data() const {
-  return this != internal_default_instance() && data_ != NULL;
-}
-inline void Product::clear_data() {
-  if (GetArenaNoVirtual() == NULL && data_ != NULL) delete data_;
-  data_ = NULL;
-}
-inline const ::google::protobuf::Any& Product::data() const {
-  // @@protoc_insertion_point(field_get:Product.data)
-  return data_ != NULL ? *data_
-                         : *::google::protobuf::Any::internal_default_instance();
-}
-inline ::google::protobuf::Any* Product::mutable_data() {
-  
-  if (data_ == NULL) {
-    data_ = new ::google::protobuf::Any;
-  }
-  // @@protoc_insertion_point(field_mutable:Product.data)
-  return data_;
-}
-inline ::google::protobuf::Any* Product::release_data() {
-  // @@protoc_insertion_point(field_release:Product.data)
-  
-  ::google::protobuf::Any* temp = data_;
-  data_ = NULL;
-  return temp;
-}
-inline void Product::set_allocated_data(::google::protobuf::Any* data) {
-  delete data_;
-  data_ = data;
-  if (data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Product.data)
-}
-
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_base_2fProduct_2eproto__INCLUDED
diff --git a/languages/cpp/base/ProductKey.pb.cc b/languages/cpp/base/ProductKey.pb.cc
deleted file mode 100644
index 76252f9..0000000
--- a/languages/cpp/base/ProductKey.pb.cc
+++ /dev/null
@@ -1,493 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "base/ProductKey.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ProductKeyDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ProductKey>
-     _instance;
-} _ProductKey_default_instance_;
-
-namespace protobuf_base_2fProductKey_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductKey, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductKey, id_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(ProductKey)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ProductKey_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "base/ProductKey.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _ProductKey_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ProductKey_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\025base/ProductKey.proto\"\030\n\nProductKey\022\n\n"
-      "\002id\030\001 \001(\tB0\n\027io.bloombox.schema.baseB\016Ba"
-      "seProductKeyH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 107);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "base/ProductKey.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_base_2fProductKey_2eproto
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ProductKey::kIdFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ProductKey::ProductKey()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_base_2fProductKey_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ProductKey)
-}
-ProductKey::ProductKey(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_base_2fProductKey_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ProductKey)
-}
-ProductKey::ProductKey(const ProductKey& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.id().size() > 0) {
-    id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.id(),
-      GetArenaNoVirtual());
-  }
-  // @@protoc_insertion_point(copy_constructor:ProductKey)
-}
-
-void ProductKey::SharedCtor() {
-  id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  _cached_size_ = 0;
-}
-
-ProductKey::~ProductKey() {
-  // @@protoc_insertion_point(destructor:ProductKey)
-  SharedDtor();
-}
-
-void ProductKey::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  id_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
-}
-
-void ProductKey::ArenaDtor(void* object) {
-  ProductKey* _this = reinterpret_cast< ProductKey* >(object);
-  (void)_this;
-}
-void ProductKey::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ProductKey::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ProductKey::descriptor() {
-  protobuf_base_2fProductKey_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProductKey_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ProductKey& ProductKey::default_instance() {
-  protobuf_base_2fProductKey_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ProductKey* ProductKey::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ProductKey>(arena);
-}
-
-void ProductKey::Clear() {
-// @@protoc_insertion_point(message_clear_start:ProductKey)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  id_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-  _internal_metadata_.Clear();
-}
-
-bool ProductKey::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ProductKey)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // string id = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_id()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->id().data(), static_cast<int>(this->id().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "ProductKey.id"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ProductKey)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ProductKey)
-  return false;
-#undef DO_
-}
-
-void ProductKey::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ProductKey)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string id = 1;
-  if (this->id().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->id().data(), static_cast<int>(this->id().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "ProductKey.id");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->id(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ProductKey)
-}
-
-::google::protobuf::uint8* ProductKey::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ProductKey)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string id = 1;
-  if (this->id().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->id().data(), static_cast<int>(this->id().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "ProductKey.id");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->id(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ProductKey)
-  return target;
-}
-
-size_t ProductKey::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ProductKey)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // string id = 1;
-  if (this->id().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->id());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ProductKey::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ProductKey)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ProductKey* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ProductKey>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ProductKey)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ProductKey)
-    MergeFrom(*source);
-  }
-}
-
-void ProductKey::MergeFrom(const ProductKey& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ProductKey)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.id().size() > 0) {
-    set_id(from.id());
-  }
-}
-
-void ProductKey::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ProductKey)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ProductKey::CopyFrom(const ProductKey& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ProductKey)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ProductKey::IsInitialized() const {
-  return true;
-}
-
-void ProductKey::Swap(ProductKey* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ProductKey* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ProductKey::UnsafeArenaSwap(ProductKey* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ProductKey::InternalSwap(ProductKey* other) {
-  using std::swap;
-  id_.Swap(&other->id_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ProductKey::GetMetadata() const {
-  protobuf_base_2fProductKey_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProductKey_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ProductKey
-
-// string id = 1;
-void ProductKey::clear_id() {
-  id_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-const ::std::string& ProductKey::id() const {
-  // @@protoc_insertion_point(field_get:ProductKey.id)
-  return id_.Get();
-}
-void ProductKey::set_id(const ::std::string& value) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:ProductKey.id)
-}
-#if LANG_CXX11
-void ProductKey::set_id(::std::string&& value) {
-  
-  id_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:ProductKey.id)
-}
-#endif
-void ProductKey::set_id(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:ProductKey.id)
-}
-void ProductKey::set_id(const char* value,
-    size_t size) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:ProductKey.id)
-}
-::std::string* ProductKey::mutable_id() {
-  
-  // @@protoc_insertion_point(field_mutable:ProductKey.id)
-  return id_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* ProductKey::release_id() {
-  // @@protoc_insertion_point(field_release:ProductKey.id)
-  
-  return id_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* ProductKey::unsafe_arena_release_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductKey.id)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return id_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-void ProductKey::set_allocated_id(::std::string* id) {
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:ProductKey.id)
-}
-void ProductKey::unsafe_arena_set_allocated_id(
-    ::std::string* id) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      id, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductKey.id)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/base/ProductKey.pb.h b/languages/cpp/base/ProductKey.pb.h
deleted file mode 100644
index df81810..0000000
--- a/languages/cpp/base/ProductKey.pb.h
+++ /dev/null
@@ -1,272 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-#ifndef PROTOBUF_base_2fProductKey_2eproto__INCLUDED
-#define PROTOBUF_base_2fProductKey_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class ProductKey;
-class ProductKeyDefaultTypeInternal;
-extern ProductKeyDefaultTypeInternal _ProductKey_default_instance_;
-
-namespace protobuf_base_2fProductKey_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_base_2fProductKey_2eproto
-
-// ===================================================================
-
-class ProductKey : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ProductKey) */ {
- public:
-  ProductKey();
-  virtual ~ProductKey();
-
-  ProductKey(const ProductKey& from);
-
-  inline ProductKey& operator=(const ProductKey& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ProductKey(ProductKey&& from) noexcept
-    : ProductKey() {
-    *this = ::std::move(from);
-  }
-
-  inline ProductKey& operator=(ProductKey&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ProductKey& default_instance();
-
-  static inline const ProductKey* internal_default_instance() {
-    return reinterpret_cast<const ProductKey*>(
-               &_ProductKey_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(ProductKey* other);
-  void Swap(ProductKey* other);
-  friend void swap(ProductKey& a, ProductKey& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ProductKey* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ProductKey* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ProductKey& from);
-  void MergeFrom(const ProductKey& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ProductKey* other);
-  protected:
-  explicit ProductKey(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // string id = 1;
-  void clear_id();
-  static const int kIdFieldNumber = 1;
-  const ::std::string& id() const;
-  void set_id(const ::std::string& value);
-  #if LANG_CXX11
-  void set_id(::std::string&& value);
-  #endif
-  void set_id(const char* value);
-  void set_id(const char* value, size_t size);
-  ::std::string* mutable_id();
-  ::std::string* release_id();
-  void set_allocated_id(::std::string* id);
-  ::std::string* unsafe_arena_release_id();
-  void unsafe_arena_set_allocated_id(
-      ::std::string* id);
-
-  // @@protoc_insertion_point(class_scope:ProductKey)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::internal::ArenaStringPtr id_;
-  mutable int _cached_size_;
-  friend struct protobuf_base_2fProductKey_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// ProductKey
-
-// string id = 1;
-inline void ProductKey::clear_id() {
-  id_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline const ::std::string& ProductKey::id() const {
-  // @@protoc_insertion_point(field_get:ProductKey.id)
-  return id_.Get();
-}
-inline void ProductKey::set_id(const ::std::string& value) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:ProductKey.id)
-}
-#if LANG_CXX11
-inline void ProductKey::set_id(::std::string&& value) {
-  
-  id_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:ProductKey.id)
-}
-#endif
-inline void ProductKey::set_id(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:ProductKey.id)
-}
-inline void ProductKey::set_id(const char* value,
-    size_t size) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:ProductKey.id)
-}
-inline ::std::string* ProductKey::mutable_id() {
-  
-  // @@protoc_insertion_point(field_mutable:ProductKey.id)
-  return id_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* ProductKey::release_id() {
-  // @@protoc_insertion_point(field_release:ProductKey.id)
-  
-  return id_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* ProductKey::unsafe_arena_release_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductKey.id)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return id_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-inline void ProductKey::set_allocated_id(::std::string* id) {
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:ProductKey.id)
-}
-inline void ProductKey::unsafe_arena_set_allocated_id(
-    ::std::string* id) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      id, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductKey.id)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_base_2fProductKey_2eproto__INCLUDED
diff --git a/languages/cpp/base/ProductKind.pb.cc b/languages/cpp/base/ProductKind.pb.cc
deleted file mode 100644
index e84fc5d..0000000
--- a/languages/cpp/base/ProductKind.pb.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "base/ProductKind.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_base_2fProductKind_2eproto {
-
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[1] = {};
-static const ::google::protobuf::internal::MigrationSchema* schemas = NULL;
-static const ::google::protobuf::Message* const* file_default_instances = NULL;
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "base/ProductKind.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      NULL, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\026base/ProductKind.proto*\200\001\n\013ProductKind"
-      "\022\013\n\007FLOWERS\020\000\022\013\n\007EDIBLES\020\001\022\014\n\010EXTRACTS\020\002"
-      "\022\014\n\010PREROLLS\020\003\022\016\n\nAPOTHECARY\020\004\022\016\n\nCARTRI"
-      "DGES\020\005\022\n\n\006PLANTS\020\006\022\017\n\013MERCHANDISE\020\007B1\n\027i"
-      "o.bloombox.schema.baseB\017BaseProductKindH"
-      "\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 214);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "base/ProductKind.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_base_2fProductKind_2eproto
-
-const ::google::protobuf::EnumDescriptor* ProductKind_descriptor() {
-  protobuf_base_2fProductKind_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProductKind_2eproto::file_level_enum_descriptors[0];
-}
-bool ProductKind_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/base/ProductKind.pb.h b/languages/cpp/base/ProductKind.pb.h
deleted file mode 100644
index 1d63375..0000000
--- a/languages/cpp/base/ProductKind.pb.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-#ifndef PROTOBUF_base_2fProductKind_2eproto__INCLUDED
-#define PROTOBUF_base_2fProductKind_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_base_2fProductKind_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_base_2fProductKind_2eproto
-
-enum ProductKind {
-  FLOWERS = 0,
-  EDIBLES = 1,
-  EXTRACTS = 2,
-  PREROLLS = 3,
-  APOTHECARY = 4,
-  CARTRIDGES = 5,
-  PLANTS = 6,
-  MERCHANDISE = 7,
-  ProductKind_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  ProductKind_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool ProductKind_IsValid(int value);
-const ProductKind ProductKind_MIN = FLOWERS;
-const ProductKind ProductKind_MAX = MERCHANDISE;
-const int ProductKind_ARRAYSIZE = ProductKind_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* ProductKind_descriptor();
-inline const ::std::string& ProductKind_Name(ProductKind value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    ProductKind_descriptor(), value);
-}
-inline bool ProductKind_Parse(
-    const ::std::string& name, ProductKind* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ProductKind>(
-    ProductKind_descriptor(), name, value);
-}
-// ===================================================================
-
-
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::ProductKind> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::ProductKind>() {
-  return ::ProductKind_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_base_2fProductKind_2eproto__INCLUDED
diff --git a/languages/cpp/base/ProductType.pb.cc b/languages/cpp/base/ProductType.pb.cc
deleted file mode 100644
index 364ced1..0000000
--- a/languages/cpp/base/ProductType.pb.cc
+++ /dev/null
@@ -1,419 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "base/ProductType.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ProductTypeDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ProductType>
-     _instance;
-} _ProductType_default_instance_;
-
-namespace protobuf_base_2fProductType_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductType, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductType, kind_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(ProductType)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ProductType_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "base/ProductType.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_base_2fProductKind_2eproto::InitDefaults();
-  _ProductType_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ProductType_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\026base/ProductType.proto\032\026base/ProductKi"
-      "nd.proto\")\n\013ProductType\022\032\n\004kind\030\001 \001(\0162\014."
-      "ProductKindB1\n\027io.bloombox.schema.baseB\017"
-      "BaseProductTypeH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 150);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "base/ProductType.proto", &protobuf_RegisterTypes);
-  ::protobuf_base_2fProductKind_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_base_2fProductType_2eproto
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ProductType::kKindFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ProductType::ProductType()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_base_2fProductType_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ProductType)
-}
-ProductType::ProductType(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_base_2fProductType_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ProductType)
-}
-ProductType::ProductType(const ProductType& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  kind_ = from.kind_;
-  // @@protoc_insertion_point(copy_constructor:ProductType)
-}
-
-void ProductType::SharedCtor() {
-  kind_ = 0;
-  _cached_size_ = 0;
-}
-
-ProductType::~ProductType() {
-  // @@protoc_insertion_point(destructor:ProductType)
-  SharedDtor();
-}
-
-void ProductType::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void ProductType::ArenaDtor(void* object) {
-  ProductType* _this = reinterpret_cast< ProductType* >(object);
-  (void)_this;
-}
-void ProductType::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ProductType::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ProductType::descriptor() {
-  protobuf_base_2fProductType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProductType_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ProductType& ProductType::default_instance() {
-  protobuf_base_2fProductType_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ProductType* ProductType::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ProductType>(arena);
-}
-
-void ProductType::Clear() {
-// @@protoc_insertion_point(message_clear_start:ProductType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  kind_ = 0;
-  _internal_metadata_.Clear();
-}
-
-bool ProductType::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ProductType)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .ProductKind kind = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_kind(static_cast< ::ProductKind >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ProductType)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ProductType)
-  return false;
-#undef DO_
-}
-
-void ProductType::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ProductType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKind kind = 1;
-  if (this->kind() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->kind(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ProductType)
-}
-
-::google::protobuf::uint8* ProductType::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ProductType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKind kind = 1;
-  if (this->kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->kind(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ProductType)
-  return target;
-}
-
-size_t ProductType::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ProductType)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .ProductKind kind = 1;
-  if (this->kind() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ProductType::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ProductType)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ProductType* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ProductType>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ProductType)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ProductType)
-    MergeFrom(*source);
-  }
-}
-
-void ProductType::MergeFrom(const ProductType& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ProductType)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.kind() != 0) {
-    set_kind(from.kind());
-  }
-}
-
-void ProductType::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ProductType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ProductType::CopyFrom(const ProductType& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ProductType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ProductType::IsInitialized() const {
-  return true;
-}
-
-void ProductType::Swap(ProductType* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ProductType* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ProductType::UnsafeArenaSwap(ProductType* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ProductType::InternalSwap(ProductType* other) {
-  using std::swap;
-  swap(kind_, other->kind_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ProductType::GetMetadata() const {
-  protobuf_base_2fProductType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_base_2fProductType_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ProductType
-
-// .ProductKind kind = 1;
-void ProductType::clear_kind() {
-  kind_ = 0;
-}
-::ProductKind ProductType::kind() const {
-  // @@protoc_insertion_point(field_get:ProductType.kind)
-  return static_cast< ::ProductKind >(kind_);
-}
-void ProductType::set_kind(::ProductKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:ProductType.kind)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/base/ProductType.pb.h b/languages/cpp/base/ProductType.pb.h
deleted file mode 100644
index 2cbab25..0000000
--- a/languages/cpp/base/ProductType.pb.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-#ifndef PROTOBUF_base_2fProductType_2eproto__INCLUDED
-#define PROTOBUF_base_2fProductType_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "base/ProductKind.pb.h"
-// @@protoc_insertion_point(includes)
-class ProductType;
-class ProductTypeDefaultTypeInternal;
-extern ProductTypeDefaultTypeInternal _ProductType_default_instance_;
-
-namespace protobuf_base_2fProductType_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_base_2fProductType_2eproto
-
-// ===================================================================
-
-class ProductType : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ProductType) */ {
- public:
-  ProductType();
-  virtual ~ProductType();
-
-  ProductType(const ProductType& from);
-
-  inline ProductType& operator=(const ProductType& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ProductType(ProductType&& from) noexcept
-    : ProductType() {
-    *this = ::std::move(from);
-  }
-
-  inline ProductType& operator=(ProductType&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ProductType& default_instance();
-
-  static inline const ProductType* internal_default_instance() {
-    return reinterpret_cast<const ProductType*>(
-               &_ProductType_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(ProductType* other);
-  void Swap(ProductType* other);
-  friend void swap(ProductType& a, ProductType& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ProductType* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ProductType* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ProductType& from);
-  void MergeFrom(const ProductType& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ProductType* other);
-  protected:
-  explicit ProductType(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .ProductKind kind = 1;
-  void clear_kind();
-  static const int kKindFieldNumber = 1;
-  ::ProductKind kind() const;
-  void set_kind(::ProductKind value);
-
-  // @@protoc_insertion_point(class_scope:ProductType)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  int kind_;
-  mutable int _cached_size_;
-  friend struct protobuf_base_2fProductType_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// ProductType
-
-// .ProductKind kind = 1;
-inline void ProductType::clear_kind() {
-  kind_ = 0;
-}
-inline ::ProductKind ProductType::kind() const {
-  // @@protoc_insertion_point(field_get:ProductType.kind)
-  return static_cast< ::ProductKind >(kind_);
-}
-inline void ProductType::set_kind(::ProductKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:ProductType.kind)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_base_2fProductType_2eproto__INCLUDED
diff --git a/languages/cpp/content/Brand.pb.cc b/languages/cpp/content/Brand.pb.cc
deleted file mode 100644
index a590e83..0000000
--- a/languages/cpp/content/Brand.pb.cc
+++ /dev/null
@@ -1,889 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "content/Brand.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class BrandDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Brand>
-     _instance;
-} _Brand_default_instance_;
-
-namespace protobuf_content_2fBrand_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Brand, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Brand, name_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Brand, parent_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Brand, summary_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Brand, media_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Brand)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Brand_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "content/Brand.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_content_2fName_2eproto::InitDefaults();
-  ::protobuf_content_2fContent_2eproto::InitDefaults();
-  ::protobuf_media_2fMediaItem_2eproto::InitDefaults();
-  _Brand_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Brand_default_instance_);_Brand_default_instance_._instance.get_mutable()->name_ = const_cast< ::Name*>(
-      ::Name::internal_default_instance());
-  _Brand_default_instance_._instance.get_mutable()->parent_ = const_cast< ::Brand*>(
-      ::Brand::internal_default_instance());
-  _Brand_default_instance_._instance.get_mutable()->summary_ = const_cast< ::Content*>(
-      ::Content::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\023content/Brand.proto\032\022content/Name.prot"
-      "o\032\025content/Content.proto\032\025media/MediaIte"
-      "m.proto\"j\n\005Brand\022\023\n\004name\030\001 \001(\0132\005.Name\022\026\n"
-      "\006parent\030\002 \001(\0132\006.Brand\022\031\n\007summary\030\003 \001(\0132\010"
-      ".Content\022\031\n\005media\030\024 \003(\0132\n.MediaItemB1\n\032i"
-      "o.bloombox.schema.contentB\014BrandContentH"
-      "\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 254);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "content/Brand.proto", &protobuf_RegisterTypes);
-  ::protobuf_content_2fName_2eproto::AddDescriptors();
-  ::protobuf_content_2fContent_2eproto::AddDescriptors();
-  ::protobuf_media_2fMediaItem_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_content_2fBrand_2eproto
-
-
-// ===================================================================
-
-void Brand::_slow_mutable_name() {
-  name_ = ::google::protobuf::Arena::CreateMessage< ::Name >(
-      GetArenaNoVirtual());
-}
-::Name* Brand::_slow_release_name() {
-  if (name_ == NULL) {
-    return NULL;
-  } else {
-    ::Name* temp = new ::Name(*name_);
-    name_ = NULL;
-    return temp;
-  }
-}
-::Name* Brand::unsafe_arena_release_name() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Brand.name)
-  
-  ::Name* temp = name_;
-  name_ = NULL;
-  return temp;
-}
-void Brand::_slow_set_allocated_name(
-    ::google::protobuf::Arena* message_arena, ::Name** name) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*name) == NULL) {
-      message_arena->Own(*name);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*name)) {
-      ::Name* new_name = 
-            ::google::protobuf::Arena::CreateMessage< ::Name >(
-            message_arena);
-      new_name->CopyFrom(**name);
-      *name = new_name;
-    }
-}
-void Brand::unsafe_arena_set_allocated_name(
-    ::Name* name) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete name_;
-  }
-  name_ = name;
-  if (name) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Brand.name)
-}
-void Brand::_slow_mutable_parent() {
-  parent_ = ::google::protobuf::Arena::CreateMessage< ::Brand >(
-      GetArenaNoVirtual());
-}
-::Brand* Brand::_slow_release_parent() {
-  if (parent_ == NULL) {
-    return NULL;
-  } else {
-    ::Brand* temp = new ::Brand(*parent_);
-    parent_ = NULL;
-    return temp;
-  }
-}
-::Brand* Brand::unsafe_arena_release_parent() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Brand.parent)
-  
-  ::Brand* temp = parent_;
-  parent_ = NULL;
-  return temp;
-}
-void Brand::_slow_set_allocated_parent(
-    ::google::protobuf::Arena* message_arena, ::Brand** parent) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*parent) == NULL) {
-      message_arena->Own(*parent);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*parent)) {
-      ::Brand* new_parent = 
-            ::google::protobuf::Arena::CreateMessage< ::Brand >(
-            message_arena);
-      new_parent->CopyFrom(**parent);
-      *parent = new_parent;
-    }
-}
-void Brand::unsafe_arena_set_allocated_parent(
-    ::Brand* parent) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete parent_;
-  }
-  parent_ = parent;
-  if (parent) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Brand.parent)
-}
-void Brand::_slow_mutable_summary() {
-  summary_ = ::google::protobuf::Arena::CreateMessage< ::Content >(
-      GetArenaNoVirtual());
-}
-::Content* Brand::_slow_release_summary() {
-  if (summary_ == NULL) {
-    return NULL;
-  } else {
-    ::Content* temp = new ::Content(*summary_);
-    summary_ = NULL;
-    return temp;
-  }
-}
-::Content* Brand::unsafe_arena_release_summary() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Brand.summary)
-  
-  ::Content* temp = summary_;
-  summary_ = NULL;
-  return temp;
-}
-void Brand::_slow_set_allocated_summary(
-    ::google::protobuf::Arena* message_arena, ::Content** summary) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*summary) == NULL) {
-      message_arena->Own(*summary);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*summary)) {
-      ::Content* new_summary = 
-            ::google::protobuf::Arena::CreateMessage< ::Content >(
-            message_arena);
-      new_summary->CopyFrom(**summary);
-      *summary = new_summary;
-    }
-}
-void Brand::unsafe_arena_set_allocated_summary(
-    ::Content* summary) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete summary_;
-  }
-  summary_ = summary;
-  if (summary) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Brand.summary)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Brand::kNameFieldNumber;
-const int Brand::kParentFieldNumber;
-const int Brand::kSummaryFieldNumber;
-const int Brand::kMediaFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Brand::Brand()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_content_2fBrand_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Brand)
-}
-Brand::Brand(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena),
-  media_(arena) {
-  protobuf_content_2fBrand_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Brand)
-}
-Brand::Brand(const Brand& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      media_(from.media_),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_name()) {
-    name_ = new ::Name(*from.name_);
-  } else {
-    name_ = NULL;
-  }
-  if (from.has_parent()) {
-    parent_ = new ::Brand(*from.parent_);
-  } else {
-    parent_ = NULL;
-  }
-  if (from.has_summary()) {
-    summary_ = new ::Content(*from.summary_);
-  } else {
-    summary_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:Brand)
-}
-
-void Brand::SharedCtor() {
-  ::memset(&name_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&summary_) -
-      reinterpret_cast<char*>(&name_)) + sizeof(summary_));
-  _cached_size_ = 0;
-}
-
-Brand::~Brand() {
-  // @@protoc_insertion_point(destructor:Brand)
-  SharedDtor();
-}
-
-void Brand::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete name_;
-  if (this != internal_default_instance()) delete parent_;
-  if (this != internal_default_instance()) delete summary_;
-}
-
-void Brand::ArenaDtor(void* object) {
-  Brand* _this = reinterpret_cast< Brand* >(object);
-  (void)_this;
-}
-void Brand::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Brand::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Brand::descriptor() {
-  protobuf_content_2fBrand_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fBrand_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Brand& Brand::default_instance() {
-  protobuf_content_2fBrand_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Brand* Brand::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Brand>(arena);
-}
-
-void Brand::Clear() {
-// @@protoc_insertion_point(message_clear_start:Brand)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  media_.Clear();
-  if (GetArenaNoVirtual() == NULL && name_ != NULL) {
-    delete name_;
-  }
-  name_ = NULL;
-  if (GetArenaNoVirtual() == NULL && parent_ != NULL) {
-    delete parent_;
-  }
-  parent_ = NULL;
-  if (GetArenaNoVirtual() == NULL && summary_ != NULL) {
-    delete summary_;
-  }
-  summary_ = NULL;
-  _internal_metadata_.Clear();
-}
-
-bool Brand::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Brand)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .Name name = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_name()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Brand parent = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_parent()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Content summary = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_summary()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // repeated .MediaItem media = 20;
-      case 20: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(162u /* 162 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_media()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Brand)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Brand)
-  return false;
-#undef DO_
-}
-
-void Brand::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Brand)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Name name = 1;
-  if (this->has_name()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->name_, output);
-  }
-
-  // .Brand parent = 2;
-  if (this->has_parent()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->parent_, output);
-  }
-
-  // .Content summary = 3;
-  if (this->has_summary()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, *this->summary_, output);
-  }
-
-  // repeated .MediaItem media = 20;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->media_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, this->media(static_cast<int>(i)), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Brand)
-}
-
-::google::protobuf::uint8* Brand::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Brand)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Name name = 1;
-  if (this->has_name()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->name_, deterministic, target);
-  }
-
-  // .Brand parent = 2;
-  if (this->has_parent()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->parent_, deterministic, target);
-  }
-
-  // .Content summary = 3;
-  if (this->has_summary()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        3, *this->summary_, deterministic, target);
-  }
-
-  // repeated .MediaItem media = 20;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->media_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        20, this->media(static_cast<int>(i)), deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Brand)
-  return target;
-}
-
-size_t Brand::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Brand)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // repeated .MediaItem media = 20;
-  {
-    unsigned int count = static_cast<unsigned int>(this->media_size());
-    total_size += 2UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->media(static_cast<int>(i)));
-    }
-  }
-
-  // .Name name = 1;
-  if (this->has_name()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->name_);
-  }
-
-  // .Brand parent = 2;
-  if (this->has_parent()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->parent_);
-  }
-
-  // .Content summary = 3;
-  if (this->has_summary()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->summary_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Brand::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Brand)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Brand* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Brand>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Brand)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Brand)
-    MergeFrom(*source);
-  }
-}
-
-void Brand::MergeFrom(const Brand& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Brand)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  media_.MergeFrom(from.media_);
-  if (from.has_name()) {
-    mutable_name()->::Name::MergeFrom(from.name());
-  }
-  if (from.has_parent()) {
-    mutable_parent()->::Brand::MergeFrom(from.parent());
-  }
-  if (from.has_summary()) {
-    mutable_summary()->::Content::MergeFrom(from.summary());
-  }
-}
-
-void Brand::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Brand)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Brand::CopyFrom(const Brand& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Brand)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Brand::IsInitialized() const {
-  return true;
-}
-
-void Brand::Swap(Brand* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Brand* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Brand::UnsafeArenaSwap(Brand* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Brand::InternalSwap(Brand* other) {
-  using std::swap;
-  media_.InternalSwap(&other->media_);
-  swap(name_, other->name_);
-  swap(parent_, other->parent_);
-  swap(summary_, other->summary_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Brand::GetMetadata() const {
-  protobuf_content_2fBrand_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fBrand_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Brand
-
-// .Name name = 1;
-bool Brand::has_name() const {
-  return this != internal_default_instance() && name_ != NULL;
-}
-void Brand::clear_name() {
-  if (GetArenaNoVirtual() == NULL && name_ != NULL) delete name_;
-  name_ = NULL;
-}
-const ::Name& Brand::name() const {
-  const ::Name* p = name_;
-  // @@protoc_insertion_point(field_get:Brand.name)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-::Name* Brand::mutable_name() {
-  
-  if (name_ == NULL) {
-    _slow_mutable_name();
-  }
-  // @@protoc_insertion_point(field_mutable:Brand.name)
-  return name_;
-}
-::Name* Brand::release_name() {
-  // @@protoc_insertion_point(field_release:Brand.name)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_name();
-  } else {
-    ::Name* temp = name_;
-    name_ = NULL;
-    return temp;
-  }
-}
- void Brand::set_allocated_name(::Name* name) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete name_;
-  }
-  if (name != NULL) {
-    _slow_set_allocated_name(message_arena, &name);
-  }
-  name_ = name;
-  if (name) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Brand.name)
-}
-
-// .Brand parent = 2;
-bool Brand::has_parent() const {
-  return this != internal_default_instance() && parent_ != NULL;
-}
-void Brand::clear_parent() {
-  if (GetArenaNoVirtual() == NULL && parent_ != NULL) delete parent_;
-  parent_ = NULL;
-}
-const ::Brand& Brand::parent() const {
-  const ::Brand* p = parent_;
-  // @@protoc_insertion_point(field_get:Brand.parent)
-  return p != NULL ? *p : *reinterpret_cast<const ::Brand*>(
-      &::_Brand_default_instance_);
-}
-::Brand* Brand::mutable_parent() {
-  
-  if (parent_ == NULL) {
-    _slow_mutable_parent();
-  }
-  // @@protoc_insertion_point(field_mutable:Brand.parent)
-  return parent_;
-}
-::Brand* Brand::release_parent() {
-  // @@protoc_insertion_point(field_release:Brand.parent)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_parent();
-  } else {
-    ::Brand* temp = parent_;
-    parent_ = NULL;
-    return temp;
-  }
-}
- void Brand::set_allocated_parent(::Brand* parent) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete parent_;
-  }
-  if (parent != NULL) {
-    _slow_set_allocated_parent(message_arena, &parent);
-  }
-  parent_ = parent;
-  if (parent) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Brand.parent)
-}
-
-// .Content summary = 3;
-bool Brand::has_summary() const {
-  return this != internal_default_instance() && summary_ != NULL;
-}
-void Brand::clear_summary() {
-  if (GetArenaNoVirtual() == NULL && summary_ != NULL) delete summary_;
-  summary_ = NULL;
-}
-const ::Content& Brand::summary() const {
-  const ::Content* p = summary_;
-  // @@protoc_insertion_point(field_get:Brand.summary)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-::Content* Brand::mutable_summary() {
-  
-  if (summary_ == NULL) {
-    _slow_mutable_summary();
-  }
-  // @@protoc_insertion_point(field_mutable:Brand.summary)
-  return summary_;
-}
-::Content* Brand::release_summary() {
-  // @@protoc_insertion_point(field_release:Brand.summary)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_summary();
-  } else {
-    ::Content* temp = summary_;
-    summary_ = NULL;
-    return temp;
-  }
-}
- void Brand::set_allocated_summary(::Content* summary) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete summary_;
-  }
-  if (summary != NULL) {
-    _slow_set_allocated_summary(message_arena, &summary);
-  }
-  summary_ = summary;
-  if (summary) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Brand.summary)
-}
-
-// repeated .MediaItem media = 20;
-int Brand::media_size() const {
-  return media_.size();
-}
-void Brand::clear_media() {
-  media_.Clear();
-}
-const ::MediaItem& Brand::media(int index) const {
-  // @@protoc_insertion_point(field_get:Brand.media)
-  return media_.Get(index);
-}
-::MediaItem* Brand::mutable_media(int index) {
-  // @@protoc_insertion_point(field_mutable:Brand.media)
-  return media_.Mutable(index);
-}
-::MediaItem* Brand::add_media() {
-  // @@protoc_insertion_point(field_add:Brand.media)
-  return media_.Add();
-}
-::google::protobuf::RepeatedPtrField< ::MediaItem >*
-Brand::mutable_media() {
-  // @@protoc_insertion_point(field_mutable_list:Brand.media)
-  return &media_;
-}
-const ::google::protobuf::RepeatedPtrField< ::MediaItem >&
-Brand::media() const {
-  // @@protoc_insertion_point(field_list:Brand.media)
-  return media_;
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/content/Brand.pb.h b/languages/cpp/content/Brand.pb.h
deleted file mode 100644
index 05716db..0000000
--- a/languages/cpp/content/Brand.pb.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-#ifndef PROTOBUF_content_2fBrand_2eproto__INCLUDED
-#define PROTOBUF_content_2fBrand_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "content/Name.pb.h"
-#include "content/Content.pb.h"
-#include "media/MediaItem.pb.h"
-// @@protoc_insertion_point(includes)
-class Brand;
-class BrandDefaultTypeInternal;
-extern BrandDefaultTypeInternal _Brand_default_instance_;
-
-namespace protobuf_content_2fBrand_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_content_2fBrand_2eproto
-
-// ===================================================================
-
-class Brand : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Brand) */ {
- public:
-  Brand();
-  virtual ~Brand();
-
-  Brand(const Brand& from);
-
-  inline Brand& operator=(const Brand& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Brand(Brand&& from) noexcept
-    : Brand() {
-    *this = ::std::move(from);
-  }
-
-  inline Brand& operator=(Brand&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Brand& default_instance();
-
-  static inline const Brand* internal_default_instance() {
-    return reinterpret_cast<const Brand*>(
-               &_Brand_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Brand* other);
-  void Swap(Brand* other);
-  friend void swap(Brand& a, Brand& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Brand* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Brand* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Brand& from);
-  void MergeFrom(const Brand& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Brand* other);
-  protected:
-  explicit Brand(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .MediaItem media = 20;
-  int media_size() const;
-  void clear_media();
-  static const int kMediaFieldNumber = 20;
-  const ::MediaItem& media(int index) const;
-  ::MediaItem* mutable_media(int index);
-  ::MediaItem* add_media();
-  ::google::protobuf::RepeatedPtrField< ::MediaItem >*
-      mutable_media();
-  const ::google::protobuf::RepeatedPtrField< ::MediaItem >&
-      media() const;
-
-  // .Name name = 1;
-  bool has_name() const;
-  void clear_name();
-  static const int kNameFieldNumber = 1;
-  private:
-  void _slow_mutable_name();
-  void _slow_set_allocated_name(
-      ::google::protobuf::Arena* message_arena, ::Name** name);
-  ::Name* _slow_release_name();
-  public:
-  const ::Name& name() const;
-  ::Name* mutable_name();
-  ::Name* release_name();
-  void set_allocated_name(::Name* name);
-  ::Name* unsafe_arena_release_name();
-  void unsafe_arena_set_allocated_name(
-      ::Name* name);
-
-  // .Brand parent = 2;
-  bool has_parent() const;
-  void clear_parent();
-  static const int kParentFieldNumber = 2;
-  private:
-  void _slow_mutable_parent();
-  void _slow_set_allocated_parent(
-      ::google::protobuf::Arena* message_arena, ::Brand** parent);
-  ::Brand* _slow_release_parent();
-  public:
-  const ::Brand& parent() const;
-  ::Brand* mutable_parent();
-  ::Brand* release_parent();
-  void set_allocated_parent(::Brand* parent);
-  ::Brand* unsafe_arena_release_parent();
-  void unsafe_arena_set_allocated_parent(
-      ::Brand* parent);
-
-  // .Content summary = 3;
-  bool has_summary() const;
-  void clear_summary();
-  static const int kSummaryFieldNumber = 3;
-  private:
-  void _slow_mutable_summary();
-  void _slow_set_allocated_summary(
-      ::google::protobuf::Arena* message_arena, ::Content** summary);
-  ::Content* _slow_release_summary();
-  public:
-  const ::Content& summary() const;
-  ::Content* mutable_summary();
-  ::Content* release_summary();
-  void set_allocated_summary(::Content* summary);
-  ::Content* unsafe_arena_release_summary();
-  void unsafe_arena_set_allocated_summary(
-      ::Content* summary);
-
-  // @@protoc_insertion_point(class_scope:Brand)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::RepeatedPtrField< ::MediaItem > media_;
-  ::Name* name_;
-  ::Brand* parent_;
-  ::Content* summary_;
-  mutable int _cached_size_;
-  friend struct protobuf_content_2fBrand_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Brand
-
-// .Name name = 1;
-inline bool Brand::has_name() const {
-  return this != internal_default_instance() && name_ != NULL;
-}
-inline void Brand::clear_name() {
-  if (GetArenaNoVirtual() == NULL && name_ != NULL) delete name_;
-  name_ = NULL;
-}
-inline const ::Name& Brand::name() const {
-  const ::Name* p = name_;
-  // @@protoc_insertion_point(field_get:Brand.name)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-inline ::Name* Brand::mutable_name() {
-  
-  if (name_ == NULL) {
-    _slow_mutable_name();
-  }
-  // @@protoc_insertion_point(field_mutable:Brand.name)
-  return name_;
-}
-inline ::Name* Brand::release_name() {
-  // @@protoc_insertion_point(field_release:Brand.name)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_name();
-  } else {
-    ::Name* temp = name_;
-    name_ = NULL;
-    return temp;
-  }
-}
-inline  void Brand::set_allocated_name(::Name* name) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete name_;
-  }
-  if (name != NULL) {
-    _slow_set_allocated_name(message_arena, &name);
-  }
-  name_ = name;
-  if (name) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Brand.name)
-}
-
-// .Brand parent = 2;
-inline bool Brand::has_parent() const {
-  return this != internal_default_instance() && parent_ != NULL;
-}
-inline void Brand::clear_parent() {
-  if (GetArenaNoVirtual() == NULL && parent_ != NULL) delete parent_;
-  parent_ = NULL;
-}
-inline const ::Brand& Brand::parent() const {
-  const ::Brand* p = parent_;
-  // @@protoc_insertion_point(field_get:Brand.parent)
-  return p != NULL ? *p : *reinterpret_cast<const ::Brand*>(
-      &::_Brand_default_instance_);
-}
-inline ::Brand* Brand::mutable_parent() {
-  
-  if (parent_ == NULL) {
-    _slow_mutable_parent();
-  }
-  // @@protoc_insertion_point(field_mutable:Brand.parent)
-  return parent_;
-}
-inline ::Brand* Brand::release_parent() {
-  // @@protoc_insertion_point(field_release:Brand.parent)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_parent();
-  } else {
-    ::Brand* temp = parent_;
-    parent_ = NULL;
-    return temp;
-  }
-}
-inline  void Brand::set_allocated_parent(::Brand* parent) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete parent_;
-  }
-  if (parent != NULL) {
-    _slow_set_allocated_parent(message_arena, &parent);
-  }
-  parent_ = parent;
-  if (parent) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Brand.parent)
-}
-
-// .Content summary = 3;
-inline bool Brand::has_summary() const {
-  return this != internal_default_instance() && summary_ != NULL;
-}
-inline void Brand::clear_summary() {
-  if (GetArenaNoVirtual() == NULL && summary_ != NULL) delete summary_;
-  summary_ = NULL;
-}
-inline const ::Content& Brand::summary() const {
-  const ::Content* p = summary_;
-  // @@protoc_insertion_point(field_get:Brand.summary)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-inline ::Content* Brand::mutable_summary() {
-  
-  if (summary_ == NULL) {
-    _slow_mutable_summary();
-  }
-  // @@protoc_insertion_point(field_mutable:Brand.summary)
-  return summary_;
-}
-inline ::Content* Brand::release_summary() {
-  // @@protoc_insertion_point(field_release:Brand.summary)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_summary();
-  } else {
-    ::Content* temp = summary_;
-    summary_ = NULL;
-    return temp;
-  }
-}
-inline  void Brand::set_allocated_summary(::Content* summary) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete summary_;
-  }
-  if (summary != NULL) {
-    _slow_set_allocated_summary(message_arena, &summary);
-  }
-  summary_ = summary;
-  if (summary) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Brand.summary)
-}
-
-// repeated .MediaItem media = 20;
-inline int Brand::media_size() const {
-  return media_.size();
-}
-inline void Brand::clear_media() {
-  media_.Clear();
-}
-inline const ::MediaItem& Brand::media(int index) const {
-  // @@protoc_insertion_point(field_get:Brand.media)
-  return media_.Get(index);
-}
-inline ::MediaItem* Brand::mutable_media(int index) {
-  // @@protoc_insertion_point(field_mutable:Brand.media)
-  return media_.Mutable(index);
-}
-inline ::MediaItem* Brand::add_media() {
-  // @@protoc_insertion_point(field_add:Brand.media)
-  return media_.Add();
-}
-inline ::google::protobuf::RepeatedPtrField< ::MediaItem >*
-Brand::mutable_media() {
-  // @@protoc_insertion_point(field_mutable_list:Brand.media)
-  return &media_;
-}
-inline const ::google::protobuf::RepeatedPtrField< ::MediaItem >&
-Brand::media() const {
-  // @@protoc_insertion_point(field_list:Brand.media)
-  return media_;
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_content_2fBrand_2eproto__INCLUDED
diff --git a/languages/cpp/content/Content.pb.cc b/languages/cpp/content/Content.pb.cc
deleted file mode 100644
index 72bb44a..0000000
--- a/languages/cpp/content/Content.pb.cc
+++ /dev/null
@@ -1,849 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "content/Content.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ContentDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Content>
-     _instance;
-} _Content_default_instance_;
-
-namespace protobuf_content_2fContent_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Content, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Content, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Content, encoding_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Content, content_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Content, language_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Content, compression_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Content)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Content_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "content/Content.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_base_2fLanguage_2eproto::InitDefaults();
-  ::protobuf_base_2fCompression_2eproto::InitDefaults();
-  _Content_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Content_default_instance_);_Content_default_instance_._instance.get_mutable()->compression_ = const_cast< ::Compression*>(
-      ::Compression::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\025content/Content.proto\032\023base/Language.p"
-      "roto\032\026base/Compression.proto\"\334\001\n\007Content"
-      "\022\033\n\004type\030\001 \001(\0162\r.Content.Type\022#\n\010encodin"
-      "g\030\002 \001(\0162\021.Content.Encoding\022\017\n\007content\030\003 "
-      "\001(\014\022\033\n\010language\030\004 \001(\0162\t.Language\022!\n\013comp"
-      "ression\030\005 \001(\0132\014.Compression\"(\n\004Type\022\010\n\004T"
-      "EXT\020\000\022\014\n\010MARKDOWN\020\001\022\010\n\004HTML\020\002\"\024\n\010Encodin"
-      "g\022\010\n\004UTF8\020\000B3\n\032io.bloombox.schema.conten"
-      "tB\016GenericContentH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 352);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "content/Content.proto", &protobuf_RegisterTypes);
-  ::protobuf_base_2fLanguage_2eproto::AddDescriptors();
-  ::protobuf_base_2fCompression_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_content_2fContent_2eproto
-
-const ::google::protobuf::EnumDescriptor* Content_Type_descriptor() {
-  protobuf_content_2fContent_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fContent_2eproto::file_level_enum_descriptors[0];
-}
-bool Content_Type_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const Content_Type Content::TEXT;
-const Content_Type Content::MARKDOWN;
-const Content_Type Content::HTML;
-const Content_Type Content::Type_MIN;
-const Content_Type Content::Type_MAX;
-const int Content::Type_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-const ::google::protobuf::EnumDescriptor* Content_Encoding_descriptor() {
-  protobuf_content_2fContent_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fContent_2eproto::file_level_enum_descriptors[1];
-}
-bool Content_Encoding_IsValid(int value) {
-  switch (value) {
-    case 0:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const Content_Encoding Content::UTF8;
-const Content_Encoding Content::Encoding_MIN;
-const Content_Encoding Content::Encoding_MAX;
-const int Content::Encoding_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-// ===================================================================
-
-void Content::_slow_mutable_compression() {
-  compression_ = ::google::protobuf::Arena::CreateMessage< ::Compression >(
-      GetArenaNoVirtual());
-}
-::Compression* Content::_slow_release_compression() {
-  if (compression_ == NULL) {
-    return NULL;
-  } else {
-    ::Compression* temp = new ::Compression(*compression_);
-    compression_ = NULL;
-    return temp;
-  }
-}
-::Compression* Content::unsafe_arena_release_compression() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Content.compression)
-  
-  ::Compression* temp = compression_;
-  compression_ = NULL;
-  return temp;
-}
-void Content::_slow_set_allocated_compression(
-    ::google::protobuf::Arena* message_arena, ::Compression** compression) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*compression) == NULL) {
-      message_arena->Own(*compression);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*compression)) {
-      ::Compression* new_compression = 
-            ::google::protobuf::Arena::CreateMessage< ::Compression >(
-            message_arena);
-      new_compression->CopyFrom(**compression);
-      *compression = new_compression;
-    }
-}
-void Content::unsafe_arena_set_allocated_compression(
-    ::Compression* compression) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete compression_;
-  }
-  compression_ = compression;
-  if (compression) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Content.compression)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Content::kTypeFieldNumber;
-const int Content::kEncodingFieldNumber;
-const int Content::kContentFieldNumber;
-const int Content::kLanguageFieldNumber;
-const int Content::kCompressionFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Content::Content()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_content_2fContent_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Content)
-}
-Content::Content(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_content_2fContent_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Content)
-}
-Content::Content(const Content& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  content_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.content().size() > 0) {
-    content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.content(),
-      GetArenaNoVirtual());
-  }
-  if (from.has_compression()) {
-    compression_ = new ::Compression(*from.compression_);
-  } else {
-    compression_ = NULL;
-  }
-  ::memcpy(&type_, &from.type_,
-    static_cast<size_t>(reinterpret_cast<char*>(&language_) -
-    reinterpret_cast<char*>(&type_)) + sizeof(language_));
-  // @@protoc_insertion_point(copy_constructor:Content)
-}
-
-void Content::SharedCtor() {
-  content_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  ::memset(&compression_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&language_) -
-      reinterpret_cast<char*>(&compression_)) + sizeof(language_));
-  _cached_size_ = 0;
-}
-
-Content::~Content() {
-  // @@protoc_insertion_point(destructor:Content)
-  SharedDtor();
-}
-
-void Content::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  content_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
-  if (this != internal_default_instance()) delete compression_;
-}
-
-void Content::ArenaDtor(void* object) {
-  Content* _this = reinterpret_cast< Content* >(object);
-  (void)_this;
-}
-void Content::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Content::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Content::descriptor() {
-  protobuf_content_2fContent_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fContent_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Content& Content::default_instance() {
-  protobuf_content_2fContent_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Content* Content::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Content>(arena);
-}
-
-void Content::Clear() {
-// @@protoc_insertion_point(message_clear_start:Content)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  content_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-  if (GetArenaNoVirtual() == NULL && compression_ != NULL) {
-    delete compression_;
-  }
-  compression_ = NULL;
-  ::memset(&type_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&language_) -
-      reinterpret_cast<char*>(&type_)) + sizeof(language_));
-  _internal_metadata_.Clear();
-}
-
-bool Content::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Content)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .Content.Type type = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_type(static_cast< ::Content_Type >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Content.Encoding encoding = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_encoding(static_cast< ::Content_Encoding >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bytes content = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
-                input, this->mutable_content()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Language language = 4;
-      case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(32u /* 32 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_language(static_cast< ::Language >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Compression compression = 5;
-      case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_compression()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Content)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Content)
-  return false;
-#undef DO_
-}
-
-void Content::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Content)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Content.Type type = 1;
-  if (this->type() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->type(), output);
-  }
-
-  // .Content.Encoding encoding = 2;
-  if (this->encoding() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->encoding(), output);
-  }
-
-  // bytes content = 3;
-  if (this->content().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
-      3, this->content(), output);
-  }
-
-  // .Language language = 4;
-  if (this->language() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      4, this->language(), output);
-  }
-
-  // .Compression compression = 5;
-  if (this->has_compression()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, *this->compression_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Content)
-}
-
-::google::protobuf::uint8* Content::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Content)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Content.Type type = 1;
-  if (this->type() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->type(), target);
-  }
-
-  // .Content.Encoding encoding = 2;
-  if (this->encoding() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->encoding(), target);
-  }
-
-  // bytes content = 3;
-  if (this->content().size() > 0) {
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
-        3, this->content(), target);
-  }
-
-  // .Language language = 4;
-  if (this->language() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      4, this->language(), target);
-  }
-
-  // .Compression compression = 5;
-  if (this->has_compression()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        5, *this->compression_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Content)
-  return target;
-}
-
-size_t Content::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Content)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // bytes content = 3;
-  if (this->content().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::BytesSize(
-        this->content());
-  }
-
-  // .Compression compression = 5;
-  if (this->has_compression()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->compression_);
-  }
-
-  // .Content.Type type = 1;
-  if (this->type() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-  }
-
-  // .Content.Encoding encoding = 2;
-  if (this->encoding() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->encoding());
-  }
-
-  // .Language language = 4;
-  if (this->language() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->language());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Content::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Content)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Content* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Content>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Content)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Content)
-    MergeFrom(*source);
-  }
-}
-
-void Content::MergeFrom(const Content& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Content)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.content().size() > 0) {
-    set_content(from.content());
-  }
-  if (from.has_compression()) {
-    mutable_compression()->::Compression::MergeFrom(from.compression());
-  }
-  if (from.type() != 0) {
-    set_type(from.type());
-  }
-  if (from.encoding() != 0) {
-    set_encoding(from.encoding());
-  }
-  if (from.language() != 0) {
-    set_language(from.language());
-  }
-}
-
-void Content::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Content)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Content::CopyFrom(const Content& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Content)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Content::IsInitialized() const {
-  return true;
-}
-
-void Content::Swap(Content* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Content* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Content::UnsafeArenaSwap(Content* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Content::InternalSwap(Content* other) {
-  using std::swap;
-  content_.Swap(&other->content_);
-  swap(compression_, other->compression_);
-  swap(type_, other->type_);
-  swap(encoding_, other->encoding_);
-  swap(language_, other->language_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Content::GetMetadata() const {
-  protobuf_content_2fContent_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fContent_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Content
-
-// .Content.Type type = 1;
-void Content::clear_type() {
-  type_ = 0;
-}
-::Content_Type Content::type() const {
-  // @@protoc_insertion_point(field_get:Content.type)
-  return static_cast< ::Content_Type >(type_);
-}
-void Content::set_type(::Content_Type value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:Content.type)
-}
-
-// .Content.Encoding encoding = 2;
-void Content::clear_encoding() {
-  encoding_ = 0;
-}
-::Content_Encoding Content::encoding() const {
-  // @@protoc_insertion_point(field_get:Content.encoding)
-  return static_cast< ::Content_Encoding >(encoding_);
-}
-void Content::set_encoding(::Content_Encoding value) {
-  
-  encoding_ = value;
-  // @@protoc_insertion_point(field_set:Content.encoding)
-}
-
-// bytes content = 3;
-void Content::clear_content() {
-  content_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-const ::std::string& Content::content() const {
-  // @@protoc_insertion_point(field_get:Content.content)
-  return content_.Get();
-}
-void Content::set_content(const ::std::string& value) {
-  
-  content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:Content.content)
-}
-#if LANG_CXX11
-void Content::set_content(::std::string&& value) {
-  
-  content_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:Content.content)
-}
-#endif
-void Content::set_content(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:Content.content)
-}
-void Content::set_content(const void* value,
-    size_t size) {
-  
-  content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:Content.content)
-}
-::std::string* Content::mutable_content() {
-  
-  // @@protoc_insertion_point(field_mutable:Content.content)
-  return content_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* Content::release_content() {
-  // @@protoc_insertion_point(field_release:Content.content)
-  
-  return content_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* Content::unsafe_arena_release_content() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Content.content)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return content_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-void Content::set_allocated_content(::std::string* content) {
-  if (content != NULL) {
-    
-  } else {
-    
-  }
-  content_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), content,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:Content.content)
-}
-void Content::unsafe_arena_set_allocated_content(
-    ::std::string* content) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (content != NULL) {
-    
-  } else {
-    
-  }
-  content_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      content, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Content.content)
-}
-
-// .Language language = 4;
-void Content::clear_language() {
-  language_ = 0;
-}
-::Language Content::language() const {
-  // @@protoc_insertion_point(field_get:Content.language)
-  return static_cast< ::Language >(language_);
-}
-void Content::set_language(::Language value) {
-  
-  language_ = value;
-  // @@protoc_insertion_point(field_set:Content.language)
-}
-
-// .Compression compression = 5;
-bool Content::has_compression() const {
-  return this != internal_default_instance() && compression_ != NULL;
-}
-void Content::clear_compression() {
-  if (GetArenaNoVirtual() == NULL && compression_ != NULL) delete compression_;
-  compression_ = NULL;
-}
-const ::Compression& Content::compression() const {
-  const ::Compression* p = compression_;
-  // @@protoc_insertion_point(field_get:Content.compression)
-  return p != NULL ? *p : *reinterpret_cast<const ::Compression*>(
-      &::_Compression_default_instance_);
-}
-::Compression* Content::mutable_compression() {
-  
-  if (compression_ == NULL) {
-    _slow_mutable_compression();
-  }
-  // @@protoc_insertion_point(field_mutable:Content.compression)
-  return compression_;
-}
-::Compression* Content::release_compression() {
-  // @@protoc_insertion_point(field_release:Content.compression)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_compression();
-  } else {
-    ::Compression* temp = compression_;
-    compression_ = NULL;
-    return temp;
-  }
-}
- void Content::set_allocated_compression(::Compression* compression) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete compression_;
-  }
-  if (compression != NULL) {
-    _slow_set_allocated_compression(message_arena, &compression);
-  }
-  compression_ = compression;
-  if (compression) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Content.compression)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/content/Content.pb.h b/languages/cpp/content/Content.pb.h
deleted file mode 100644
index de9fc5e..0000000
--- a/languages/cpp/content/Content.pb.h
+++ /dev/null
@@ -1,518 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-#ifndef PROTOBUF_content_2fContent_2eproto__INCLUDED
-#define PROTOBUF_content_2fContent_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-#include "base/Language.pb.h"
-#include "base/Compression.pb.h"
-// @@protoc_insertion_point(includes)
-class Content;
-class ContentDefaultTypeInternal;
-extern ContentDefaultTypeInternal _Content_default_instance_;
-
-namespace protobuf_content_2fContent_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_content_2fContent_2eproto
-
-enum Content_Type {
-  Content_Type_TEXT = 0,
-  Content_Type_MARKDOWN = 1,
-  Content_Type_HTML = 2,
-  Content_Type_Content_Type_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  Content_Type_Content_Type_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool Content_Type_IsValid(int value);
-const Content_Type Content_Type_Type_MIN = Content_Type_TEXT;
-const Content_Type Content_Type_Type_MAX = Content_Type_HTML;
-const int Content_Type_Type_ARRAYSIZE = Content_Type_Type_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* Content_Type_descriptor();
-inline const ::std::string& Content_Type_Name(Content_Type value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    Content_Type_descriptor(), value);
-}
-inline bool Content_Type_Parse(
-    const ::std::string& name, Content_Type* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Content_Type>(
-    Content_Type_descriptor(), name, value);
-}
-enum Content_Encoding {
-  Content_Encoding_UTF8 = 0,
-  Content_Encoding_Content_Encoding_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  Content_Encoding_Content_Encoding_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool Content_Encoding_IsValid(int value);
-const Content_Encoding Content_Encoding_Encoding_MIN = Content_Encoding_UTF8;
-const Content_Encoding Content_Encoding_Encoding_MAX = Content_Encoding_UTF8;
-const int Content_Encoding_Encoding_ARRAYSIZE = Content_Encoding_Encoding_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* Content_Encoding_descriptor();
-inline const ::std::string& Content_Encoding_Name(Content_Encoding value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    Content_Encoding_descriptor(), value);
-}
-inline bool Content_Encoding_Parse(
-    const ::std::string& name, Content_Encoding* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Content_Encoding>(
-    Content_Encoding_descriptor(), name, value);
-}
-// ===================================================================
-
-class Content : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Content) */ {
- public:
-  Content();
-  virtual ~Content();
-
-  Content(const Content& from);
-
-  inline Content& operator=(const Content& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Content(Content&& from) noexcept
-    : Content() {
-    *this = ::std::move(from);
-  }
-
-  inline Content& operator=(Content&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Content& default_instance();
-
-  static inline const Content* internal_default_instance() {
-    return reinterpret_cast<const Content*>(
-               &_Content_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Content* other);
-  void Swap(Content* other);
-  friend void swap(Content& a, Content& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Content* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Content* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Content& from);
-  void MergeFrom(const Content& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Content* other);
-  protected:
-  explicit Content(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  typedef Content_Type Type;
-  static const Type TEXT =
-    Content_Type_TEXT;
-  static const Type MARKDOWN =
-    Content_Type_MARKDOWN;
-  static const Type HTML =
-    Content_Type_HTML;
-  static inline bool Type_IsValid(int value) {
-    return Content_Type_IsValid(value);
-  }
-  static const Type Type_MIN =
-    Content_Type_Type_MIN;
-  static const Type Type_MAX =
-    Content_Type_Type_MAX;
-  static const int Type_ARRAYSIZE =
-    Content_Type_Type_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  Type_descriptor() {
-    return Content_Type_descriptor();
-  }
-  static inline const ::std::string& Type_Name(Type value) {
-    return Content_Type_Name(value);
-  }
-  static inline bool Type_Parse(const ::std::string& name,
-      Type* value) {
-    return Content_Type_Parse(name, value);
-  }
-
-  typedef Content_Encoding Encoding;
-  static const Encoding UTF8 =
-    Content_Encoding_UTF8;
-  static inline bool Encoding_IsValid(int value) {
-    return Content_Encoding_IsValid(value);
-  }
-  static const Encoding Encoding_MIN =
-    Content_Encoding_Encoding_MIN;
-  static const Encoding Encoding_MAX =
-    Content_Encoding_Encoding_MAX;
-  static const int Encoding_ARRAYSIZE =
-    Content_Encoding_Encoding_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  Encoding_descriptor() {
-    return Content_Encoding_descriptor();
-  }
-  static inline const ::std::string& Encoding_Name(Encoding value) {
-    return Content_Encoding_Name(value);
-  }
-  static inline bool Encoding_Parse(const ::std::string& name,
-      Encoding* value) {
-    return Content_Encoding_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  // bytes content = 3;
-  void clear_content();
-  static const int kContentFieldNumber = 3;
-  const ::std::string& content() const;
-  void set_content(const ::std::string& value);
-  #if LANG_CXX11
-  void set_content(::std::string&& value);
-  #endif
-  void set_content(const char* value);
-  void set_content(const void* value, size_t size);
-  ::std::string* mutable_content();
-  ::std::string* release_content();
-  void set_allocated_content(::std::string* content);
-  ::std::string* unsafe_arena_release_content();
-  void unsafe_arena_set_allocated_content(
-      ::std::string* content);
-
-  // .Compression compression = 5;
-  bool has_compression() const;
-  void clear_compression();
-  static const int kCompressionFieldNumber = 5;
-  private:
-  void _slow_mutable_compression();
-  void _slow_set_allocated_compression(
-      ::google::protobuf::Arena* message_arena, ::Compression** compression);
-  ::Compression* _slow_release_compression();
-  public:
-  const ::Compression& compression() const;
-  ::Compression* mutable_compression();
-  ::Compression* release_compression();
-  void set_allocated_compression(::Compression* compression);
-  ::Compression* unsafe_arena_release_compression();
-  void unsafe_arena_set_allocated_compression(
-      ::Compression* compression);
-
-  // .Content.Type type = 1;
-  void clear_type();
-  static const int kTypeFieldNumber = 1;
-  ::Content_Type type() const;
-  void set_type(::Content_Type value);
-
-  // .Content.Encoding encoding = 2;
-  void clear_encoding();
-  static const int kEncodingFieldNumber = 2;
-  ::Content_Encoding encoding() const;
-  void set_encoding(::Content_Encoding value);
-
-  // .Language language = 4;
-  void clear_language();
-  static const int kLanguageFieldNumber = 4;
-  ::Language language() const;
-  void set_language(::Language value);
-
-  // @@protoc_insertion_point(class_scope:Content)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::internal::ArenaStringPtr content_;
-  ::Compression* compression_;
-  int type_;
-  int encoding_;
-  int language_;
-  mutable int _cached_size_;
-  friend struct protobuf_content_2fContent_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Content
-
-// .Content.Type type = 1;
-inline void Content::clear_type() {
-  type_ = 0;
-}
-inline ::Content_Type Content::type() const {
-  // @@protoc_insertion_point(field_get:Content.type)
-  return static_cast< ::Content_Type >(type_);
-}
-inline void Content::set_type(::Content_Type value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:Content.type)
-}
-
-// .Content.Encoding encoding = 2;
-inline void Content::clear_encoding() {
-  encoding_ = 0;
-}
-inline ::Content_Encoding Content::encoding() const {
-  // @@protoc_insertion_point(field_get:Content.encoding)
-  return static_cast< ::Content_Encoding >(encoding_);
-}
-inline void Content::set_encoding(::Content_Encoding value) {
-  
-  encoding_ = value;
-  // @@protoc_insertion_point(field_set:Content.encoding)
-}
-
-// bytes content = 3;
-inline void Content::clear_content() {
-  content_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline const ::std::string& Content::content() const {
-  // @@protoc_insertion_point(field_get:Content.content)
-  return content_.Get();
-}
-inline void Content::set_content(const ::std::string& value) {
-  
-  content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:Content.content)
-}
-#if LANG_CXX11
-inline void Content::set_content(::std::string&& value) {
-  
-  content_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:Content.content)
-}
-#endif
-inline void Content::set_content(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:Content.content)
-}
-inline void Content::set_content(const void* value,
-    size_t size) {
-  
-  content_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:Content.content)
-}
-inline ::std::string* Content::mutable_content() {
-  
-  // @@protoc_insertion_point(field_mutable:Content.content)
-  return content_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* Content::release_content() {
-  // @@protoc_insertion_point(field_release:Content.content)
-  
-  return content_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* Content::unsafe_arena_release_content() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Content.content)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return content_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-inline void Content::set_allocated_content(::std::string* content) {
-  if (content != NULL) {
-    
-  } else {
-    
-  }
-  content_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), content,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:Content.content)
-}
-inline void Content::unsafe_arena_set_allocated_content(
-    ::std::string* content) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (content != NULL) {
-    
-  } else {
-    
-  }
-  content_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      content, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Content.content)
-}
-
-// .Language language = 4;
-inline void Content::clear_language() {
-  language_ = 0;
-}
-inline ::Language Content::language() const {
-  // @@protoc_insertion_point(field_get:Content.language)
-  return static_cast< ::Language >(language_);
-}
-inline void Content::set_language(::Language value) {
-  
-  language_ = value;
-  // @@protoc_insertion_point(field_set:Content.language)
-}
-
-// .Compression compression = 5;
-inline bool Content::has_compression() const {
-  return this != internal_default_instance() && compression_ != NULL;
-}
-inline void Content::clear_compression() {
-  if (GetArenaNoVirtual() == NULL && compression_ != NULL) delete compression_;
-  compression_ = NULL;
-}
-inline const ::Compression& Content::compression() const {
-  const ::Compression* p = compression_;
-  // @@protoc_insertion_point(field_get:Content.compression)
-  return p != NULL ? *p : *reinterpret_cast<const ::Compression*>(
-      &::_Compression_default_instance_);
-}
-inline ::Compression* Content::mutable_compression() {
-  
-  if (compression_ == NULL) {
-    _slow_mutable_compression();
-  }
-  // @@protoc_insertion_point(field_mutable:Content.compression)
-  return compression_;
-}
-inline ::Compression* Content::release_compression() {
-  // @@protoc_insertion_point(field_release:Content.compression)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_compression();
-  } else {
-    ::Compression* temp = compression_;
-    compression_ = NULL;
-    return temp;
-  }
-}
-inline  void Content::set_allocated_compression(::Compression* compression) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete compression_;
-  }
-  if (compression != NULL) {
-    _slow_set_allocated_compression(message_arena, &compression);
-  }
-  compression_ = compression;
-  if (compression) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Content.compression)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::Content_Type> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::Content_Type>() {
-  return ::Content_Type_descriptor();
-}
-template <> struct is_proto_enum< ::Content_Encoding> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::Content_Encoding>() {
-  return ::Content_Encoding_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_content_2fContent_2eproto__INCLUDED
diff --git a/languages/cpp/content/MaterialsData.pb.cc b/languages/cpp/content/MaterialsData.pb.cc
deleted file mode 100644
index 4de5ad4..0000000
--- a/languages/cpp/content/MaterialsData.pb.cc
+++ /dev/null
@@ -1,753 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "content/MaterialsData.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class MaterialsDataDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<MaterialsData>
-     _instance;
-} _MaterialsData_default_instance_;
-
-namespace protobuf_content_2fMaterialsData_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MaterialsData, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MaterialsData, ingredients_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MaterialsData, grow_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MaterialsData, species_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MaterialsData, genetics_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(MaterialsData)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_MaterialsData_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "content/MaterialsData.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_structs_2fGrow_2eproto::InitDefaults();
-  ::protobuf_structs_2fSpecies_2eproto::InitDefaults();
-  ::protobuf_structs_2fGenetics_2eproto::InitDefaults();
-  _MaterialsData_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_MaterialsData_default_instance_);_MaterialsData_default_instance_._instance.get_mutable()->genetics_ = const_cast< ::Genetics*>(
-      ::Genetics::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\033content/MaterialsData.proto\032\022structs/G"
-      "row.proto\032\025structs/Species.proto\032\026struct"
-      "s/Genetics.proto\"q\n\rMaterialsData\022\023\n\013ing"
-      "redients\030\001 \003(\t\022\023\n\004grow\030\002 \001(\0162\005.Grow\022\031\n\007s"
-      "pecies\030\003 \001(\0162\010.Species\022\033\n\010genetics\030\004 \001(\013"
-      "2\t.GeneticsB5\n\032io.bloombox.schema.conten"
-      "tB\020MaterialsContentH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 274);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "content/MaterialsData.proto", &protobuf_RegisterTypes);
-  ::protobuf_structs_2fGrow_2eproto::AddDescriptors();
-  ::protobuf_structs_2fSpecies_2eproto::AddDescriptors();
-  ::protobuf_structs_2fGenetics_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_content_2fMaterialsData_2eproto
-
-
-// ===================================================================
-
-void MaterialsData::_slow_mutable_genetics() {
-  genetics_ = ::google::protobuf::Arena::CreateMessage< ::Genetics >(
-      GetArenaNoVirtual());
-}
-::Genetics* MaterialsData::_slow_release_genetics() {
-  if (genetics_ == NULL) {
-    return NULL;
-  } else {
-    ::Genetics* temp = new ::Genetics(*genetics_);
-    genetics_ = NULL;
-    return temp;
-  }
-}
-::Genetics* MaterialsData::unsafe_arena_release_genetics() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MaterialsData.genetics)
-  
-  ::Genetics* temp = genetics_;
-  genetics_ = NULL;
-  return temp;
-}
-void MaterialsData::_slow_set_allocated_genetics(
-    ::google::protobuf::Arena* message_arena, ::Genetics** genetics) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*genetics) == NULL) {
-      message_arena->Own(*genetics);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*genetics)) {
-      ::Genetics* new_genetics = 
-            ::google::protobuf::Arena::CreateMessage< ::Genetics >(
-            message_arena);
-      new_genetics->CopyFrom(**genetics);
-      *genetics = new_genetics;
-    }
-}
-void MaterialsData::unsafe_arena_set_allocated_genetics(
-    ::Genetics* genetics) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete genetics_;
-  }
-  genetics_ = genetics;
-  if (genetics) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MaterialsData.genetics)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int MaterialsData::kIngredientsFieldNumber;
-const int MaterialsData::kGrowFieldNumber;
-const int MaterialsData::kSpeciesFieldNumber;
-const int MaterialsData::kGeneticsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-MaterialsData::MaterialsData()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_content_2fMaterialsData_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:MaterialsData)
-}
-MaterialsData::MaterialsData(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena),
-  ingredients_(arena) {
-  protobuf_content_2fMaterialsData_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:MaterialsData)
-}
-MaterialsData::MaterialsData(const MaterialsData& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      ingredients_(from.ingredients_),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_genetics()) {
-    genetics_ = new ::Genetics(*from.genetics_);
-  } else {
-    genetics_ = NULL;
-  }
-  ::memcpy(&grow_, &from.grow_,
-    static_cast<size_t>(reinterpret_cast<char*>(&species_) -
-    reinterpret_cast<char*>(&grow_)) + sizeof(species_));
-  // @@protoc_insertion_point(copy_constructor:MaterialsData)
-}
-
-void MaterialsData::SharedCtor() {
-  ::memset(&genetics_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&species_) -
-      reinterpret_cast<char*>(&genetics_)) + sizeof(species_));
-  _cached_size_ = 0;
-}
-
-MaterialsData::~MaterialsData() {
-  // @@protoc_insertion_point(destructor:MaterialsData)
-  SharedDtor();
-}
-
-void MaterialsData::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete genetics_;
-}
-
-void MaterialsData::ArenaDtor(void* object) {
-  MaterialsData* _this = reinterpret_cast< MaterialsData* >(object);
-  (void)_this;
-}
-void MaterialsData::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void MaterialsData::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* MaterialsData::descriptor() {
-  protobuf_content_2fMaterialsData_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fMaterialsData_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const MaterialsData& MaterialsData::default_instance() {
-  protobuf_content_2fMaterialsData_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-MaterialsData* MaterialsData::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<MaterialsData>(arena);
-}
-
-void MaterialsData::Clear() {
-// @@protoc_insertion_point(message_clear_start:MaterialsData)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ingredients_.Clear();
-  if (GetArenaNoVirtual() == NULL && genetics_ != NULL) {
-    delete genetics_;
-  }
-  genetics_ = NULL;
-  ::memset(&grow_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&species_) -
-      reinterpret_cast<char*>(&grow_)) + sizeof(species_));
-  _internal_metadata_.Clear();
-}
-
-bool MaterialsData::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:MaterialsData)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated string ingredients = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_ingredients()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->ingredients(this->ingredients_size() - 1).data(),
-            static_cast<int>(this->ingredients(this->ingredients_size() - 1).length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "MaterialsData.ingredients"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Grow grow = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_grow(static_cast< ::Grow >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Species species = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_species(static_cast< ::Species >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Genetics genetics = 4;
-      case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_genetics()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:MaterialsData)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:MaterialsData)
-  return false;
-#undef DO_
-}
-
-void MaterialsData::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:MaterialsData)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated string ingredients = 1;
-  for (int i = 0, n = this->ingredients_size(); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->ingredients(i).data(), static_cast<int>(this->ingredients(i).length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "MaterialsData.ingredients");
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      1, this->ingredients(i), output);
-  }
-
-  // .Grow grow = 2;
-  if (this->grow() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->grow(), output);
-  }
-
-  // .Species species = 3;
-  if (this->species() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->species(), output);
-  }
-
-  // .Genetics genetics = 4;
-  if (this->has_genetics()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, *this->genetics_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:MaterialsData)
-}
-
-::google::protobuf::uint8* MaterialsData::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:MaterialsData)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated string ingredients = 1;
-  for (int i = 0, n = this->ingredients_size(); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->ingredients(i).data(), static_cast<int>(this->ingredients(i).length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "MaterialsData.ingredients");
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(1, this->ingredients(i), target);
-  }
-
-  // .Grow grow = 2;
-  if (this->grow() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->grow(), target);
-  }
-
-  // .Species species = 3;
-  if (this->species() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->species(), target);
-  }
-
-  // .Genetics genetics = 4;
-  if (this->has_genetics()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        4, *this->genetics_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:MaterialsData)
-  return target;
-}
-
-size_t MaterialsData::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:MaterialsData)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // repeated string ingredients = 1;
-  total_size += 1 *
-      ::google::protobuf::internal::FromIntSize(this->ingredients_size());
-  for (int i = 0, n = this->ingredients_size(); i < n; i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->ingredients(i));
-  }
-
-  // .Genetics genetics = 4;
-  if (this->has_genetics()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->genetics_);
-  }
-
-  // .Grow grow = 2;
-  if (this->grow() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->grow());
-  }
-
-  // .Species species = 3;
-  if (this->species() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->species());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void MaterialsData::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:MaterialsData)
-  GOOGLE_DCHECK_NE(&from, this);
-  const MaterialsData* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const MaterialsData>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:MaterialsData)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:MaterialsData)
-    MergeFrom(*source);
-  }
-}
-
-void MaterialsData::MergeFrom(const MaterialsData& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:MaterialsData)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  ingredients_.MergeFrom(from.ingredients_);
-  if (from.has_genetics()) {
-    mutable_genetics()->::Genetics::MergeFrom(from.genetics());
-  }
-  if (from.grow() != 0) {
-    set_grow(from.grow());
-  }
-  if (from.species() != 0) {
-    set_species(from.species());
-  }
-}
-
-void MaterialsData::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:MaterialsData)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void MaterialsData::CopyFrom(const MaterialsData& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:MaterialsData)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MaterialsData::IsInitialized() const {
-  return true;
-}
-
-void MaterialsData::Swap(MaterialsData* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    MaterialsData* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void MaterialsData::UnsafeArenaSwap(MaterialsData* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void MaterialsData::InternalSwap(MaterialsData* other) {
-  using std::swap;
-  ingredients_.InternalSwap(&other->ingredients_);
-  swap(genetics_, other->genetics_);
-  swap(grow_, other->grow_);
-  swap(species_, other->species_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata MaterialsData::GetMetadata() const {
-  protobuf_content_2fMaterialsData_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fMaterialsData_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// MaterialsData
-
-// repeated string ingredients = 1;
-int MaterialsData::ingredients_size() const {
-  return ingredients_.size();
-}
-void MaterialsData::clear_ingredients() {
-  ingredients_.Clear();
-}
-const ::std::string& MaterialsData::ingredients(int index) const {
-  // @@protoc_insertion_point(field_get:MaterialsData.ingredients)
-  return ingredients_.Get(index);
-}
-::std::string* MaterialsData::mutable_ingredients(int index) {
-  // @@protoc_insertion_point(field_mutable:MaterialsData.ingredients)
-  return ingredients_.Mutable(index);
-}
-void MaterialsData::set_ingredients(int index, const ::std::string& value) {
-  // @@protoc_insertion_point(field_set:MaterialsData.ingredients)
-  ingredients_.Mutable(index)->assign(value);
-}
-#if LANG_CXX11
-void MaterialsData::set_ingredients(int index, ::std::string&& value) {
-  // @@protoc_insertion_point(field_set:MaterialsData.ingredients)
-  ingredients_.Mutable(index)->assign(std::move(value));
-}
-#endif
-void MaterialsData::set_ingredients(int index, const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  ingredients_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:MaterialsData.ingredients)
-}
-void MaterialsData::set_ingredients(int index, const char* value, size_t size) {
-  ingredients_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:MaterialsData.ingredients)
-}
-::std::string* MaterialsData::add_ingredients() {
-  // @@protoc_insertion_point(field_add_mutable:MaterialsData.ingredients)
-  return ingredients_.Add();
-}
-void MaterialsData::add_ingredients(const ::std::string& value) {
-  ingredients_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:MaterialsData.ingredients)
-}
-#if LANG_CXX11
-void MaterialsData::add_ingredients(::std::string&& value) {
-  ingredients_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:MaterialsData.ingredients)
-}
-#endif
-void MaterialsData::add_ingredients(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  ingredients_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:MaterialsData.ingredients)
-}
-void MaterialsData::add_ingredients(const char* value, size_t size) {
-  ingredients_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:MaterialsData.ingredients)
-}
-const ::google::protobuf::RepeatedPtrField< ::std::string>&
-MaterialsData::ingredients() const {
-  // @@protoc_insertion_point(field_list:MaterialsData.ingredients)
-  return ingredients_;
-}
-::google::protobuf::RepeatedPtrField< ::std::string>*
-MaterialsData::mutable_ingredients() {
-  // @@protoc_insertion_point(field_mutable_list:MaterialsData.ingredients)
-  return &ingredients_;
-}
-
-// .Grow grow = 2;
-void MaterialsData::clear_grow() {
-  grow_ = 0;
-}
-::Grow MaterialsData::grow() const {
-  // @@protoc_insertion_point(field_get:MaterialsData.grow)
-  return static_cast< ::Grow >(grow_);
-}
-void MaterialsData::set_grow(::Grow value) {
-  
-  grow_ = value;
-  // @@protoc_insertion_point(field_set:MaterialsData.grow)
-}
-
-// .Species species = 3;
-void MaterialsData::clear_species() {
-  species_ = 0;
-}
-::Species MaterialsData::species() const {
-  // @@protoc_insertion_point(field_get:MaterialsData.species)
-  return static_cast< ::Species >(species_);
-}
-void MaterialsData::set_species(::Species value) {
-  
-  species_ = value;
-  // @@protoc_insertion_point(field_set:MaterialsData.species)
-}
-
-// .Genetics genetics = 4;
-bool MaterialsData::has_genetics() const {
-  return this != internal_default_instance() && genetics_ != NULL;
-}
-void MaterialsData::clear_genetics() {
-  if (GetArenaNoVirtual() == NULL && genetics_ != NULL) delete genetics_;
-  genetics_ = NULL;
-}
-const ::Genetics& MaterialsData::genetics() const {
-  const ::Genetics* p = genetics_;
-  // @@protoc_insertion_point(field_get:MaterialsData.genetics)
-  return p != NULL ? *p : *reinterpret_cast<const ::Genetics*>(
-      &::_Genetics_default_instance_);
-}
-::Genetics* MaterialsData::mutable_genetics() {
-  
-  if (genetics_ == NULL) {
-    _slow_mutable_genetics();
-  }
-  // @@protoc_insertion_point(field_mutable:MaterialsData.genetics)
-  return genetics_;
-}
-::Genetics* MaterialsData::release_genetics() {
-  // @@protoc_insertion_point(field_release:MaterialsData.genetics)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_genetics();
-  } else {
-    ::Genetics* temp = genetics_;
-    genetics_ = NULL;
-    return temp;
-  }
-}
- void MaterialsData::set_allocated_genetics(::Genetics* genetics) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete genetics_;
-  }
-  if (genetics != NULL) {
-    _slow_set_allocated_genetics(message_arena, &genetics);
-  }
-  genetics_ = genetics;
-  if (genetics) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MaterialsData.genetics)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/content/MaterialsData.pb.h b/languages/cpp/content/MaterialsData.pb.h
deleted file mode 100644
index 14a7130..0000000
--- a/languages/cpp/content/MaterialsData.pb.h
+++ /dev/null
@@ -1,385 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-#ifndef PROTOBUF_content_2fMaterialsData_2eproto__INCLUDED
-#define PROTOBUF_content_2fMaterialsData_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "structs/Grow.pb.h"
-#include "structs/Species.pb.h"
-#include "structs/Genetics.pb.h"
-// @@protoc_insertion_point(includes)
-class MaterialsData;
-class MaterialsDataDefaultTypeInternal;
-extern MaterialsDataDefaultTypeInternal _MaterialsData_default_instance_;
-
-namespace protobuf_content_2fMaterialsData_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_content_2fMaterialsData_2eproto
-
-// ===================================================================
-
-class MaterialsData : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:MaterialsData) */ {
- public:
-  MaterialsData();
-  virtual ~MaterialsData();
-
-  MaterialsData(const MaterialsData& from);
-
-  inline MaterialsData& operator=(const MaterialsData& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  MaterialsData(MaterialsData&& from) noexcept
-    : MaterialsData() {
-    *this = ::std::move(from);
-  }
-
-  inline MaterialsData& operator=(MaterialsData&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const MaterialsData& default_instance();
-
-  static inline const MaterialsData* internal_default_instance() {
-    return reinterpret_cast<const MaterialsData*>(
-               &_MaterialsData_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(MaterialsData* other);
-  void Swap(MaterialsData* other);
-  friend void swap(MaterialsData& a, MaterialsData& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline MaterialsData* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  MaterialsData* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const MaterialsData& from);
-  void MergeFrom(const MaterialsData& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(MaterialsData* other);
-  protected:
-  explicit MaterialsData(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated string ingredients = 1;
-  int ingredients_size() const;
-  void clear_ingredients();
-  static const int kIngredientsFieldNumber = 1;
-  const ::std::string& ingredients(int index) const;
-  ::std::string* mutable_ingredients(int index);
-  void set_ingredients(int index, const ::std::string& value);
-  #if LANG_CXX11
-  void set_ingredients(int index, ::std::string&& value);
-  #endif
-  void set_ingredients(int index, const char* value);
-  void set_ingredients(int index, const char* value, size_t size);
-  ::std::string* add_ingredients();
-  void add_ingredients(const ::std::string& value);
-  #if LANG_CXX11
-  void add_ingredients(::std::string&& value);
-  #endif
-  void add_ingredients(const char* value);
-  void add_ingredients(const char* value, size_t size);
-  const ::google::protobuf::RepeatedPtrField< ::std::string>& ingredients() const;
-  ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_ingredients();
-
-  // .Genetics genetics = 4;
-  bool has_genetics() const;
-  void clear_genetics();
-  static const int kGeneticsFieldNumber = 4;
-  private:
-  void _slow_mutable_genetics();
-  void _slow_set_allocated_genetics(
-      ::google::protobuf::Arena* message_arena, ::Genetics** genetics);
-  ::Genetics* _slow_release_genetics();
-  public:
-  const ::Genetics& genetics() const;
-  ::Genetics* mutable_genetics();
-  ::Genetics* release_genetics();
-  void set_allocated_genetics(::Genetics* genetics);
-  ::Genetics* unsafe_arena_release_genetics();
-  void unsafe_arena_set_allocated_genetics(
-      ::Genetics* genetics);
-
-  // .Grow grow = 2;
-  void clear_grow();
-  static const int kGrowFieldNumber = 2;
-  ::Grow grow() const;
-  void set_grow(::Grow value);
-
-  // .Species species = 3;
-  void clear_species();
-  static const int kSpeciesFieldNumber = 3;
-  ::Species species() const;
-  void set_species(::Species value);
-
-  // @@protoc_insertion_point(class_scope:MaterialsData)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> ingredients_;
-  ::Genetics* genetics_;
-  int grow_;
-  int species_;
-  mutable int _cached_size_;
-  friend struct protobuf_content_2fMaterialsData_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// MaterialsData
-
-// repeated string ingredients = 1;
-inline int MaterialsData::ingredients_size() const {
-  return ingredients_.size();
-}
-inline void MaterialsData::clear_ingredients() {
-  ingredients_.Clear();
-}
-inline const ::std::string& MaterialsData::ingredients(int index) const {
-  // @@protoc_insertion_point(field_get:MaterialsData.ingredients)
-  return ingredients_.Get(index);
-}
-inline ::std::string* MaterialsData::mutable_ingredients(int index) {
-  // @@protoc_insertion_point(field_mutable:MaterialsData.ingredients)
-  return ingredients_.Mutable(index);
-}
-inline void MaterialsData::set_ingredients(int index, const ::std::string& value) {
-  // @@protoc_insertion_point(field_set:MaterialsData.ingredients)
-  ingredients_.Mutable(index)->assign(value);
-}
-#if LANG_CXX11
-inline void MaterialsData::set_ingredients(int index, ::std::string&& value) {
-  // @@protoc_insertion_point(field_set:MaterialsData.ingredients)
-  ingredients_.Mutable(index)->assign(std::move(value));
-}
-#endif
-inline void MaterialsData::set_ingredients(int index, const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  ingredients_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:MaterialsData.ingredients)
-}
-inline void MaterialsData::set_ingredients(int index, const char* value, size_t size) {
-  ingredients_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:MaterialsData.ingredients)
-}
-inline ::std::string* MaterialsData::add_ingredients() {
-  // @@protoc_insertion_point(field_add_mutable:MaterialsData.ingredients)
-  return ingredients_.Add();
-}
-inline void MaterialsData::add_ingredients(const ::std::string& value) {
-  ingredients_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:MaterialsData.ingredients)
-}
-#if LANG_CXX11
-inline void MaterialsData::add_ingredients(::std::string&& value) {
-  ingredients_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:MaterialsData.ingredients)
-}
-#endif
-inline void MaterialsData::add_ingredients(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  ingredients_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:MaterialsData.ingredients)
-}
-inline void MaterialsData::add_ingredients(const char* value, size_t size) {
-  ingredients_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:MaterialsData.ingredients)
-}
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-MaterialsData::ingredients() const {
-  // @@protoc_insertion_point(field_list:MaterialsData.ingredients)
-  return ingredients_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-MaterialsData::mutable_ingredients() {
-  // @@protoc_insertion_point(field_mutable_list:MaterialsData.ingredients)
-  return &ingredients_;
-}
-
-// .Grow grow = 2;
-inline void MaterialsData::clear_grow() {
-  grow_ = 0;
-}
-inline ::Grow MaterialsData::grow() const {
-  // @@protoc_insertion_point(field_get:MaterialsData.grow)
-  return static_cast< ::Grow >(grow_);
-}
-inline void MaterialsData::set_grow(::Grow value) {
-  
-  grow_ = value;
-  // @@protoc_insertion_point(field_set:MaterialsData.grow)
-}
-
-// .Species species = 3;
-inline void MaterialsData::clear_species() {
-  species_ = 0;
-}
-inline ::Species MaterialsData::species() const {
-  // @@protoc_insertion_point(field_get:MaterialsData.species)
-  return static_cast< ::Species >(species_);
-}
-inline void MaterialsData::set_species(::Species value) {
-  
-  species_ = value;
-  // @@protoc_insertion_point(field_set:MaterialsData.species)
-}
-
-// .Genetics genetics = 4;
-inline bool MaterialsData::has_genetics() const {
-  return this != internal_default_instance() && genetics_ != NULL;
-}
-inline void MaterialsData::clear_genetics() {
-  if (GetArenaNoVirtual() == NULL && genetics_ != NULL) delete genetics_;
-  genetics_ = NULL;
-}
-inline const ::Genetics& MaterialsData::genetics() const {
-  const ::Genetics* p = genetics_;
-  // @@protoc_insertion_point(field_get:MaterialsData.genetics)
-  return p != NULL ? *p : *reinterpret_cast<const ::Genetics*>(
-      &::_Genetics_default_instance_);
-}
-inline ::Genetics* MaterialsData::mutable_genetics() {
-  
-  if (genetics_ == NULL) {
-    _slow_mutable_genetics();
-  }
-  // @@protoc_insertion_point(field_mutable:MaterialsData.genetics)
-  return genetics_;
-}
-inline ::Genetics* MaterialsData::release_genetics() {
-  // @@protoc_insertion_point(field_release:MaterialsData.genetics)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_genetics();
-  } else {
-    ::Genetics* temp = genetics_;
-    genetics_ = NULL;
-    return temp;
-  }
-}
-inline  void MaterialsData::set_allocated_genetics(::Genetics* genetics) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete genetics_;
-  }
-  if (genetics != NULL) {
-    _slow_set_allocated_genetics(message_arena, &genetics);
-  }
-  genetics_ = genetics;
-  if (genetics) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MaterialsData.genetics)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_content_2fMaterialsData_2eproto__INCLUDED
diff --git a/languages/cpp/content/Name.pb.cc b/languages/cpp/content/Name.pb.cc
deleted file mode 100644
index e6e9687..0000000
--- a/languages/cpp/content/Name.pb.cc
+++ /dev/null
@@ -1,626 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "content/Name.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class NameDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Name>
-     _instance;
-} _Name_default_instance_;
-
-namespace protobuf_content_2fName_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Name, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Name, primary_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Name, display_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Name)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Name_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "content/Name.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _Name_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Name_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\022content/Name.proto\"(\n\004Name\022\017\n\007primary\030"
-      "\001 \001(\t\022\017\n\007display\030\002 \001(\tB0\n\032io.bloombox.sc"
-      "hema.contentB\013NameContentH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 120);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "content/Name.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_content_2fName_2eproto
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Name::kPrimaryFieldNumber;
-const int Name::kDisplayFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Name::Name()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_content_2fName_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Name)
-}
-Name::Name(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_content_2fName_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Name)
-}
-Name::Name(const Name& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  primary_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.primary().size() > 0) {
-    primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.primary(),
-      GetArenaNoVirtual());
-  }
-  display_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.display().size() > 0) {
-    display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.display(),
-      GetArenaNoVirtual());
-  }
-  // @@protoc_insertion_point(copy_constructor:Name)
-}
-
-void Name::SharedCtor() {
-  primary_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  display_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  _cached_size_ = 0;
-}
-
-Name::~Name() {
-  // @@protoc_insertion_point(destructor:Name)
-  SharedDtor();
-}
-
-void Name::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  primary_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
-  display_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
-}
-
-void Name::ArenaDtor(void* object) {
-  Name* _this = reinterpret_cast< Name* >(object);
-  (void)_this;
-}
-void Name::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Name::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Name::descriptor() {
-  protobuf_content_2fName_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fName_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Name& Name::default_instance() {
-  protobuf_content_2fName_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Name* Name::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Name>(arena);
-}
-
-void Name::Clear() {
-// @@protoc_insertion_point(message_clear_start:Name)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  primary_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-  display_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-  _internal_metadata_.Clear();
-}
-
-bool Name::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Name)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // string primary = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_primary()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->primary().data(), static_cast<int>(this->primary().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Name.primary"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string display = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_display()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->display().data(), static_cast<int>(this->display().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Name.display"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Name)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Name)
-  return false;
-#undef DO_
-}
-
-void Name::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Name)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string primary = 1;
-  if (this->primary().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->primary().data(), static_cast<int>(this->primary().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Name.primary");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->primary(), output);
-  }
-
-  // string display = 2;
-  if (this->display().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->display().data(), static_cast<int>(this->display().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Name.display");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      2, this->display(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Name)
-}
-
-::google::protobuf::uint8* Name::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Name)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string primary = 1;
-  if (this->primary().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->primary().data(), static_cast<int>(this->primary().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Name.primary");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->primary(), target);
-  }
-
-  // string display = 2;
-  if (this->display().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->display().data(), static_cast<int>(this->display().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Name.display");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->display(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Name)
-  return target;
-}
-
-size_t Name::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Name)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // string primary = 1;
-  if (this->primary().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->primary());
-  }
-
-  // string display = 2;
-  if (this->display().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->display());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Name::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Name)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Name* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Name>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Name)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Name)
-    MergeFrom(*source);
-  }
-}
-
-void Name::MergeFrom(const Name& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Name)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.primary().size() > 0) {
-    set_primary(from.primary());
-  }
-  if (from.display().size() > 0) {
-    set_display(from.display());
-  }
-}
-
-void Name::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Name)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Name::CopyFrom(const Name& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Name)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Name::IsInitialized() const {
-  return true;
-}
-
-void Name::Swap(Name* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Name* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Name::UnsafeArenaSwap(Name* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Name::InternalSwap(Name* other) {
-  using std::swap;
-  primary_.Swap(&other->primary_);
-  display_.Swap(&other->display_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Name::GetMetadata() const {
-  protobuf_content_2fName_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fName_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Name
-
-// string primary = 1;
-void Name::clear_primary() {
-  primary_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-const ::std::string& Name::primary() const {
-  // @@protoc_insertion_point(field_get:Name.primary)
-  return primary_.Get();
-}
-void Name::set_primary(const ::std::string& value) {
-  
-  primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:Name.primary)
-}
-#if LANG_CXX11
-void Name::set_primary(::std::string&& value) {
-  
-  primary_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:Name.primary)
-}
-#endif
-void Name::set_primary(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:Name.primary)
-}
-void Name::set_primary(const char* value,
-    size_t size) {
-  
-  primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:Name.primary)
-}
-::std::string* Name::mutable_primary() {
-  
-  // @@protoc_insertion_point(field_mutable:Name.primary)
-  return primary_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* Name::release_primary() {
-  // @@protoc_insertion_point(field_release:Name.primary)
-  
-  return primary_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* Name::unsafe_arena_release_primary() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Name.primary)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return primary_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-void Name::set_allocated_primary(::std::string* primary) {
-  if (primary != NULL) {
-    
-  } else {
-    
-  }
-  primary_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), primary,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:Name.primary)
-}
-void Name::unsafe_arena_set_allocated_primary(
-    ::std::string* primary) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (primary != NULL) {
-    
-  } else {
-    
-  }
-  primary_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      primary, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Name.primary)
-}
-
-// string display = 2;
-void Name::clear_display() {
-  display_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-const ::std::string& Name::display() const {
-  // @@protoc_insertion_point(field_get:Name.display)
-  return display_.Get();
-}
-void Name::set_display(const ::std::string& value) {
-  
-  display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:Name.display)
-}
-#if LANG_CXX11
-void Name::set_display(::std::string&& value) {
-  
-  display_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:Name.display)
-}
-#endif
-void Name::set_display(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:Name.display)
-}
-void Name::set_display(const char* value,
-    size_t size) {
-  
-  display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:Name.display)
-}
-::std::string* Name::mutable_display() {
-  
-  // @@protoc_insertion_point(field_mutable:Name.display)
-  return display_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* Name::release_display() {
-  // @@protoc_insertion_point(field_release:Name.display)
-  
-  return display_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* Name::unsafe_arena_release_display() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Name.display)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return display_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-void Name::set_allocated_display(::std::string* display) {
-  if (display != NULL) {
-    
-  } else {
-    
-  }
-  display_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), display,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:Name.display)
-}
-void Name::unsafe_arena_set_allocated_display(
-    ::std::string* display) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (display != NULL) {
-    
-  } else {
-    
-  }
-  display_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      display, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Name.display)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/content/Name.pb.h b/languages/cpp/content/Name.pb.h
deleted file mode 100644
index 117170a..0000000
--- a/languages/cpp/content/Name.pb.h
+++ /dev/null
@@ -1,365 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-#ifndef PROTOBUF_content_2fName_2eproto__INCLUDED
-#define PROTOBUF_content_2fName_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class Name;
-class NameDefaultTypeInternal;
-extern NameDefaultTypeInternal _Name_default_instance_;
-
-namespace protobuf_content_2fName_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_content_2fName_2eproto
-
-// ===================================================================
-
-class Name : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Name) */ {
- public:
-  Name();
-  virtual ~Name();
-
-  Name(const Name& from);
-
-  inline Name& operator=(const Name& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Name(Name&& from) noexcept
-    : Name() {
-    *this = ::std::move(from);
-  }
-
-  inline Name& operator=(Name&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Name& default_instance();
-
-  static inline const Name* internal_default_instance() {
-    return reinterpret_cast<const Name*>(
-               &_Name_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Name* other);
-  void Swap(Name* other);
-  friend void swap(Name& a, Name& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Name* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Name* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Name& from);
-  void MergeFrom(const Name& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Name* other);
-  protected:
-  explicit Name(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // string primary = 1;
-  void clear_primary();
-  static const int kPrimaryFieldNumber = 1;
-  const ::std::string& primary() const;
-  void set_primary(const ::std::string& value);
-  #if LANG_CXX11
-  void set_primary(::std::string&& value);
-  #endif
-  void set_primary(const char* value);
-  void set_primary(const char* value, size_t size);
-  ::std::string* mutable_primary();
-  ::std::string* release_primary();
-  void set_allocated_primary(::std::string* primary);
-  ::std::string* unsafe_arena_release_primary();
-  void unsafe_arena_set_allocated_primary(
-      ::std::string* primary);
-
-  // string display = 2;
-  void clear_display();
-  static const int kDisplayFieldNumber = 2;
-  const ::std::string& display() const;
-  void set_display(const ::std::string& value);
-  #if LANG_CXX11
-  void set_display(::std::string&& value);
-  #endif
-  void set_display(const char* value);
-  void set_display(const char* value, size_t size);
-  ::std::string* mutable_display();
-  ::std::string* release_display();
-  void set_allocated_display(::std::string* display);
-  ::std::string* unsafe_arena_release_display();
-  void unsafe_arena_set_allocated_display(
-      ::std::string* display);
-
-  // @@protoc_insertion_point(class_scope:Name)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::internal::ArenaStringPtr primary_;
-  ::google::protobuf::internal::ArenaStringPtr display_;
-  mutable int _cached_size_;
-  friend struct protobuf_content_2fName_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Name
-
-// string primary = 1;
-inline void Name::clear_primary() {
-  primary_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline const ::std::string& Name::primary() const {
-  // @@protoc_insertion_point(field_get:Name.primary)
-  return primary_.Get();
-}
-inline void Name::set_primary(const ::std::string& value) {
-  
-  primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:Name.primary)
-}
-#if LANG_CXX11
-inline void Name::set_primary(::std::string&& value) {
-  
-  primary_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:Name.primary)
-}
-#endif
-inline void Name::set_primary(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:Name.primary)
-}
-inline void Name::set_primary(const char* value,
-    size_t size) {
-  
-  primary_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:Name.primary)
-}
-inline ::std::string* Name::mutable_primary() {
-  
-  // @@protoc_insertion_point(field_mutable:Name.primary)
-  return primary_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* Name::release_primary() {
-  // @@protoc_insertion_point(field_release:Name.primary)
-  
-  return primary_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* Name::unsafe_arena_release_primary() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Name.primary)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return primary_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-inline void Name::set_allocated_primary(::std::string* primary) {
-  if (primary != NULL) {
-    
-  } else {
-    
-  }
-  primary_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), primary,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:Name.primary)
-}
-inline void Name::unsafe_arena_set_allocated_primary(
-    ::std::string* primary) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (primary != NULL) {
-    
-  } else {
-    
-  }
-  primary_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      primary, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Name.primary)
-}
-
-// string display = 2;
-inline void Name::clear_display() {
-  display_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline const ::std::string& Name::display() const {
-  // @@protoc_insertion_point(field_get:Name.display)
-  return display_.Get();
-}
-inline void Name::set_display(const ::std::string& value) {
-  
-  display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:Name.display)
-}
-#if LANG_CXX11
-inline void Name::set_display(::std::string&& value) {
-  
-  display_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:Name.display)
-}
-#endif
-inline void Name::set_display(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:Name.display)
-}
-inline void Name::set_display(const char* value,
-    size_t size) {
-  
-  display_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:Name.display)
-}
-inline ::std::string* Name::mutable_display() {
-  
-  // @@protoc_insertion_point(field_mutable:Name.display)
-  return display_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* Name::release_display() {
-  // @@protoc_insertion_point(field_release:Name.display)
-  
-  return display_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* Name::unsafe_arena_release_display() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Name.display)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return display_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-inline void Name::set_allocated_display(::std::string* display) {
-  if (display != NULL) {
-    
-  } else {
-    
-  }
-  display_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), display,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:Name.display)
-}
-inline void Name::unsafe_arena_set_allocated_display(
-    ::std::string* display) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (display != NULL) {
-    
-  } else {
-    
-  }
-  display_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      display, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Name.display)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_content_2fName_2eproto__INCLUDED
diff --git a/languages/cpp/content/ProductContent.pb.cc b/languages/cpp/content/ProductContent.pb.cc
deleted file mode 100644
index 44e667e..0000000
--- a/languages/cpp/content/ProductContent.pb.cc
+++ /dev/null
@@ -1,1335 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "content/ProductContent.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ProductContentDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ProductContent>
-     _instance;
-} _ProductContent_default_instance_;
-
-namespace protobuf_content_2fProductContent_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, name_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, summary_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, brand_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, media_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, usage_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, dosage_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductContent, advice_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(ProductContent)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ProductContent_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "content/ProductContent.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_content_2fName_2eproto::InitDefaults();
-  ::protobuf_content_2fContent_2eproto::InitDefaults();
-  ::protobuf_content_2fBrand_2eproto::InitDefaults();
-  ::protobuf_media_2fMediaItem_2eproto::InitDefaults();
-  _ProductContent_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ProductContent_default_instance_);_ProductContent_default_instance_._instance.get_mutable()->name_ = const_cast< ::Name*>(
-      ::Name::internal_default_instance());
-  _ProductContent_default_instance_._instance.get_mutable()->summary_ = const_cast< ::Content*>(
-      ::Content::internal_default_instance());
-  _ProductContent_default_instance_._instance.get_mutable()->brand_ = const_cast< ::Brand*>(
-      ::Brand::internal_default_instance());
-  _ProductContent_default_instance_._instance.get_mutable()->usage_ = const_cast< ::Content*>(
-      ::Content::internal_default_instance());
-  _ProductContent_default_instance_._instance.get_mutable()->dosage_ = const_cast< ::Content*>(
-      ::Content::internal_default_instance());
-  _ProductContent_default_instance_._instance.get_mutable()->advice_ = const_cast< ::Content*>(
-      ::Content::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\034content/ProductContent.proto\032\022content/"
-      "Name.proto\032\025content/Content.proto\032\023conte"
-      "nt/Brand.proto\032\025media/MediaItem.proto\"\277\001"
-      "\n\016ProductContent\022\023\n\004name\030\001 \001(\0132\005.Name\022\031\n"
-      "\007summary\030\002 \001(\0132\010.Content\022\025\n\005brand\030\003 \001(\0132"
-      "\006.Brand\022\031\n\005media\030\024 \003(\0132\n.MediaItem\022\027\n\005us"
-      "age\030\036 \001(\0132\010.Content\022\030\n\006dosage\030\037 \001(\0132\010.Co"
-      "ntent\022\030\n\006advice\030  \001(\0132\010.ContentB4\n\032io.bl"
-      "oombox.schema.contentB\017AttachedContentH\001"
-      "P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 373);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "content/ProductContent.proto", &protobuf_RegisterTypes);
-  ::protobuf_content_2fName_2eproto::AddDescriptors();
-  ::protobuf_content_2fContent_2eproto::AddDescriptors();
-  ::protobuf_content_2fBrand_2eproto::AddDescriptors();
-  ::protobuf_media_2fMediaItem_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_content_2fProductContent_2eproto
-
-
-// ===================================================================
-
-void ProductContent::_slow_mutable_name() {
-  name_ = ::google::protobuf::Arena::CreateMessage< ::Name >(
-      GetArenaNoVirtual());
-}
-::Name* ProductContent::_slow_release_name() {
-  if (name_ == NULL) {
-    return NULL;
-  } else {
-    ::Name* temp = new ::Name(*name_);
-    name_ = NULL;
-    return temp;
-  }
-}
-::Name* ProductContent::unsafe_arena_release_name() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductContent.name)
-  
-  ::Name* temp = name_;
-  name_ = NULL;
-  return temp;
-}
-void ProductContent::_slow_set_allocated_name(
-    ::google::protobuf::Arena* message_arena, ::Name** name) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*name) == NULL) {
-      message_arena->Own(*name);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*name)) {
-      ::Name* new_name = 
-            ::google::protobuf::Arena::CreateMessage< ::Name >(
-            message_arena);
-      new_name->CopyFrom(**name);
-      *name = new_name;
-    }
-}
-void ProductContent::unsafe_arena_set_allocated_name(
-    ::Name* name) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete name_;
-  }
-  name_ = name;
-  if (name) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductContent.name)
-}
-void ProductContent::_slow_mutable_summary() {
-  summary_ = ::google::protobuf::Arena::CreateMessage< ::Content >(
-      GetArenaNoVirtual());
-}
-::Content* ProductContent::_slow_release_summary() {
-  if (summary_ == NULL) {
-    return NULL;
-  } else {
-    ::Content* temp = new ::Content(*summary_);
-    summary_ = NULL;
-    return temp;
-  }
-}
-::Content* ProductContent::unsafe_arena_release_summary() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductContent.summary)
-  
-  ::Content* temp = summary_;
-  summary_ = NULL;
-  return temp;
-}
-void ProductContent::_slow_set_allocated_summary(
-    ::google::protobuf::Arena* message_arena, ::Content** summary) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*summary) == NULL) {
-      message_arena->Own(*summary);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*summary)) {
-      ::Content* new_summary = 
-            ::google::protobuf::Arena::CreateMessage< ::Content >(
-            message_arena);
-      new_summary->CopyFrom(**summary);
-      *summary = new_summary;
-    }
-}
-void ProductContent::unsafe_arena_set_allocated_summary(
-    ::Content* summary) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete summary_;
-  }
-  summary_ = summary;
-  if (summary) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductContent.summary)
-}
-void ProductContent::_slow_mutable_brand() {
-  brand_ = ::google::protobuf::Arena::CreateMessage< ::Brand >(
-      GetArenaNoVirtual());
-}
-::Brand* ProductContent::_slow_release_brand() {
-  if (brand_ == NULL) {
-    return NULL;
-  } else {
-    ::Brand* temp = new ::Brand(*brand_);
-    brand_ = NULL;
-    return temp;
-  }
-}
-::Brand* ProductContent::unsafe_arena_release_brand() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductContent.brand)
-  
-  ::Brand* temp = brand_;
-  brand_ = NULL;
-  return temp;
-}
-void ProductContent::_slow_set_allocated_brand(
-    ::google::protobuf::Arena* message_arena, ::Brand** brand) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*brand) == NULL) {
-      message_arena->Own(*brand);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*brand)) {
-      ::Brand* new_brand = 
-            ::google::protobuf::Arena::CreateMessage< ::Brand >(
-            message_arena);
-      new_brand->CopyFrom(**brand);
-      *brand = new_brand;
-    }
-}
-void ProductContent::unsafe_arena_set_allocated_brand(
-    ::Brand* brand) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete brand_;
-  }
-  brand_ = brand;
-  if (brand) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductContent.brand)
-}
-void ProductContent::_slow_mutable_usage() {
-  usage_ = ::google::protobuf::Arena::CreateMessage< ::Content >(
-      GetArenaNoVirtual());
-}
-::Content* ProductContent::_slow_release_usage() {
-  if (usage_ == NULL) {
-    return NULL;
-  } else {
-    ::Content* temp = new ::Content(*usage_);
-    usage_ = NULL;
-    return temp;
-  }
-}
-::Content* ProductContent::unsafe_arena_release_usage() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductContent.usage)
-  
-  ::Content* temp = usage_;
-  usage_ = NULL;
-  return temp;
-}
-void ProductContent::_slow_set_allocated_usage(
-    ::google::protobuf::Arena* message_arena, ::Content** usage) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*usage) == NULL) {
-      message_arena->Own(*usage);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*usage)) {
-      ::Content* new_usage = 
-            ::google::protobuf::Arena::CreateMessage< ::Content >(
-            message_arena);
-      new_usage->CopyFrom(**usage);
-      *usage = new_usage;
-    }
-}
-void ProductContent::unsafe_arena_set_allocated_usage(
-    ::Content* usage) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete usage_;
-  }
-  usage_ = usage;
-  if (usage) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductContent.usage)
-}
-void ProductContent::_slow_mutable_dosage() {
-  dosage_ = ::google::protobuf::Arena::CreateMessage< ::Content >(
-      GetArenaNoVirtual());
-}
-::Content* ProductContent::_slow_release_dosage() {
-  if (dosage_ == NULL) {
-    return NULL;
-  } else {
-    ::Content* temp = new ::Content(*dosage_);
-    dosage_ = NULL;
-    return temp;
-  }
-}
-::Content* ProductContent::unsafe_arena_release_dosage() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductContent.dosage)
-  
-  ::Content* temp = dosage_;
-  dosage_ = NULL;
-  return temp;
-}
-void ProductContent::_slow_set_allocated_dosage(
-    ::google::protobuf::Arena* message_arena, ::Content** dosage) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*dosage) == NULL) {
-      message_arena->Own(*dosage);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*dosage)) {
-      ::Content* new_dosage = 
-            ::google::protobuf::Arena::CreateMessage< ::Content >(
-            message_arena);
-      new_dosage->CopyFrom(**dosage);
-      *dosage = new_dosage;
-    }
-}
-void ProductContent::unsafe_arena_set_allocated_dosage(
-    ::Content* dosage) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete dosage_;
-  }
-  dosage_ = dosage;
-  if (dosage) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductContent.dosage)
-}
-void ProductContent::_slow_mutable_advice() {
-  advice_ = ::google::protobuf::Arena::CreateMessage< ::Content >(
-      GetArenaNoVirtual());
-}
-::Content* ProductContent::_slow_release_advice() {
-  if (advice_ == NULL) {
-    return NULL;
-  } else {
-    ::Content* temp = new ::Content(*advice_);
-    advice_ = NULL;
-    return temp;
-  }
-}
-::Content* ProductContent::unsafe_arena_release_advice() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:ProductContent.advice)
-  
-  ::Content* temp = advice_;
-  advice_ = NULL;
-  return temp;
-}
-void ProductContent::_slow_set_allocated_advice(
-    ::google::protobuf::Arena* message_arena, ::Content** advice) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*advice) == NULL) {
-      message_arena->Own(*advice);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*advice)) {
-      ::Content* new_advice = 
-            ::google::protobuf::Arena::CreateMessage< ::Content >(
-            message_arena);
-      new_advice->CopyFrom(**advice);
-      *advice = new_advice;
-    }
-}
-void ProductContent::unsafe_arena_set_allocated_advice(
-    ::Content* advice) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete advice_;
-  }
-  advice_ = advice;
-  if (advice) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:ProductContent.advice)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ProductContent::kNameFieldNumber;
-const int ProductContent::kSummaryFieldNumber;
-const int ProductContent::kBrandFieldNumber;
-const int ProductContent::kMediaFieldNumber;
-const int ProductContent::kUsageFieldNumber;
-const int ProductContent::kDosageFieldNumber;
-const int ProductContent::kAdviceFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ProductContent::ProductContent()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_content_2fProductContent_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ProductContent)
-}
-ProductContent::ProductContent(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena),
-  media_(arena) {
-  protobuf_content_2fProductContent_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ProductContent)
-}
-ProductContent::ProductContent(const ProductContent& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      media_(from.media_),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_name()) {
-    name_ = new ::Name(*from.name_);
-  } else {
-    name_ = NULL;
-  }
-  if (from.has_summary()) {
-    summary_ = new ::Content(*from.summary_);
-  } else {
-    summary_ = NULL;
-  }
-  if (from.has_brand()) {
-    brand_ = new ::Brand(*from.brand_);
-  } else {
-    brand_ = NULL;
-  }
-  if (from.has_usage()) {
-    usage_ = new ::Content(*from.usage_);
-  } else {
-    usage_ = NULL;
-  }
-  if (from.has_dosage()) {
-    dosage_ = new ::Content(*from.dosage_);
-  } else {
-    dosage_ = NULL;
-  }
-  if (from.has_advice()) {
-    advice_ = new ::Content(*from.advice_);
-  } else {
-    advice_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:ProductContent)
-}
-
-void ProductContent::SharedCtor() {
-  ::memset(&name_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&advice_) -
-      reinterpret_cast<char*>(&name_)) + sizeof(advice_));
-  _cached_size_ = 0;
-}
-
-ProductContent::~ProductContent() {
-  // @@protoc_insertion_point(destructor:ProductContent)
-  SharedDtor();
-}
-
-void ProductContent::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete name_;
-  if (this != internal_default_instance()) delete summary_;
-  if (this != internal_default_instance()) delete brand_;
-  if (this != internal_default_instance()) delete usage_;
-  if (this != internal_default_instance()) delete dosage_;
-  if (this != internal_default_instance()) delete advice_;
-}
-
-void ProductContent::ArenaDtor(void* object) {
-  ProductContent* _this = reinterpret_cast< ProductContent* >(object);
-  (void)_this;
-}
-void ProductContent::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ProductContent::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ProductContent::descriptor() {
-  protobuf_content_2fProductContent_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fProductContent_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ProductContent& ProductContent::default_instance() {
-  protobuf_content_2fProductContent_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ProductContent* ProductContent::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ProductContent>(arena);
-}
-
-void ProductContent::Clear() {
-// @@protoc_insertion_point(message_clear_start:ProductContent)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  media_.Clear();
-  if (GetArenaNoVirtual() == NULL && name_ != NULL) {
-    delete name_;
-  }
-  name_ = NULL;
-  if (GetArenaNoVirtual() == NULL && summary_ != NULL) {
-    delete summary_;
-  }
-  summary_ = NULL;
-  if (GetArenaNoVirtual() == NULL && brand_ != NULL) {
-    delete brand_;
-  }
-  brand_ = NULL;
-  if (GetArenaNoVirtual() == NULL && usage_ != NULL) {
-    delete usage_;
-  }
-  usage_ = NULL;
-  if (GetArenaNoVirtual() == NULL && dosage_ != NULL) {
-    delete dosage_;
-  }
-  dosage_ = NULL;
-  if (GetArenaNoVirtual() == NULL && advice_ != NULL) {
-    delete advice_;
-  }
-  advice_ = NULL;
-  _internal_metadata_.Clear();
-}
-
-bool ProductContent::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ProductContent)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .Name name = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_name()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Content summary = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_summary()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Brand brand = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_brand()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // repeated .MediaItem media = 20;
-      case 20: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(162u /* 162 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_media()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Content usage = 30;
-      case 30: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(242u /* 242 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_usage()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Content dosage = 31;
-      case 31: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(250u /* 250 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_dosage()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Content advice = 32;
-      case 32: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(2u /* 258 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_advice()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ProductContent)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ProductContent)
-  return false;
-#undef DO_
-}
-
-void ProductContent::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ProductContent)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Name name = 1;
-  if (this->has_name()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->name_, output);
-  }
-
-  // .Content summary = 2;
-  if (this->has_summary()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->summary_, output);
-  }
-
-  // .Brand brand = 3;
-  if (this->has_brand()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, *this->brand_, output);
-  }
-
-  // repeated .MediaItem media = 20;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->media_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, this->media(static_cast<int>(i)), output);
-  }
-
-  // .Content usage = 30;
-  if (this->has_usage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      30, *this->usage_, output);
-  }
-
-  // .Content dosage = 31;
-  if (this->has_dosage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      31, *this->dosage_, output);
-  }
-
-  // .Content advice = 32;
-  if (this->has_advice()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      32, *this->advice_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ProductContent)
-}
-
-::google::protobuf::uint8* ProductContent::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ProductContent)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Name name = 1;
-  if (this->has_name()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->name_, deterministic, target);
-  }
-
-  // .Content summary = 2;
-  if (this->has_summary()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->summary_, deterministic, target);
-  }
-
-  // .Brand brand = 3;
-  if (this->has_brand()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        3, *this->brand_, deterministic, target);
-  }
-
-  // repeated .MediaItem media = 20;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->media_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        20, this->media(static_cast<int>(i)), deterministic, target);
-  }
-
-  // .Content usage = 30;
-  if (this->has_usage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        30, *this->usage_, deterministic, target);
-  }
-
-  // .Content dosage = 31;
-  if (this->has_dosage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        31, *this->dosage_, deterministic, target);
-  }
-
-  // .Content advice = 32;
-  if (this->has_advice()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        32, *this->advice_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ProductContent)
-  return target;
-}
-
-size_t ProductContent::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ProductContent)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // repeated .MediaItem media = 20;
-  {
-    unsigned int count = static_cast<unsigned int>(this->media_size());
-    total_size += 2UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->media(static_cast<int>(i)));
-    }
-  }
-
-  // .Name name = 1;
-  if (this->has_name()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->name_);
-  }
-
-  // .Content summary = 2;
-  if (this->has_summary()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->summary_);
-  }
-
-  // .Brand brand = 3;
-  if (this->has_brand()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->brand_);
-  }
-
-  // .Content usage = 30;
-  if (this->has_usage()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->usage_);
-  }
-
-  // .Content dosage = 31;
-  if (this->has_dosage()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->dosage_);
-  }
-
-  // .Content advice = 32;
-  if (this->has_advice()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->advice_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ProductContent::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ProductContent)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ProductContent* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ProductContent>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ProductContent)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ProductContent)
-    MergeFrom(*source);
-  }
-}
-
-void ProductContent::MergeFrom(const ProductContent& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ProductContent)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  media_.MergeFrom(from.media_);
-  if (from.has_name()) {
-    mutable_name()->::Name::MergeFrom(from.name());
-  }
-  if (from.has_summary()) {
-    mutable_summary()->::Content::MergeFrom(from.summary());
-  }
-  if (from.has_brand()) {
-    mutable_brand()->::Brand::MergeFrom(from.brand());
-  }
-  if (from.has_usage()) {
-    mutable_usage()->::Content::MergeFrom(from.usage());
-  }
-  if (from.has_dosage()) {
-    mutable_dosage()->::Content::MergeFrom(from.dosage());
-  }
-  if (from.has_advice()) {
-    mutable_advice()->::Content::MergeFrom(from.advice());
-  }
-}
-
-void ProductContent::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ProductContent)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ProductContent::CopyFrom(const ProductContent& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ProductContent)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ProductContent::IsInitialized() const {
-  return true;
-}
-
-void ProductContent::Swap(ProductContent* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ProductContent* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ProductContent::UnsafeArenaSwap(ProductContent* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ProductContent::InternalSwap(ProductContent* other) {
-  using std::swap;
-  media_.InternalSwap(&other->media_);
-  swap(name_, other->name_);
-  swap(summary_, other->summary_);
-  swap(brand_, other->brand_);
-  swap(usage_, other->usage_);
-  swap(dosage_, other->dosage_);
-  swap(advice_, other->advice_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ProductContent::GetMetadata() const {
-  protobuf_content_2fProductContent_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_content_2fProductContent_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ProductContent
-
-// .Name name = 1;
-bool ProductContent::has_name() const {
-  return this != internal_default_instance() && name_ != NULL;
-}
-void ProductContent::clear_name() {
-  if (GetArenaNoVirtual() == NULL && name_ != NULL) delete name_;
-  name_ = NULL;
-}
-const ::Name& ProductContent::name() const {
-  const ::Name* p = name_;
-  // @@protoc_insertion_point(field_get:ProductContent.name)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-::Name* ProductContent::mutable_name() {
-  
-  if (name_ == NULL) {
-    _slow_mutable_name();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.name)
-  return name_;
-}
-::Name* ProductContent::release_name() {
-  // @@protoc_insertion_point(field_release:ProductContent.name)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_name();
-  } else {
-    ::Name* temp = name_;
-    name_ = NULL;
-    return temp;
-  }
-}
- void ProductContent::set_allocated_name(::Name* name) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete name_;
-  }
-  if (name != NULL) {
-    _slow_set_allocated_name(message_arena, &name);
-  }
-  name_ = name;
-  if (name) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.name)
-}
-
-// .Content summary = 2;
-bool ProductContent::has_summary() const {
-  return this != internal_default_instance() && summary_ != NULL;
-}
-void ProductContent::clear_summary() {
-  if (GetArenaNoVirtual() == NULL && summary_ != NULL) delete summary_;
-  summary_ = NULL;
-}
-const ::Content& ProductContent::summary() const {
-  const ::Content* p = summary_;
-  // @@protoc_insertion_point(field_get:ProductContent.summary)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-::Content* ProductContent::mutable_summary() {
-  
-  if (summary_ == NULL) {
-    _slow_mutable_summary();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.summary)
-  return summary_;
-}
-::Content* ProductContent::release_summary() {
-  // @@protoc_insertion_point(field_release:ProductContent.summary)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_summary();
-  } else {
-    ::Content* temp = summary_;
-    summary_ = NULL;
-    return temp;
-  }
-}
- void ProductContent::set_allocated_summary(::Content* summary) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete summary_;
-  }
-  if (summary != NULL) {
-    _slow_set_allocated_summary(message_arena, &summary);
-  }
-  summary_ = summary;
-  if (summary) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.summary)
-}
-
-// .Brand brand = 3;
-bool ProductContent::has_brand() const {
-  return this != internal_default_instance() && brand_ != NULL;
-}
-void ProductContent::clear_brand() {
-  if (GetArenaNoVirtual() == NULL && brand_ != NULL) delete brand_;
-  brand_ = NULL;
-}
-const ::Brand& ProductContent::brand() const {
-  const ::Brand* p = brand_;
-  // @@protoc_insertion_point(field_get:ProductContent.brand)
-  return p != NULL ? *p : *reinterpret_cast<const ::Brand*>(
-      &::_Brand_default_instance_);
-}
-::Brand* ProductContent::mutable_brand() {
-  
-  if (brand_ == NULL) {
-    _slow_mutable_brand();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.brand)
-  return brand_;
-}
-::Brand* ProductContent::release_brand() {
-  // @@protoc_insertion_point(field_release:ProductContent.brand)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_brand();
-  } else {
-    ::Brand* temp = brand_;
-    brand_ = NULL;
-    return temp;
-  }
-}
- void ProductContent::set_allocated_brand(::Brand* brand) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete brand_;
-  }
-  if (brand != NULL) {
-    _slow_set_allocated_brand(message_arena, &brand);
-  }
-  brand_ = brand;
-  if (brand) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.brand)
-}
-
-// repeated .MediaItem media = 20;
-int ProductContent::media_size() const {
-  return media_.size();
-}
-void ProductContent::clear_media() {
-  media_.Clear();
-}
-const ::MediaItem& ProductContent::media(int index) const {
-  // @@protoc_insertion_point(field_get:ProductContent.media)
-  return media_.Get(index);
-}
-::MediaItem* ProductContent::mutable_media(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductContent.media)
-  return media_.Mutable(index);
-}
-::MediaItem* ProductContent::add_media() {
-  // @@protoc_insertion_point(field_add:ProductContent.media)
-  return media_.Add();
-}
-::google::protobuf::RepeatedPtrField< ::MediaItem >*
-ProductContent::mutable_media() {
-  // @@protoc_insertion_point(field_mutable_list:ProductContent.media)
-  return &media_;
-}
-const ::google::protobuf::RepeatedPtrField< ::MediaItem >&
-ProductContent::media() const {
-  // @@protoc_insertion_point(field_list:ProductContent.media)
-  return media_;
-}
-
-// .Content usage = 30;
-bool ProductContent::has_usage() const {
-  return this != internal_default_instance() && usage_ != NULL;
-}
-void ProductContent::clear_usage() {
-  if (GetArenaNoVirtual() == NULL && usage_ != NULL) delete usage_;
-  usage_ = NULL;
-}
-const ::Content& ProductContent::usage() const {
-  const ::Content* p = usage_;
-  // @@protoc_insertion_point(field_get:ProductContent.usage)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-::Content* ProductContent::mutable_usage() {
-  
-  if (usage_ == NULL) {
-    _slow_mutable_usage();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.usage)
-  return usage_;
-}
-::Content* ProductContent::release_usage() {
-  // @@protoc_insertion_point(field_release:ProductContent.usage)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_usage();
-  } else {
-    ::Content* temp = usage_;
-    usage_ = NULL;
-    return temp;
-  }
-}
- void ProductContent::set_allocated_usage(::Content* usage) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete usage_;
-  }
-  if (usage != NULL) {
-    _slow_set_allocated_usage(message_arena, &usage);
-  }
-  usage_ = usage;
-  if (usage) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.usage)
-}
-
-// .Content dosage = 31;
-bool ProductContent::has_dosage() const {
-  return this != internal_default_instance() && dosage_ != NULL;
-}
-void ProductContent::clear_dosage() {
-  if (GetArenaNoVirtual() == NULL && dosage_ != NULL) delete dosage_;
-  dosage_ = NULL;
-}
-const ::Content& ProductContent::dosage() const {
-  const ::Content* p = dosage_;
-  // @@protoc_insertion_point(field_get:ProductContent.dosage)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-::Content* ProductContent::mutable_dosage() {
-  
-  if (dosage_ == NULL) {
-    _slow_mutable_dosage();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.dosage)
-  return dosage_;
-}
-::Content* ProductContent::release_dosage() {
-  // @@protoc_insertion_point(field_release:ProductContent.dosage)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_dosage();
-  } else {
-    ::Content* temp = dosage_;
-    dosage_ = NULL;
-    return temp;
-  }
-}
- void ProductContent::set_allocated_dosage(::Content* dosage) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete dosage_;
-  }
-  if (dosage != NULL) {
-    _slow_set_allocated_dosage(message_arena, &dosage);
-  }
-  dosage_ = dosage;
-  if (dosage) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.dosage)
-}
-
-// .Content advice = 32;
-bool ProductContent::has_advice() const {
-  return this != internal_default_instance() && advice_ != NULL;
-}
-void ProductContent::clear_advice() {
-  if (GetArenaNoVirtual() == NULL && advice_ != NULL) delete advice_;
-  advice_ = NULL;
-}
-const ::Content& ProductContent::advice() const {
-  const ::Content* p = advice_;
-  // @@protoc_insertion_point(field_get:ProductContent.advice)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-::Content* ProductContent::mutable_advice() {
-  
-  if (advice_ == NULL) {
-    _slow_mutable_advice();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.advice)
-  return advice_;
-}
-::Content* ProductContent::release_advice() {
-  // @@protoc_insertion_point(field_release:ProductContent.advice)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_advice();
-  } else {
-    ::Content* temp = advice_;
-    advice_ = NULL;
-    return temp;
-  }
-}
- void ProductContent::set_allocated_advice(::Content* advice) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete advice_;
-  }
-  if (advice != NULL) {
-    _slow_set_allocated_advice(message_arena, &advice);
-  }
-  advice_ = advice;
-  if (advice) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.advice)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/content/ProductContent.pb.h b/languages/cpp/content/ProductContent.pb.h
deleted file mode 100644
index 08fa546..0000000
--- a/languages/cpp/content/ProductContent.pb.h
+++ /dev/null
@@ -1,640 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-#ifndef PROTOBUF_content_2fProductContent_2eproto__INCLUDED
-#define PROTOBUF_content_2fProductContent_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "content/Name.pb.h"
-#include "content/Content.pb.h"
-#include "content/Brand.pb.h"
-#include "media/MediaItem.pb.h"
-// @@protoc_insertion_point(includes)
-class ProductContent;
-class ProductContentDefaultTypeInternal;
-extern ProductContentDefaultTypeInternal _ProductContent_default_instance_;
-
-namespace protobuf_content_2fProductContent_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_content_2fProductContent_2eproto
-
-// ===================================================================
-
-class ProductContent : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ProductContent) */ {
- public:
-  ProductContent();
-  virtual ~ProductContent();
-
-  ProductContent(const ProductContent& from);
-
-  inline ProductContent& operator=(const ProductContent& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ProductContent(ProductContent&& from) noexcept
-    : ProductContent() {
-    *this = ::std::move(from);
-  }
-
-  inline ProductContent& operator=(ProductContent&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ProductContent& default_instance();
-
-  static inline const ProductContent* internal_default_instance() {
-    return reinterpret_cast<const ProductContent*>(
-               &_ProductContent_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(ProductContent* other);
-  void Swap(ProductContent* other);
-  friend void swap(ProductContent& a, ProductContent& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ProductContent* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ProductContent* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ProductContent& from);
-  void MergeFrom(const ProductContent& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ProductContent* other);
-  protected:
-  explicit ProductContent(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .MediaItem media = 20;
-  int media_size() const;
-  void clear_media();
-  static const int kMediaFieldNumber = 20;
-  const ::MediaItem& media(int index) const;
-  ::MediaItem* mutable_media(int index);
-  ::MediaItem* add_media();
-  ::google::protobuf::RepeatedPtrField< ::MediaItem >*
-      mutable_media();
-  const ::google::protobuf::RepeatedPtrField< ::MediaItem >&
-      media() const;
-
-  // .Name name = 1;
-  bool has_name() const;
-  void clear_name();
-  static const int kNameFieldNumber = 1;
-  private:
-  void _slow_mutable_name();
-  void _slow_set_allocated_name(
-      ::google::protobuf::Arena* message_arena, ::Name** name);
-  ::Name* _slow_release_name();
-  public:
-  const ::Name& name() const;
-  ::Name* mutable_name();
-  ::Name* release_name();
-  void set_allocated_name(::Name* name);
-  ::Name* unsafe_arena_release_name();
-  void unsafe_arena_set_allocated_name(
-      ::Name* name);
-
-  // .Content summary = 2;
-  bool has_summary() const;
-  void clear_summary();
-  static const int kSummaryFieldNumber = 2;
-  private:
-  void _slow_mutable_summary();
-  void _slow_set_allocated_summary(
-      ::google::protobuf::Arena* message_arena, ::Content** summary);
-  ::Content* _slow_release_summary();
-  public:
-  const ::Content& summary() const;
-  ::Content* mutable_summary();
-  ::Content* release_summary();
-  void set_allocated_summary(::Content* summary);
-  ::Content* unsafe_arena_release_summary();
-  void unsafe_arena_set_allocated_summary(
-      ::Content* summary);
-
-  // .Brand brand = 3;
-  bool has_brand() const;
-  void clear_brand();
-  static const int kBrandFieldNumber = 3;
-  private:
-  void _slow_mutable_brand();
-  void _slow_set_allocated_brand(
-      ::google::protobuf::Arena* message_arena, ::Brand** brand);
-  ::Brand* _slow_release_brand();
-  public:
-  const ::Brand& brand() const;
-  ::Brand* mutable_brand();
-  ::Brand* release_brand();
-  void set_allocated_brand(::Brand* brand);
-  ::Brand* unsafe_arena_release_brand();
-  void unsafe_arena_set_allocated_brand(
-      ::Brand* brand);
-
-  // .Content usage = 30;
-  bool has_usage() const;
-  void clear_usage();
-  static const int kUsageFieldNumber = 30;
-  private:
-  void _slow_mutable_usage();
-  void _slow_set_allocated_usage(
-      ::google::protobuf::Arena* message_arena, ::Content** usage);
-  ::Content* _slow_release_usage();
-  public:
-  const ::Content& usage() const;
-  ::Content* mutable_usage();
-  ::Content* release_usage();
-  void set_allocated_usage(::Content* usage);
-  ::Content* unsafe_arena_release_usage();
-  void unsafe_arena_set_allocated_usage(
-      ::Content* usage);
-
-  // .Content dosage = 31;
-  bool has_dosage() const;
-  void clear_dosage();
-  static const int kDosageFieldNumber = 31;
-  private:
-  void _slow_mutable_dosage();
-  void _slow_set_allocated_dosage(
-      ::google::protobuf::Arena* message_arena, ::Content** dosage);
-  ::Content* _slow_release_dosage();
-  public:
-  const ::Content& dosage() const;
-  ::Content* mutable_dosage();
-  ::Content* release_dosage();
-  void set_allocated_dosage(::Content* dosage);
-  ::Content* unsafe_arena_release_dosage();
-  void unsafe_arena_set_allocated_dosage(
-      ::Content* dosage);
-
-  // .Content advice = 32;
-  bool has_advice() const;
-  void clear_advice();
-  static const int kAdviceFieldNumber = 32;
-  private:
-  void _slow_mutable_advice();
-  void _slow_set_allocated_advice(
-      ::google::protobuf::Arena* message_arena, ::Content** advice);
-  ::Content* _slow_release_advice();
-  public:
-  const ::Content& advice() const;
-  ::Content* mutable_advice();
-  ::Content* release_advice();
-  void set_allocated_advice(::Content* advice);
-  ::Content* unsafe_arena_release_advice();
-  void unsafe_arena_set_allocated_advice(
-      ::Content* advice);
-
-  // @@protoc_insertion_point(class_scope:ProductContent)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::RepeatedPtrField< ::MediaItem > media_;
-  ::Name* name_;
-  ::Content* summary_;
-  ::Brand* brand_;
-  ::Content* usage_;
-  ::Content* dosage_;
-  ::Content* advice_;
-  mutable int _cached_size_;
-  friend struct protobuf_content_2fProductContent_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// ProductContent
-
-// .Name name = 1;
-inline bool ProductContent::has_name() const {
-  return this != internal_default_instance() && name_ != NULL;
-}
-inline void ProductContent::clear_name() {
-  if (GetArenaNoVirtual() == NULL && name_ != NULL) delete name_;
-  name_ = NULL;
-}
-inline const ::Name& ProductContent::name() const {
-  const ::Name* p = name_;
-  // @@protoc_insertion_point(field_get:ProductContent.name)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-inline ::Name* ProductContent::mutable_name() {
-  
-  if (name_ == NULL) {
-    _slow_mutable_name();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.name)
-  return name_;
-}
-inline ::Name* ProductContent::release_name() {
-  // @@protoc_insertion_point(field_release:ProductContent.name)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_name();
-  } else {
-    ::Name* temp = name_;
-    name_ = NULL;
-    return temp;
-  }
-}
-inline  void ProductContent::set_allocated_name(::Name* name) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete name_;
-  }
-  if (name != NULL) {
-    _slow_set_allocated_name(message_arena, &name);
-  }
-  name_ = name;
-  if (name) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.name)
-}
-
-// .Content summary = 2;
-inline bool ProductContent::has_summary() const {
-  return this != internal_default_instance() && summary_ != NULL;
-}
-inline void ProductContent::clear_summary() {
-  if (GetArenaNoVirtual() == NULL && summary_ != NULL) delete summary_;
-  summary_ = NULL;
-}
-inline const ::Content& ProductContent::summary() const {
-  const ::Content* p = summary_;
-  // @@protoc_insertion_point(field_get:ProductContent.summary)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-inline ::Content* ProductContent::mutable_summary() {
-  
-  if (summary_ == NULL) {
-    _slow_mutable_summary();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.summary)
-  return summary_;
-}
-inline ::Content* ProductContent::release_summary() {
-  // @@protoc_insertion_point(field_release:ProductContent.summary)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_summary();
-  } else {
-    ::Content* temp = summary_;
-    summary_ = NULL;
-    return temp;
-  }
-}
-inline  void ProductContent::set_allocated_summary(::Content* summary) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete summary_;
-  }
-  if (summary != NULL) {
-    _slow_set_allocated_summary(message_arena, &summary);
-  }
-  summary_ = summary;
-  if (summary) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.summary)
-}
-
-// .Brand brand = 3;
-inline bool ProductContent::has_brand() const {
-  return this != internal_default_instance() && brand_ != NULL;
-}
-inline void ProductContent::clear_brand() {
-  if (GetArenaNoVirtual() == NULL && brand_ != NULL) delete brand_;
-  brand_ = NULL;
-}
-inline const ::Brand& ProductContent::brand() const {
-  const ::Brand* p = brand_;
-  // @@protoc_insertion_point(field_get:ProductContent.brand)
-  return p != NULL ? *p : *reinterpret_cast<const ::Brand*>(
-      &::_Brand_default_instance_);
-}
-inline ::Brand* ProductContent::mutable_brand() {
-  
-  if (brand_ == NULL) {
-    _slow_mutable_brand();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.brand)
-  return brand_;
-}
-inline ::Brand* ProductContent::release_brand() {
-  // @@protoc_insertion_point(field_release:ProductContent.brand)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_brand();
-  } else {
-    ::Brand* temp = brand_;
-    brand_ = NULL;
-    return temp;
-  }
-}
-inline  void ProductContent::set_allocated_brand(::Brand* brand) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete brand_;
-  }
-  if (brand != NULL) {
-    _slow_set_allocated_brand(message_arena, &brand);
-  }
-  brand_ = brand;
-  if (brand) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.brand)
-}
-
-// repeated .MediaItem media = 20;
-inline int ProductContent::media_size() const {
-  return media_.size();
-}
-inline void ProductContent::clear_media() {
-  media_.Clear();
-}
-inline const ::MediaItem& ProductContent::media(int index) const {
-  // @@protoc_insertion_point(field_get:ProductContent.media)
-  return media_.Get(index);
-}
-inline ::MediaItem* ProductContent::mutable_media(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductContent.media)
-  return media_.Mutable(index);
-}
-inline ::MediaItem* ProductContent::add_media() {
-  // @@protoc_insertion_point(field_add:ProductContent.media)
-  return media_.Add();
-}
-inline ::google::protobuf::RepeatedPtrField< ::MediaItem >*
-ProductContent::mutable_media() {
-  // @@protoc_insertion_point(field_mutable_list:ProductContent.media)
-  return &media_;
-}
-inline const ::google::protobuf::RepeatedPtrField< ::MediaItem >&
-ProductContent::media() const {
-  // @@protoc_insertion_point(field_list:ProductContent.media)
-  return media_;
-}
-
-// .Content usage = 30;
-inline bool ProductContent::has_usage() const {
-  return this != internal_default_instance() && usage_ != NULL;
-}
-inline void ProductContent::clear_usage() {
-  if (GetArenaNoVirtual() == NULL && usage_ != NULL) delete usage_;
-  usage_ = NULL;
-}
-inline const ::Content& ProductContent::usage() const {
-  const ::Content* p = usage_;
-  // @@protoc_insertion_point(field_get:ProductContent.usage)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-inline ::Content* ProductContent::mutable_usage() {
-  
-  if (usage_ == NULL) {
-    _slow_mutable_usage();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.usage)
-  return usage_;
-}
-inline ::Content* ProductContent::release_usage() {
-  // @@protoc_insertion_point(field_release:ProductContent.usage)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_usage();
-  } else {
-    ::Content* temp = usage_;
-    usage_ = NULL;
-    return temp;
-  }
-}
-inline  void ProductContent::set_allocated_usage(::Content* usage) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete usage_;
-  }
-  if (usage != NULL) {
-    _slow_set_allocated_usage(message_arena, &usage);
-  }
-  usage_ = usage;
-  if (usage) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.usage)
-}
-
-// .Content dosage = 31;
-inline bool ProductContent::has_dosage() const {
-  return this != internal_default_instance() && dosage_ != NULL;
-}
-inline void ProductContent::clear_dosage() {
-  if (GetArenaNoVirtual() == NULL && dosage_ != NULL) delete dosage_;
-  dosage_ = NULL;
-}
-inline const ::Content& ProductContent::dosage() const {
-  const ::Content* p = dosage_;
-  // @@protoc_insertion_point(field_get:ProductContent.dosage)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-inline ::Content* ProductContent::mutable_dosage() {
-  
-  if (dosage_ == NULL) {
-    _slow_mutable_dosage();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.dosage)
-  return dosage_;
-}
-inline ::Content* ProductContent::release_dosage() {
-  // @@protoc_insertion_point(field_release:ProductContent.dosage)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_dosage();
-  } else {
-    ::Content* temp = dosage_;
-    dosage_ = NULL;
-    return temp;
-  }
-}
-inline  void ProductContent::set_allocated_dosage(::Content* dosage) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete dosage_;
-  }
-  if (dosage != NULL) {
-    _slow_set_allocated_dosage(message_arena, &dosage);
-  }
-  dosage_ = dosage;
-  if (dosage) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.dosage)
-}
-
-// .Content advice = 32;
-inline bool ProductContent::has_advice() const {
-  return this != internal_default_instance() && advice_ != NULL;
-}
-inline void ProductContent::clear_advice() {
-  if (GetArenaNoVirtual() == NULL && advice_ != NULL) delete advice_;
-  advice_ = NULL;
-}
-inline const ::Content& ProductContent::advice() const {
-  const ::Content* p = advice_;
-  // @@protoc_insertion_point(field_get:ProductContent.advice)
-  return p != NULL ? *p : *reinterpret_cast<const ::Content*>(
-      &::_Content_default_instance_);
-}
-inline ::Content* ProductContent::mutable_advice() {
-  
-  if (advice_ == NULL) {
-    _slow_mutable_advice();
-  }
-  // @@protoc_insertion_point(field_mutable:ProductContent.advice)
-  return advice_;
-}
-inline ::Content* ProductContent::release_advice() {
-  // @@protoc_insertion_point(field_release:ProductContent.advice)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_advice();
-  } else {
-    ::Content* temp = advice_;
-    advice_ = NULL;
-    return temp;
-  }
-}
-inline  void ProductContent::set_allocated_advice(::Content* advice) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete advice_;
-  }
-  if (advice != NULL) {
-    _slow_set_allocated_advice(message_arena, &advice);
-  }
-  advice_ = advice;
-  if (advice) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:ProductContent.advice)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_content_2fProductContent_2eproto__INCLUDED
diff --git a/languages/cpp/geo/Address.pb.cc b/languages/cpp/geo/Address.pb.cc
deleted file mode 100644
index 0d1615e..0000000
--- a/languages/cpp/geo/Address.pb.cc
+++ /dev/null
@@ -1,997 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "geo/Address.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class AddressDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Address>
-     _instance;
-} _Address_default_instance_;
-
-namespace protobuf_geo_2fAddress_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, first_line_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, second_line_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, city_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, state_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, zipcode_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Address, country_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Address)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Address_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "geo/Address.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _Address_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Address_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\021geo/Address.proto\"q\n\007Address\022\022\n\nfirst_"
-      "line\030\001 \001(\t\022\023\n\013second_line\030\002 \001(\t\022\014\n\004city\030"
-      "\003 \001(\t\022\r\n\005state\030\004 \001(\t\022\017\n\007zipcode\030\005 \001(\t\022\017\n"
-      "\007country\030\006 \001(\tB\034\n\026io.bloombox.schema.geo"
-      "H\001P\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 172);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "geo/Address.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_geo_2fAddress_2eproto
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Address::kFirstLineFieldNumber;
-const int Address::kSecondLineFieldNumber;
-const int Address::kCityFieldNumber;
-const int Address::kStateFieldNumber;
-const int Address::kZipcodeFieldNumber;
-const int Address::kCountryFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Address::Address()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_geo_2fAddress_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Address)
-}
-Address::Address(const Address& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  first_line_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.first_line().size() > 0) {
-    first_line_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.first_line_);
-  }
-  second_line_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.second_line().size() > 0) {
-    second_line_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.second_line_);
-  }
-  city_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.city().size() > 0) {
-    city_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.city_);
-  }
-  state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.state().size() > 0) {
-    state_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.state_);
-  }
-  zipcode_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.zipcode().size() > 0) {
-    zipcode_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.zipcode_);
-  }
-  country_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.country().size() > 0) {
-    country_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.country_);
-  }
-  // @@protoc_insertion_point(copy_constructor:Address)
-}
-
-void Address::SharedCtor() {
-  first_line_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  second_line_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  city_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  zipcode_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  country_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  _cached_size_ = 0;
-}
-
-Address::~Address() {
-  // @@protoc_insertion_point(destructor:Address)
-  SharedDtor();
-}
-
-void Address::SharedDtor() {
-  first_line_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  second_line_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  city_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  state_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  zipcode_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  country_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-
-void Address::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Address::descriptor() {
-  protobuf_geo_2fAddress_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_geo_2fAddress_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Address& Address::default_instance() {
-  protobuf_geo_2fAddress_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Address* Address::New(::google::protobuf::Arena* arena) const {
-  Address* n = new Address;
-  if (arena != NULL) {
-    arena->Own(n);
-  }
-  return n;
-}
-
-void Address::Clear() {
-// @@protoc_insertion_point(message_clear_start:Address)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  first_line_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  second_line_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  city_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  zipcode_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  country_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  _internal_metadata_.Clear();
-}
-
-bool Address::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Address)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // string first_line = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_first_line()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->first_line().data(), static_cast<int>(this->first_line().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Address.first_line"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string second_line = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_second_line()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->second_line().data(), static_cast<int>(this->second_line().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Address.second_line"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string city = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_city()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->city().data(), static_cast<int>(this->city().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Address.city"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string state = 4;
-      case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_state()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->state().data(), static_cast<int>(this->state().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Address.state"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string zipcode = 5;
-      case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_zipcode()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->zipcode().data(), static_cast<int>(this->zipcode().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Address.zipcode"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string country = 6;
-      case 6: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_country()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->country().data(), static_cast<int>(this->country().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "Address.country"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Address)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Address)
-  return false;
-#undef DO_
-}
-
-void Address::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Address)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string first_line = 1;
-  if (this->first_line().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->first_line().data(), static_cast<int>(this->first_line().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.first_line");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->first_line(), output);
-  }
-
-  // string second_line = 2;
-  if (this->second_line().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->second_line().data(), static_cast<int>(this->second_line().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.second_line");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      2, this->second_line(), output);
-  }
-
-  // string city = 3;
-  if (this->city().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->city().data(), static_cast<int>(this->city().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.city");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      3, this->city(), output);
-  }
-
-  // string state = 4;
-  if (this->state().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->state().data(), static_cast<int>(this->state().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.state");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      4, this->state(), output);
-  }
-
-  // string zipcode = 5;
-  if (this->zipcode().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->zipcode().data(), static_cast<int>(this->zipcode().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.zipcode");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      5, this->zipcode(), output);
-  }
-
-  // string country = 6;
-  if (this->country().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->country().data(), static_cast<int>(this->country().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.country");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      6, this->country(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Address)
-}
-
-::google::protobuf::uint8* Address::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Address)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string first_line = 1;
-  if (this->first_line().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->first_line().data(), static_cast<int>(this->first_line().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.first_line");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->first_line(), target);
-  }
-
-  // string second_line = 2;
-  if (this->second_line().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->second_line().data(), static_cast<int>(this->second_line().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.second_line");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->second_line(), target);
-  }
-
-  // string city = 3;
-  if (this->city().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->city().data(), static_cast<int>(this->city().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.city");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->city(), target);
-  }
-
-  // string state = 4;
-  if (this->state().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->state().data(), static_cast<int>(this->state().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.state");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->state(), target);
-  }
-
-  // string zipcode = 5;
-  if (this->zipcode().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->zipcode().data(), static_cast<int>(this->zipcode().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.zipcode");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        5, this->zipcode(), target);
-  }
-
-  // string country = 6;
-  if (this->country().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->country().data(), static_cast<int>(this->country().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "Address.country");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        6, this->country(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Address)
-  return target;
-}
-
-size_t Address::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Address)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // string first_line = 1;
-  if (this->first_line().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->first_line());
-  }
-
-  // string second_line = 2;
-  if (this->second_line().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->second_line());
-  }
-
-  // string city = 3;
-  if (this->city().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->city());
-  }
-
-  // string state = 4;
-  if (this->state().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->state());
-  }
-
-  // string zipcode = 5;
-  if (this->zipcode().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->zipcode());
-  }
-
-  // string country = 6;
-  if (this->country().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->country());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Address::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Address)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Address* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Address>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Address)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Address)
-    MergeFrom(*source);
-  }
-}
-
-void Address::MergeFrom(const Address& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Address)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.first_line().size() > 0) {
-
-    first_line_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.first_line_);
-  }
-  if (from.second_line().size() > 0) {
-
-    second_line_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.second_line_);
-  }
-  if (from.city().size() > 0) {
-
-    city_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.city_);
-  }
-  if (from.state().size() > 0) {
-
-    state_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.state_);
-  }
-  if (from.zipcode().size() > 0) {
-
-    zipcode_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.zipcode_);
-  }
-  if (from.country().size() > 0) {
-
-    country_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.country_);
-  }
-}
-
-void Address::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Address)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Address::CopyFrom(const Address& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Address)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Address::IsInitialized() const {
-  return true;
-}
-
-void Address::Swap(Address* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void Address::InternalSwap(Address* other) {
-  using std::swap;
-  first_line_.Swap(&other->first_line_);
-  second_line_.Swap(&other->second_line_);
-  city_.Swap(&other->city_);
-  state_.Swap(&other->state_);
-  zipcode_.Swap(&other->zipcode_);
-  country_.Swap(&other->country_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Address::GetMetadata() const {
-  protobuf_geo_2fAddress_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_geo_2fAddress_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Address
-
-// string first_line = 1;
-void Address::clear_first_line() {
-  first_line_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-const ::std::string& Address::first_line() const {
-  // @@protoc_insertion_point(field_get:Address.first_line)
-  return first_line_.GetNoArena();
-}
-void Address::set_first_line(const ::std::string& value) {
-  
-  first_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.first_line)
-}
-#if LANG_CXX11
-void Address::set_first_line(::std::string&& value) {
-  
-  first_line_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.first_line)
-}
-#endif
-void Address::set_first_line(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  first_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.first_line)
-}
-void Address::set_first_line(const char* value, size_t size) {
-  
-  first_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.first_line)
-}
-::std::string* Address::mutable_first_line() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.first_line)
-  return first_line_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-::std::string* Address::release_first_line() {
-  // @@protoc_insertion_point(field_release:Address.first_line)
-  
-  return first_line_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-void Address::set_allocated_first_line(::std::string* first_line) {
-  if (first_line != NULL) {
-    
-  } else {
-    
-  }
-  first_line_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), first_line);
-  // @@protoc_insertion_point(field_set_allocated:Address.first_line)
-}
-
-// string second_line = 2;
-void Address::clear_second_line() {
-  second_line_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-const ::std::string& Address::second_line() const {
-  // @@protoc_insertion_point(field_get:Address.second_line)
-  return second_line_.GetNoArena();
-}
-void Address::set_second_line(const ::std::string& value) {
-  
-  second_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.second_line)
-}
-#if LANG_CXX11
-void Address::set_second_line(::std::string&& value) {
-  
-  second_line_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.second_line)
-}
-#endif
-void Address::set_second_line(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  second_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.second_line)
-}
-void Address::set_second_line(const char* value, size_t size) {
-  
-  second_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.second_line)
-}
-::std::string* Address::mutable_second_line() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.second_line)
-  return second_line_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-::std::string* Address::release_second_line() {
-  // @@protoc_insertion_point(field_release:Address.second_line)
-  
-  return second_line_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-void Address::set_allocated_second_line(::std::string* second_line) {
-  if (second_line != NULL) {
-    
-  } else {
-    
-  }
-  second_line_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), second_line);
-  // @@protoc_insertion_point(field_set_allocated:Address.second_line)
-}
-
-// string city = 3;
-void Address::clear_city() {
-  city_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-const ::std::string& Address::city() const {
-  // @@protoc_insertion_point(field_get:Address.city)
-  return city_.GetNoArena();
-}
-void Address::set_city(const ::std::string& value) {
-  
-  city_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.city)
-}
-#if LANG_CXX11
-void Address::set_city(::std::string&& value) {
-  
-  city_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.city)
-}
-#endif
-void Address::set_city(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  city_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.city)
-}
-void Address::set_city(const char* value, size_t size) {
-  
-  city_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.city)
-}
-::std::string* Address::mutable_city() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.city)
-  return city_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-::std::string* Address::release_city() {
-  // @@protoc_insertion_point(field_release:Address.city)
-  
-  return city_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-void Address::set_allocated_city(::std::string* city) {
-  if (city != NULL) {
-    
-  } else {
-    
-  }
-  city_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), city);
-  // @@protoc_insertion_point(field_set_allocated:Address.city)
-}
-
-// string state = 4;
-void Address::clear_state() {
-  state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-const ::std::string& Address::state() const {
-  // @@protoc_insertion_point(field_get:Address.state)
-  return state_.GetNoArena();
-}
-void Address::set_state(const ::std::string& value) {
-  
-  state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.state)
-}
-#if LANG_CXX11
-void Address::set_state(::std::string&& value) {
-  
-  state_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.state)
-}
-#endif
-void Address::set_state(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.state)
-}
-void Address::set_state(const char* value, size_t size) {
-  
-  state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.state)
-}
-::std::string* Address::mutable_state() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.state)
-  return state_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-::std::string* Address::release_state() {
-  // @@protoc_insertion_point(field_release:Address.state)
-  
-  return state_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-void Address::set_allocated_state(::std::string* state) {
-  if (state != NULL) {
-    
-  } else {
-    
-  }
-  state_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), state);
-  // @@protoc_insertion_point(field_set_allocated:Address.state)
-}
-
-// string zipcode = 5;
-void Address::clear_zipcode() {
-  zipcode_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-const ::std::string& Address::zipcode() const {
-  // @@protoc_insertion_point(field_get:Address.zipcode)
-  return zipcode_.GetNoArena();
-}
-void Address::set_zipcode(const ::std::string& value) {
-  
-  zipcode_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.zipcode)
-}
-#if LANG_CXX11
-void Address::set_zipcode(::std::string&& value) {
-  
-  zipcode_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.zipcode)
-}
-#endif
-void Address::set_zipcode(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  zipcode_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.zipcode)
-}
-void Address::set_zipcode(const char* value, size_t size) {
-  
-  zipcode_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.zipcode)
-}
-::std::string* Address::mutable_zipcode() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.zipcode)
-  return zipcode_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-::std::string* Address::release_zipcode() {
-  // @@protoc_insertion_point(field_release:Address.zipcode)
-  
-  return zipcode_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-void Address::set_allocated_zipcode(::std::string* zipcode) {
-  if (zipcode != NULL) {
-    
-  } else {
-    
-  }
-  zipcode_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), zipcode);
-  // @@protoc_insertion_point(field_set_allocated:Address.zipcode)
-}
-
-// string country = 6;
-void Address::clear_country() {
-  country_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-const ::std::string& Address::country() const {
-  // @@protoc_insertion_point(field_get:Address.country)
-  return country_.GetNoArena();
-}
-void Address::set_country(const ::std::string& value) {
-  
-  country_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.country)
-}
-#if LANG_CXX11
-void Address::set_country(::std::string&& value) {
-  
-  country_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.country)
-}
-#endif
-void Address::set_country(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  country_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.country)
-}
-void Address::set_country(const char* value, size_t size) {
-  
-  country_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.country)
-}
-::std::string* Address::mutable_country() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.country)
-  return country_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-::std::string* Address::release_country() {
-  // @@protoc_insertion_point(field_release:Address.country)
-  
-  return country_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-void Address::set_allocated_country(::std::string* country) {
-  if (country != NULL) {
-    
-  } else {
-    
-  }
-  country_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), country);
-  // @@protoc_insertion_point(field_set_allocated:Address.country)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/geo/Address.pb.h b/languages/cpp/geo/Address.pb.h
deleted file mode 100644
index 74cfd8b..0000000
--- a/languages/cpp/geo/Address.pb.h
+++ /dev/null
@@ -1,572 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-#ifndef PROTOBUF_geo_2fAddress_2eproto__INCLUDED
-#define PROTOBUF_geo_2fAddress_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class Address;
-class AddressDefaultTypeInternal;
-extern AddressDefaultTypeInternal _Address_default_instance_;
-
-namespace protobuf_geo_2fAddress_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_geo_2fAddress_2eproto
-
-// ===================================================================
-
-class Address : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Address) */ {
- public:
-  Address();
-  virtual ~Address();
-
-  Address(const Address& from);
-
-  inline Address& operator=(const Address& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Address(Address&& from) noexcept
-    : Address() {
-    *this = ::std::move(from);
-  }
-
-  inline Address& operator=(Address&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Address& default_instance();
-
-  static inline const Address* internal_default_instance() {
-    return reinterpret_cast<const Address*>(
-               &_Address_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void Swap(Address* other);
-  friend void swap(Address& a, Address& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Address* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Address* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Address& from);
-  void MergeFrom(const Address& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Address* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
-  }
-  inline void* MaybeArenaPtr() const {
-    return NULL;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // string first_line = 1;
-  void clear_first_line();
-  static const int kFirstLineFieldNumber = 1;
-  const ::std::string& first_line() const;
-  void set_first_line(const ::std::string& value);
-  #if LANG_CXX11
-  void set_first_line(::std::string&& value);
-  #endif
-  void set_first_line(const char* value);
-  void set_first_line(const char* value, size_t size);
-  ::std::string* mutable_first_line();
-  ::std::string* release_first_line();
-  void set_allocated_first_line(::std::string* first_line);
-
-  // string second_line = 2;
-  void clear_second_line();
-  static const int kSecondLineFieldNumber = 2;
-  const ::std::string& second_line() const;
-  void set_second_line(const ::std::string& value);
-  #if LANG_CXX11
-  void set_second_line(::std::string&& value);
-  #endif
-  void set_second_line(const char* value);
-  void set_second_line(const char* value, size_t size);
-  ::std::string* mutable_second_line();
-  ::std::string* release_second_line();
-  void set_allocated_second_line(::std::string* second_line);
-
-  // string city = 3;
-  void clear_city();
-  static const int kCityFieldNumber = 3;
-  const ::std::string& city() const;
-  void set_city(const ::std::string& value);
-  #if LANG_CXX11
-  void set_city(::std::string&& value);
-  #endif
-  void set_city(const char* value);
-  void set_city(const char* value, size_t size);
-  ::std::string* mutable_city();
-  ::std::string* release_city();
-  void set_allocated_city(::std::string* city);
-
-  // string state = 4;
-  void clear_state();
-  static const int kStateFieldNumber = 4;
-  const ::std::string& state() const;
-  void set_state(const ::std::string& value);
-  #if LANG_CXX11
-  void set_state(::std::string&& value);
-  #endif
-  void set_state(const char* value);
-  void set_state(const char* value, size_t size);
-  ::std::string* mutable_state();
-  ::std::string* release_state();
-  void set_allocated_state(::std::string* state);
-
-  // string zipcode = 5;
-  void clear_zipcode();
-  static const int kZipcodeFieldNumber = 5;
-  const ::std::string& zipcode() const;
-  void set_zipcode(const ::std::string& value);
-  #if LANG_CXX11
-  void set_zipcode(::std::string&& value);
-  #endif
-  void set_zipcode(const char* value);
-  void set_zipcode(const char* value, size_t size);
-  ::std::string* mutable_zipcode();
-  ::std::string* release_zipcode();
-  void set_allocated_zipcode(::std::string* zipcode);
-
-  // string country = 6;
-  void clear_country();
-  static const int kCountryFieldNumber = 6;
-  const ::std::string& country() const;
-  void set_country(const ::std::string& value);
-  #if LANG_CXX11
-  void set_country(::std::string&& value);
-  #endif
-  void set_country(const char* value);
-  void set_country(const char* value, size_t size);
-  ::std::string* mutable_country();
-  ::std::string* release_country();
-  void set_allocated_country(::std::string* country);
-
-  // @@protoc_insertion_point(class_scope:Address)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::internal::ArenaStringPtr first_line_;
-  ::google::protobuf::internal::ArenaStringPtr second_line_;
-  ::google::protobuf::internal::ArenaStringPtr city_;
-  ::google::protobuf::internal::ArenaStringPtr state_;
-  ::google::protobuf::internal::ArenaStringPtr zipcode_;
-  ::google::protobuf::internal::ArenaStringPtr country_;
-  mutable int _cached_size_;
-  friend struct protobuf_geo_2fAddress_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Address
-
-// string first_line = 1;
-inline void Address::clear_first_line() {
-  first_line_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline const ::std::string& Address::first_line() const {
-  // @@protoc_insertion_point(field_get:Address.first_line)
-  return first_line_.GetNoArena();
-}
-inline void Address::set_first_line(const ::std::string& value) {
-  
-  first_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.first_line)
-}
-#if LANG_CXX11
-inline void Address::set_first_line(::std::string&& value) {
-  
-  first_line_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.first_line)
-}
-#endif
-inline void Address::set_first_line(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  first_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.first_line)
-}
-inline void Address::set_first_line(const char* value, size_t size) {
-  
-  first_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.first_line)
-}
-inline ::std::string* Address::mutable_first_line() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.first_line)
-  return first_line_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Address::release_first_line() {
-  // @@protoc_insertion_point(field_release:Address.first_line)
-  
-  return first_line_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Address::set_allocated_first_line(::std::string* first_line) {
-  if (first_line != NULL) {
-    
-  } else {
-    
-  }
-  first_line_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), first_line);
-  // @@protoc_insertion_point(field_set_allocated:Address.first_line)
-}
-
-// string second_line = 2;
-inline void Address::clear_second_line() {
-  second_line_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline const ::std::string& Address::second_line() const {
-  // @@protoc_insertion_point(field_get:Address.second_line)
-  return second_line_.GetNoArena();
-}
-inline void Address::set_second_line(const ::std::string& value) {
-  
-  second_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.second_line)
-}
-#if LANG_CXX11
-inline void Address::set_second_line(::std::string&& value) {
-  
-  second_line_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.second_line)
-}
-#endif
-inline void Address::set_second_line(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  second_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.second_line)
-}
-inline void Address::set_second_line(const char* value, size_t size) {
-  
-  second_line_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.second_line)
-}
-inline ::std::string* Address::mutable_second_line() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.second_line)
-  return second_line_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Address::release_second_line() {
-  // @@protoc_insertion_point(field_release:Address.second_line)
-  
-  return second_line_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Address::set_allocated_second_line(::std::string* second_line) {
-  if (second_line != NULL) {
-    
-  } else {
-    
-  }
-  second_line_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), second_line);
-  // @@protoc_insertion_point(field_set_allocated:Address.second_line)
-}
-
-// string city = 3;
-inline void Address::clear_city() {
-  city_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline const ::std::string& Address::city() const {
-  // @@protoc_insertion_point(field_get:Address.city)
-  return city_.GetNoArena();
-}
-inline void Address::set_city(const ::std::string& value) {
-  
-  city_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.city)
-}
-#if LANG_CXX11
-inline void Address::set_city(::std::string&& value) {
-  
-  city_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.city)
-}
-#endif
-inline void Address::set_city(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  city_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.city)
-}
-inline void Address::set_city(const char* value, size_t size) {
-  
-  city_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.city)
-}
-inline ::std::string* Address::mutable_city() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.city)
-  return city_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Address::release_city() {
-  // @@protoc_insertion_point(field_release:Address.city)
-  
-  return city_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Address::set_allocated_city(::std::string* city) {
-  if (city != NULL) {
-    
-  } else {
-    
-  }
-  city_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), city);
-  // @@protoc_insertion_point(field_set_allocated:Address.city)
-}
-
-// string state = 4;
-inline void Address::clear_state() {
-  state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline const ::std::string& Address::state() const {
-  // @@protoc_insertion_point(field_get:Address.state)
-  return state_.GetNoArena();
-}
-inline void Address::set_state(const ::std::string& value) {
-  
-  state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.state)
-}
-#if LANG_CXX11
-inline void Address::set_state(::std::string&& value) {
-  
-  state_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.state)
-}
-#endif
-inline void Address::set_state(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.state)
-}
-inline void Address::set_state(const char* value, size_t size) {
-  
-  state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.state)
-}
-inline ::std::string* Address::mutable_state() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.state)
-  return state_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Address::release_state() {
-  // @@protoc_insertion_point(field_release:Address.state)
-  
-  return state_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Address::set_allocated_state(::std::string* state) {
-  if (state != NULL) {
-    
-  } else {
-    
-  }
-  state_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), state);
-  // @@protoc_insertion_point(field_set_allocated:Address.state)
-}
-
-// string zipcode = 5;
-inline void Address::clear_zipcode() {
-  zipcode_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline const ::std::string& Address::zipcode() const {
-  // @@protoc_insertion_point(field_get:Address.zipcode)
-  return zipcode_.GetNoArena();
-}
-inline void Address::set_zipcode(const ::std::string& value) {
-  
-  zipcode_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.zipcode)
-}
-#if LANG_CXX11
-inline void Address::set_zipcode(::std::string&& value) {
-  
-  zipcode_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.zipcode)
-}
-#endif
-inline void Address::set_zipcode(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  zipcode_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.zipcode)
-}
-inline void Address::set_zipcode(const char* value, size_t size) {
-  
-  zipcode_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.zipcode)
-}
-inline ::std::string* Address::mutable_zipcode() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.zipcode)
-  return zipcode_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Address::release_zipcode() {
-  // @@protoc_insertion_point(field_release:Address.zipcode)
-  
-  return zipcode_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Address::set_allocated_zipcode(::std::string* zipcode) {
-  if (zipcode != NULL) {
-    
-  } else {
-    
-  }
-  zipcode_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), zipcode);
-  // @@protoc_insertion_point(field_set_allocated:Address.zipcode)
-}
-
-// string country = 6;
-inline void Address::clear_country() {
-  country_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline const ::std::string& Address::country() const {
-  // @@protoc_insertion_point(field_get:Address.country)
-  return country_.GetNoArena();
-}
-inline void Address::set_country(const ::std::string& value) {
-  
-  country_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:Address.country)
-}
-#if LANG_CXX11
-inline void Address::set_country(::std::string&& value) {
-  
-  country_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:Address.country)
-}
-#endif
-inline void Address::set_country(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  country_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:Address.country)
-}
-inline void Address::set_country(const char* value, size_t size) {
-  
-  country_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:Address.country)
-}
-inline ::std::string* Address::mutable_country() {
-  
-  // @@protoc_insertion_point(field_mutable:Address.country)
-  return country_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Address::release_country() {
-  // @@protoc_insertion_point(field_release:Address.country)
-  
-  return country_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Address::set_allocated_country(::std::string* country) {
-  if (country != NULL) {
-    
-  } else {
-    
-  }
-  country_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), country);
-  // @@protoc_insertion_point(field_set_allocated:Address.country)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_geo_2fAddress_2eproto__INCLUDED
diff --git a/languages/cpp/media/MediaItem.pb.cc b/languages/cpp/media/MediaItem.pb.cc
deleted file mode 100644
index 9365c10..0000000
--- a/languages/cpp/media/MediaItem.pb.cc
+++ /dev/null
@@ -1,797 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "media/MediaItem.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class MediaItemDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<MediaItem>
-     _instance;
-} _MediaItem_default_instance_;
-
-namespace protobuf_media_2fMediaItem_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaItem, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaItem, key_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaItem, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaItem, name_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(MediaItem)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_MediaItem_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "media/MediaItem.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_media_2fMediaKey_2eproto::InitDefaults();
-  ::protobuf_media_2fMediaType_2eproto::InitDefaults();
-  _MediaItem_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_MediaItem_default_instance_);_MediaItem_default_instance_._instance.get_mutable()->key_ = const_cast< ::MediaKey*>(
-      ::MediaKey::internal_default_instance());
-  _MediaItem_default_instance_._instance.get_mutable()->type_ = const_cast< ::MediaType*>(
-      ::MediaType::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\025media/MediaItem.proto\032\024media/MediaKey."
-      "proto\032\025media/MediaType.proto\"K\n\tMediaIte"
-      "m\022\026\n\003key\030\001 \001(\0132\t.MediaKey\022\030\n\004type\030\002 \001(\0132"
-      "\n.MediaType\022\014\n\004name\030\003 \001(\tB0\n\030io.bloombox"
-      ".schema.mediaB\rAttachedMediaH\001P\001\370\001\001b\006pro"
-      "to3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 203);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "media/MediaItem.proto", &protobuf_RegisterTypes);
-  ::protobuf_media_2fMediaKey_2eproto::AddDescriptors();
-  ::protobuf_media_2fMediaType_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_media_2fMediaItem_2eproto
-
-
-// ===================================================================
-
-void MediaItem::_slow_mutable_key() {
-  key_ = ::google::protobuf::Arena::CreateMessage< ::MediaKey >(
-      GetArenaNoVirtual());
-}
-::MediaKey* MediaItem::_slow_release_key() {
-  if (key_ == NULL) {
-    return NULL;
-  } else {
-    ::MediaKey* temp = new ::MediaKey(*key_);
-    key_ = NULL;
-    return temp;
-  }
-}
-::MediaKey* MediaItem::unsafe_arena_release_key() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaItem.key)
-  
-  ::MediaKey* temp = key_;
-  key_ = NULL;
-  return temp;
-}
-void MediaItem::_slow_set_allocated_key(
-    ::google::protobuf::Arena* message_arena, ::MediaKey** key) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*key) == NULL) {
-      message_arena->Own(*key);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*key)) {
-      ::MediaKey* new_key = 
-            ::google::protobuf::Arena::CreateMessage< ::MediaKey >(
-            message_arena);
-      new_key->CopyFrom(**key);
-      *key = new_key;
-    }
-}
-void MediaItem::unsafe_arena_set_allocated_key(
-    ::MediaKey* key) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete key_;
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaItem.key)
-}
-void MediaItem::_slow_mutable_type() {
-  type_ = ::google::protobuf::Arena::CreateMessage< ::MediaType >(
-      GetArenaNoVirtual());
-}
-::MediaType* MediaItem::_slow_release_type() {
-  if (type_ == NULL) {
-    return NULL;
-  } else {
-    ::MediaType* temp = new ::MediaType(*type_);
-    type_ = NULL;
-    return temp;
-  }
-}
-::MediaType* MediaItem::unsafe_arena_release_type() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaItem.type)
-  
-  ::MediaType* temp = type_;
-  type_ = NULL;
-  return temp;
-}
-void MediaItem::_slow_set_allocated_type(
-    ::google::protobuf::Arena* message_arena, ::MediaType** type) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*type) == NULL) {
-      message_arena->Own(*type);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*type)) {
-      ::MediaType* new_type = 
-            ::google::protobuf::Arena::CreateMessage< ::MediaType >(
-            message_arena);
-      new_type->CopyFrom(**type);
-      *type = new_type;
-    }
-}
-void MediaItem::unsafe_arena_set_allocated_type(
-    ::MediaType* type) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete type_;
-  }
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaItem.type)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int MediaItem::kKeyFieldNumber;
-const int MediaItem::kTypeFieldNumber;
-const int MediaItem::kNameFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-MediaItem::MediaItem()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_media_2fMediaItem_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:MediaItem)
-}
-MediaItem::MediaItem(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_media_2fMediaItem_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:MediaItem)
-}
-MediaItem::MediaItem(const MediaItem& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.name().size() > 0) {
-    name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name(),
-      GetArenaNoVirtual());
-  }
-  if (from.has_key()) {
-    key_ = new ::MediaKey(*from.key_);
-  } else {
-    key_ = NULL;
-  }
-  if (from.has_type()) {
-    type_ = new ::MediaType(*from.type_);
-  } else {
-    type_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:MediaItem)
-}
-
-void MediaItem::SharedCtor() {
-  name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  ::memset(&key_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&type_) -
-      reinterpret_cast<char*>(&key_)) + sizeof(type_));
-  _cached_size_ = 0;
-}
-
-MediaItem::~MediaItem() {
-  // @@protoc_insertion_point(destructor:MediaItem)
-  SharedDtor();
-}
-
-void MediaItem::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
-  if (this != internal_default_instance()) delete key_;
-  if (this != internal_default_instance()) delete type_;
-}
-
-void MediaItem::ArenaDtor(void* object) {
-  MediaItem* _this = reinterpret_cast< MediaItem* >(object);
-  (void)_this;
-}
-void MediaItem::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void MediaItem::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* MediaItem::descriptor() {
-  protobuf_media_2fMediaItem_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaItem_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const MediaItem& MediaItem::default_instance() {
-  protobuf_media_2fMediaItem_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-MediaItem* MediaItem::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<MediaItem>(arena);
-}
-
-void MediaItem::Clear() {
-// @@protoc_insertion_point(message_clear_start:MediaItem)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) {
-    delete key_;
-  }
-  key_ = NULL;
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) {
-    delete type_;
-  }
-  type_ = NULL;
-  _internal_metadata_.Clear();
-}
-
-bool MediaItem::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:MediaItem)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .MediaKey key = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_key()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .MediaType type = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_type()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // string name = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_name()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->name().data(), static_cast<int>(this->name().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "MediaItem.name"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:MediaItem)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:MediaItem)
-  return false;
-#undef DO_
-}
-
-void MediaItem::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:MediaItem)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .MediaKey key = 1;
-  if (this->has_key()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->key_, output);
-  }
-
-  // .MediaType type = 2;
-  if (this->has_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->type_, output);
-  }
-
-  // string name = 3;
-  if (this->name().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->name().data(), static_cast<int>(this->name().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "MediaItem.name");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      3, this->name(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:MediaItem)
-}
-
-::google::protobuf::uint8* MediaItem::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:MediaItem)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .MediaKey key = 1;
-  if (this->has_key()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->key_, deterministic, target);
-  }
-
-  // .MediaType type = 2;
-  if (this->has_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->type_, deterministic, target);
-  }
-
-  // string name = 3;
-  if (this->name().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->name().data(), static_cast<int>(this->name().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "MediaItem.name");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->name(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:MediaItem)
-  return target;
-}
-
-size_t MediaItem::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:MediaItem)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // string name = 3;
-  if (this->name().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->name());
-  }
-
-  // .MediaKey key = 1;
-  if (this->has_key()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->key_);
-  }
-
-  // .MediaType type = 2;
-  if (this->has_type()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->type_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void MediaItem::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:MediaItem)
-  GOOGLE_DCHECK_NE(&from, this);
-  const MediaItem* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const MediaItem>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:MediaItem)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:MediaItem)
-    MergeFrom(*source);
-  }
-}
-
-void MediaItem::MergeFrom(const MediaItem& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:MediaItem)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.name().size() > 0) {
-    set_name(from.name());
-  }
-  if (from.has_key()) {
-    mutable_key()->::MediaKey::MergeFrom(from.key());
-  }
-  if (from.has_type()) {
-    mutable_type()->::MediaType::MergeFrom(from.type());
-  }
-}
-
-void MediaItem::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:MediaItem)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void MediaItem::CopyFrom(const MediaItem& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:MediaItem)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MediaItem::IsInitialized() const {
-  return true;
-}
-
-void MediaItem::Swap(MediaItem* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    MediaItem* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void MediaItem::UnsafeArenaSwap(MediaItem* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void MediaItem::InternalSwap(MediaItem* other) {
-  using std::swap;
-  name_.Swap(&other->name_);
-  swap(key_, other->key_);
-  swap(type_, other->type_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata MediaItem::GetMetadata() const {
-  protobuf_media_2fMediaItem_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaItem_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// MediaItem
-
-// .MediaKey key = 1;
-bool MediaItem::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-void MediaItem::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-const ::MediaKey& MediaItem::key() const {
-  const ::MediaKey* p = key_;
-  // @@protoc_insertion_point(field_get:MediaItem.key)
-  return p != NULL ? *p : *reinterpret_cast<const ::MediaKey*>(
-      &::_MediaKey_default_instance_);
-}
-::MediaKey* MediaItem::mutable_key() {
-  
-  if (key_ == NULL) {
-    _slow_mutable_key();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaItem.key)
-  return key_;
-}
-::MediaKey* MediaItem::release_key() {
-  // @@protoc_insertion_point(field_release:MediaItem.key)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_key();
-  } else {
-    ::MediaKey* temp = key_;
-    key_ = NULL;
-    return temp;
-  }
-}
- void MediaItem::set_allocated_key(::MediaKey* key) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete key_;
-  }
-  if (key != NULL) {
-    _slow_set_allocated_key(message_arena, &key);
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaItem.key)
-}
-
-// .MediaType type = 2;
-bool MediaItem::has_type() const {
-  return this != internal_default_instance() && type_ != NULL;
-}
-void MediaItem::clear_type() {
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) delete type_;
-  type_ = NULL;
-}
-const ::MediaType& MediaItem::type() const {
-  const ::MediaType* p = type_;
-  // @@protoc_insertion_point(field_get:MediaItem.type)
-  return p != NULL ? *p : *reinterpret_cast<const ::MediaType*>(
-      &::_MediaType_default_instance_);
-}
-::MediaType* MediaItem::mutable_type() {
-  
-  if (type_ == NULL) {
-    _slow_mutable_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaItem.type)
-  return type_;
-}
-::MediaType* MediaItem::release_type() {
-  // @@protoc_insertion_point(field_release:MediaItem.type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_type();
-  } else {
-    ::MediaType* temp = type_;
-    type_ = NULL;
-    return temp;
-  }
-}
- void MediaItem::set_allocated_type(::MediaType* type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete type_;
-  }
-  if (type != NULL) {
-    _slow_set_allocated_type(message_arena, &type);
-  }
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaItem.type)
-}
-
-// string name = 3;
-void MediaItem::clear_name() {
-  name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-const ::std::string& MediaItem::name() const {
-  // @@protoc_insertion_point(field_get:MediaItem.name)
-  return name_.Get();
-}
-void MediaItem::set_name(const ::std::string& value) {
-  
-  name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:MediaItem.name)
-}
-#if LANG_CXX11
-void MediaItem::set_name(::std::string&& value) {
-  
-  name_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:MediaItem.name)
-}
-#endif
-void MediaItem::set_name(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:MediaItem.name)
-}
-void MediaItem::set_name(const char* value,
-    size_t size) {
-  
-  name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:MediaItem.name)
-}
-::std::string* MediaItem::mutable_name() {
-  
-  // @@protoc_insertion_point(field_mutable:MediaItem.name)
-  return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* MediaItem::release_name() {
-  // @@protoc_insertion_point(field_release:MediaItem.name)
-  
-  return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* MediaItem::unsafe_arena_release_name() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaItem.name)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-void MediaItem::set_allocated_name(::std::string* name) {
-  if (name != NULL) {
-    
-  } else {
-    
-  }
-  name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:MediaItem.name)
-}
-void MediaItem::unsafe_arena_set_allocated_name(
-    ::std::string* name) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (name != NULL) {
-    
-  } else {
-    
-  }
-  name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      name, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaItem.name)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/media/MediaItem.pb.h b/languages/cpp/media/MediaItem.pb.h
deleted file mode 100644
index 74b343e..0000000
--- a/languages/cpp/media/MediaItem.pb.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-#ifndef PROTOBUF_media_2fMediaItem_2eproto__INCLUDED
-#define PROTOBUF_media_2fMediaItem_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "media/MediaKey.pb.h"
-#include "media/MediaType.pb.h"
-// @@protoc_insertion_point(includes)
-class MediaItem;
-class MediaItemDefaultTypeInternal;
-extern MediaItemDefaultTypeInternal _MediaItem_default_instance_;
-
-namespace protobuf_media_2fMediaItem_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_media_2fMediaItem_2eproto
-
-// ===================================================================
-
-class MediaItem : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:MediaItem) */ {
- public:
-  MediaItem();
-  virtual ~MediaItem();
-
-  MediaItem(const MediaItem& from);
-
-  inline MediaItem& operator=(const MediaItem& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  MediaItem(MediaItem&& from) noexcept
-    : MediaItem() {
-    *this = ::std::move(from);
-  }
-
-  inline MediaItem& operator=(MediaItem&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const MediaItem& default_instance();
-
-  static inline const MediaItem* internal_default_instance() {
-    return reinterpret_cast<const MediaItem*>(
-               &_MediaItem_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(MediaItem* other);
-  void Swap(MediaItem* other);
-  friend void swap(MediaItem& a, MediaItem& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline MediaItem* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  MediaItem* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const MediaItem& from);
-  void MergeFrom(const MediaItem& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(MediaItem* other);
-  protected:
-  explicit MediaItem(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // string name = 3;
-  void clear_name();
-  static const int kNameFieldNumber = 3;
-  const ::std::string& name() const;
-  void set_name(const ::std::string& value);
-  #if LANG_CXX11
-  void set_name(::std::string&& value);
-  #endif
-  void set_name(const char* value);
-  void set_name(const char* value, size_t size);
-  ::std::string* mutable_name();
-  ::std::string* release_name();
-  void set_allocated_name(::std::string* name);
-  ::std::string* unsafe_arena_release_name();
-  void unsafe_arena_set_allocated_name(
-      ::std::string* name);
-
-  // .MediaKey key = 1;
-  bool has_key() const;
-  void clear_key();
-  static const int kKeyFieldNumber = 1;
-  private:
-  void _slow_mutable_key();
-  void _slow_set_allocated_key(
-      ::google::protobuf::Arena* message_arena, ::MediaKey** key);
-  ::MediaKey* _slow_release_key();
-  public:
-  const ::MediaKey& key() const;
-  ::MediaKey* mutable_key();
-  ::MediaKey* release_key();
-  void set_allocated_key(::MediaKey* key);
-  ::MediaKey* unsafe_arena_release_key();
-  void unsafe_arena_set_allocated_key(
-      ::MediaKey* key);
-
-  // .MediaType type = 2;
-  bool has_type() const;
-  void clear_type();
-  static const int kTypeFieldNumber = 2;
-  private:
-  void _slow_mutable_type();
-  void _slow_set_allocated_type(
-      ::google::protobuf::Arena* message_arena, ::MediaType** type);
-  ::MediaType* _slow_release_type();
-  public:
-  const ::MediaType& type() const;
-  ::MediaType* mutable_type();
-  ::MediaType* release_type();
-  void set_allocated_type(::MediaType* type);
-  ::MediaType* unsafe_arena_release_type();
-  void unsafe_arena_set_allocated_type(
-      ::MediaType* type);
-
-  // @@protoc_insertion_point(class_scope:MediaItem)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::internal::ArenaStringPtr name_;
-  ::MediaKey* key_;
-  ::MediaType* type_;
-  mutable int _cached_size_;
-  friend struct protobuf_media_2fMediaItem_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// MediaItem
-
-// .MediaKey key = 1;
-inline bool MediaItem::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-inline void MediaItem::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-inline const ::MediaKey& MediaItem::key() const {
-  const ::MediaKey* p = key_;
-  // @@protoc_insertion_point(field_get:MediaItem.key)
-  return p != NULL ? *p : *reinterpret_cast<const ::MediaKey*>(
-      &::_MediaKey_default_instance_);
-}
-inline ::MediaKey* MediaItem::mutable_key() {
-  
-  if (key_ == NULL) {
-    _slow_mutable_key();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaItem.key)
-  return key_;
-}
-inline ::MediaKey* MediaItem::release_key() {
-  // @@protoc_insertion_point(field_release:MediaItem.key)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_key();
-  } else {
-    ::MediaKey* temp = key_;
-    key_ = NULL;
-    return temp;
-  }
-}
-inline  void MediaItem::set_allocated_key(::MediaKey* key) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete key_;
-  }
-  if (key != NULL) {
-    _slow_set_allocated_key(message_arena, &key);
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaItem.key)
-}
-
-// .MediaType type = 2;
-inline bool MediaItem::has_type() const {
-  return this != internal_default_instance() && type_ != NULL;
-}
-inline void MediaItem::clear_type() {
-  if (GetArenaNoVirtual() == NULL && type_ != NULL) delete type_;
-  type_ = NULL;
-}
-inline const ::MediaType& MediaItem::type() const {
-  const ::MediaType* p = type_;
-  // @@protoc_insertion_point(field_get:MediaItem.type)
-  return p != NULL ? *p : *reinterpret_cast<const ::MediaType*>(
-      &::_MediaType_default_instance_);
-}
-inline ::MediaType* MediaItem::mutable_type() {
-  
-  if (type_ == NULL) {
-    _slow_mutable_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaItem.type)
-  return type_;
-}
-inline ::MediaType* MediaItem::release_type() {
-  // @@protoc_insertion_point(field_release:MediaItem.type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_type();
-  } else {
-    ::MediaType* temp = type_;
-    type_ = NULL;
-    return temp;
-  }
-}
-inline  void MediaItem::set_allocated_type(::MediaType* type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete type_;
-  }
-  if (type != NULL) {
-    _slow_set_allocated_type(message_arena, &type);
-  }
-  type_ = type;
-  if (type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaItem.type)
-}
-
-// string name = 3;
-inline void MediaItem::clear_name() {
-  name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline const ::std::string& MediaItem::name() const {
-  // @@protoc_insertion_point(field_get:MediaItem.name)
-  return name_.Get();
-}
-inline void MediaItem::set_name(const ::std::string& value) {
-  
-  name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:MediaItem.name)
-}
-#if LANG_CXX11
-inline void MediaItem::set_name(::std::string&& value) {
-  
-  name_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:MediaItem.name)
-}
-#endif
-inline void MediaItem::set_name(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:MediaItem.name)
-}
-inline void MediaItem::set_name(const char* value,
-    size_t size) {
-  
-  name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:MediaItem.name)
-}
-inline ::std::string* MediaItem::mutable_name() {
-  
-  // @@protoc_insertion_point(field_mutable:MediaItem.name)
-  return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* MediaItem::release_name() {
-  // @@protoc_insertion_point(field_release:MediaItem.name)
-  
-  return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* MediaItem::unsafe_arena_release_name() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaItem.name)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-inline void MediaItem::set_allocated_name(::std::string* name) {
-  if (name != NULL) {
-    
-  } else {
-    
-  }
-  name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:MediaItem.name)
-}
-inline void MediaItem::unsafe_arena_set_allocated_name(
-    ::std::string* name) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (name != NULL) {
-    
-  } else {
-    
-  }
-  name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      name, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaItem.name)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_media_2fMediaItem_2eproto__INCLUDED
diff --git a/languages/cpp/media/MediaKey.pb.cc b/languages/cpp/media/MediaKey.pb.cc
deleted file mode 100644
index 05c16cb..0000000
--- a/languages/cpp/media/MediaKey.pb.cc
+++ /dev/null
@@ -1,493 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "media/MediaKey.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class MediaKeyDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<MediaKey>
-     _instance;
-} _MediaKey_default_instance_;
-
-namespace protobuf_media_2fMediaKey_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaKey, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaKey, id_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(MediaKey)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_MediaKey_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "media/MediaKey.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _MediaKey_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_MediaKey_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\024media/MediaKey.proto\"\026\n\010MediaKey\022\n\n\002id"
-      "\030\001 \001(\tB/\n\030io.bloombox.schema.mediaB\014Medi"
-      "aItemKeyH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 103);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "media/MediaKey.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_media_2fMediaKey_2eproto
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int MediaKey::kIdFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-MediaKey::MediaKey()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_media_2fMediaKey_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:MediaKey)
-}
-MediaKey::MediaKey(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_media_2fMediaKey_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:MediaKey)
-}
-MediaKey::MediaKey(const MediaKey& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.id().size() > 0) {
-    id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.id(),
-      GetArenaNoVirtual());
-  }
-  // @@protoc_insertion_point(copy_constructor:MediaKey)
-}
-
-void MediaKey::SharedCtor() {
-  id_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  _cached_size_ = 0;
-}
-
-MediaKey::~MediaKey() {
-  // @@protoc_insertion_point(destructor:MediaKey)
-  SharedDtor();
-}
-
-void MediaKey::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  id_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
-}
-
-void MediaKey::ArenaDtor(void* object) {
-  MediaKey* _this = reinterpret_cast< MediaKey* >(object);
-  (void)_this;
-}
-void MediaKey::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void MediaKey::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* MediaKey::descriptor() {
-  protobuf_media_2fMediaKey_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaKey_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const MediaKey& MediaKey::default_instance() {
-  protobuf_media_2fMediaKey_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-MediaKey* MediaKey::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<MediaKey>(arena);
-}
-
-void MediaKey::Clear() {
-// @@protoc_insertion_point(message_clear_start:MediaKey)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  id_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-  _internal_metadata_.Clear();
-}
-
-bool MediaKey::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:MediaKey)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // string id = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_id()));
-          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            this->id().data(), static_cast<int>(this->id().length()),
-            ::google::protobuf::internal::WireFormatLite::PARSE,
-            "MediaKey.id"));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:MediaKey)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:MediaKey)
-  return false;
-#undef DO_
-}
-
-void MediaKey::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:MediaKey)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string id = 1;
-  if (this->id().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->id().data(), static_cast<int>(this->id().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "MediaKey.id");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->id(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:MediaKey)
-}
-
-::google::protobuf::uint8* MediaKey::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:MediaKey)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string id = 1;
-  if (this->id().size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-      this->id().data(), static_cast<int>(this->id().length()),
-      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "MediaKey.id");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->id(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:MediaKey)
-  return target;
-}
-
-size_t MediaKey::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:MediaKey)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // string id = 1;
-  if (this->id().size() > 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::StringSize(
-        this->id());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void MediaKey::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:MediaKey)
-  GOOGLE_DCHECK_NE(&from, this);
-  const MediaKey* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const MediaKey>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:MediaKey)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:MediaKey)
-    MergeFrom(*source);
-  }
-}
-
-void MediaKey::MergeFrom(const MediaKey& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:MediaKey)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.id().size() > 0) {
-    set_id(from.id());
-  }
-}
-
-void MediaKey::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:MediaKey)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void MediaKey::CopyFrom(const MediaKey& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:MediaKey)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MediaKey::IsInitialized() const {
-  return true;
-}
-
-void MediaKey::Swap(MediaKey* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    MediaKey* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void MediaKey::UnsafeArenaSwap(MediaKey* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void MediaKey::InternalSwap(MediaKey* other) {
-  using std::swap;
-  id_.Swap(&other->id_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata MediaKey::GetMetadata() const {
-  protobuf_media_2fMediaKey_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaKey_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// MediaKey
-
-// string id = 1;
-void MediaKey::clear_id() {
-  id_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-const ::std::string& MediaKey::id() const {
-  // @@protoc_insertion_point(field_get:MediaKey.id)
-  return id_.Get();
-}
-void MediaKey::set_id(const ::std::string& value) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:MediaKey.id)
-}
-#if LANG_CXX11
-void MediaKey::set_id(::std::string&& value) {
-  
-  id_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:MediaKey.id)
-}
-#endif
-void MediaKey::set_id(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:MediaKey.id)
-}
-void MediaKey::set_id(const char* value,
-    size_t size) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:MediaKey.id)
-}
-::std::string* MediaKey::mutable_id() {
-  
-  // @@protoc_insertion_point(field_mutable:MediaKey.id)
-  return id_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* MediaKey::release_id() {
-  // @@protoc_insertion_point(field_release:MediaKey.id)
-  
-  return id_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-::std::string* MediaKey::unsafe_arena_release_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaKey.id)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return id_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-void MediaKey::set_allocated_id(::std::string* id) {
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:MediaKey.id)
-}
-void MediaKey::unsafe_arena_set_allocated_id(
-    ::std::string* id) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      id, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaKey.id)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/media/MediaKey.pb.h b/languages/cpp/media/MediaKey.pb.h
deleted file mode 100644
index f1f2282..0000000
--- a/languages/cpp/media/MediaKey.pb.h
+++ /dev/null
@@ -1,272 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-#ifndef PROTOBUF_media_2fMediaKey_2eproto__INCLUDED
-#define PROTOBUF_media_2fMediaKey_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class MediaKey;
-class MediaKeyDefaultTypeInternal;
-extern MediaKeyDefaultTypeInternal _MediaKey_default_instance_;
-
-namespace protobuf_media_2fMediaKey_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_media_2fMediaKey_2eproto
-
-// ===================================================================
-
-class MediaKey : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:MediaKey) */ {
- public:
-  MediaKey();
-  virtual ~MediaKey();
-
-  MediaKey(const MediaKey& from);
-
-  inline MediaKey& operator=(const MediaKey& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  MediaKey(MediaKey&& from) noexcept
-    : MediaKey() {
-    *this = ::std::move(from);
-  }
-
-  inline MediaKey& operator=(MediaKey&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const MediaKey& default_instance();
-
-  static inline const MediaKey* internal_default_instance() {
-    return reinterpret_cast<const MediaKey*>(
-               &_MediaKey_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(MediaKey* other);
-  void Swap(MediaKey* other);
-  friend void swap(MediaKey& a, MediaKey& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline MediaKey* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  MediaKey* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const MediaKey& from);
-  void MergeFrom(const MediaKey& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(MediaKey* other);
-  protected:
-  explicit MediaKey(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // string id = 1;
-  void clear_id();
-  static const int kIdFieldNumber = 1;
-  const ::std::string& id() const;
-  void set_id(const ::std::string& value);
-  #if LANG_CXX11
-  void set_id(::std::string&& value);
-  #endif
-  void set_id(const char* value);
-  void set_id(const char* value, size_t size);
-  ::std::string* mutable_id();
-  ::std::string* release_id();
-  void set_allocated_id(::std::string* id);
-  ::std::string* unsafe_arena_release_id();
-  void unsafe_arena_set_allocated_id(
-      ::std::string* id);
-
-  // @@protoc_insertion_point(class_scope:MediaKey)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::internal::ArenaStringPtr id_;
-  mutable int _cached_size_;
-  friend struct protobuf_media_2fMediaKey_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// MediaKey
-
-// string id = 1;
-inline void MediaKey::clear_id() {
-  id_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline const ::std::string& MediaKey::id() const {
-  // @@protoc_insertion_point(field_get:MediaKey.id)
-  return id_.Get();
-}
-inline void MediaKey::set_id(const ::std::string& value) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set:MediaKey.id)
-}
-#if LANG_CXX11
-inline void MediaKey::set_id(::std::string&& value) {
-  
-  id_.Set(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_rvalue:MediaKey.id)
-}
-#endif
-inline void MediaKey::set_id(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
-              GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_char:MediaKey.id)
-}
-inline void MediaKey::set_id(const char* value,
-    size_t size) {
-  
-  id_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
-      reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_pointer:MediaKey.id)
-}
-inline ::std::string* MediaKey::mutable_id() {
-  
-  // @@protoc_insertion_point(field_mutable:MediaKey.id)
-  return id_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* MediaKey::release_id() {
-  // @@protoc_insertion_point(field_release:MediaKey.id)
-  
-  return id_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
-}
-inline ::std::string* MediaKey::unsafe_arena_release_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaKey.id)
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  
-  return id_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      GetArenaNoVirtual());
-}
-inline void MediaKey::set_allocated_id(::std::string* id) {
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_set_allocated:MediaKey.id)
-}
-inline void MediaKey::unsafe_arena_set_allocated_id(
-    ::std::string* id) {
-  GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
-  if (id != NULL) {
-    
-  } else {
-    
-  }
-  id_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      id, GetArenaNoVirtual());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaKey.id)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_media_2fMediaKey_2eproto__INCLUDED
diff --git a/languages/cpp/media/MediaType.pb.cc b/languages/cpp/media/MediaType.pb.cc
deleted file mode 100644
index c9a85ae..0000000
--- a/languages/cpp/media/MediaType.pb.cc
+++ /dev/null
@@ -1,1937 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "media/MediaType.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class MediaTypeDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<MediaType>
-     _instance;
-} _MediaType_default_instance_;
-class ImageTypeDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ImageType>
-     _instance;
-} _ImageType_default_instance_;
-class DocumentTypeDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<DocumentType>
-     _instance;
-} _DocumentType_default_instance_;
-class VideoTypeDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<VideoType>
-     _instance;
-} _VideoType_default_instance_;
-
-namespace protobuf_media_2fMediaType_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[4];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[4];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaType, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaType, kind_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaType, image_type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaType, document_type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MediaType, video_type_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImageType, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImageType, kind_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentType, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentType, kind_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentType, compressed_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VideoType, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VideoType, kind_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(MediaType)},
-  { 9, -1, sizeof(ImageType)},
-  { 15, -1, sizeof(DocumentType)},
-  { 22, -1, sizeof(VideoType)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_MediaType_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ImageType_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_DocumentType_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_VideoType_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "media/MediaType.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 4);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _MediaType_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_MediaType_default_instance_);_ImageType_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ImageType_default_instance_);_DocumentType_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_DocumentType_default_instance_);_VideoType_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_VideoType_default_instance_);_MediaType_default_instance_._instance.get_mutable()->image_type_ = const_cast< ::ImageType*>(
-      ::ImageType::internal_default_instance());
-  _MediaType_default_instance_._instance.get_mutable()->document_type_ = const_cast< ::DocumentType*>(
-      ::DocumentType::internal_default_instance());
-  _MediaType_default_instance_._instance.get_mutable()->video_type_ = const_cast< ::VideoType*>(
-      ::VideoType::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\025media/MediaType.proto\"\310\001\n\tMediaType\022\035\n"
-      "\004kind\030\001 \001(\0162\017.MediaType.Kind\022\036\n\nimage_ty"
-      "pe\030e \001(\0132\n.ImageType\022%\n\rdocument_type\030\311\001"
-      " \001(\0132\r.DocumentType\022\037\n\nvideo_type\030\255\002 \001(\013"
-      "2\n.VideoType\"4\n\004Kind\022\010\n\004LINK\020\000\022\t\n\005IMAGE\020"
-      "\001\022\014\n\010DOCUMENT\020\002\022\t\n\005VIDEO\020\003\"j\n\tImageType\022"
-      "\"\n\004kind\030\001 \001(\0162\024.ImageType.ImageKind\"9\n\tI"
-      "mageKind\022\007\n\003PNG\020\000\022\007\n\003JPG\020\001\022\007\n\003GIF\020\002\022\007\n\003S"
-      "VG\020\003\022\010\n\004WEBP\020\004\"\206\001\n\014DocumentType\022(\n\004kind\030"
-      "\001 \001(\0162\032.DocumentType.DocumentKind\022\022\n\ncom"
-      "pressed\030\002 \001(\010\"8\n\014DocumentKind\022\007\n\003TXT\020\000\022\010"
-      "\n\004HTML\020\001\022\007\n\003PDF\020\002\022\014\n\010MARKDOWN\020\003\"W\n\tVideo"
-      "Type\022\"\n\004kind\030\001 \001(\0162\024.VideoType.VideoKind"
-      "\"&\n\tVideoKind\022\007\n\003MP4\020\000\022\007\n\003FLV\020\001\022\007\n\003HLS\020\002"
-      "B0\n\030io.bloombox.schema.mediaB\rMediaItemT"
-      "ypeH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 618);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "media/MediaType.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_media_2fMediaType_2eproto
-
-const ::google::protobuf::EnumDescriptor* MediaType_Kind_descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_enum_descriptors[0];
-}
-bool MediaType_Kind_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const MediaType_Kind MediaType::LINK;
-const MediaType_Kind MediaType::IMAGE;
-const MediaType_Kind MediaType::DOCUMENT;
-const MediaType_Kind MediaType::VIDEO;
-const MediaType_Kind MediaType::Kind_MIN;
-const MediaType_Kind MediaType::Kind_MAX;
-const int MediaType::Kind_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-const ::google::protobuf::EnumDescriptor* ImageType_ImageKind_descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_enum_descriptors[1];
-}
-bool ImageType_ImageKind_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const ImageType_ImageKind ImageType::PNG;
-const ImageType_ImageKind ImageType::JPG;
-const ImageType_ImageKind ImageType::GIF;
-const ImageType_ImageKind ImageType::SVG;
-const ImageType_ImageKind ImageType::WEBP;
-const ImageType_ImageKind ImageType::ImageKind_MIN;
-const ImageType_ImageKind ImageType::ImageKind_MAX;
-const int ImageType::ImageKind_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-const ::google::protobuf::EnumDescriptor* DocumentType_DocumentKind_descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_enum_descriptors[2];
-}
-bool DocumentType_DocumentKind_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const DocumentType_DocumentKind DocumentType::TXT;
-const DocumentType_DocumentKind DocumentType::HTML;
-const DocumentType_DocumentKind DocumentType::PDF;
-const DocumentType_DocumentKind DocumentType::MARKDOWN;
-const DocumentType_DocumentKind DocumentType::DocumentKind_MIN;
-const DocumentType_DocumentKind DocumentType::DocumentKind_MAX;
-const int DocumentType::DocumentKind_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-const ::google::protobuf::EnumDescriptor* VideoType_VideoKind_descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_enum_descriptors[3];
-}
-bool VideoType_VideoKind_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const VideoType_VideoKind VideoType::MP4;
-const VideoType_VideoKind VideoType::FLV;
-const VideoType_VideoKind VideoType::HLS;
-const VideoType_VideoKind VideoType::VideoKind_MIN;
-const VideoType_VideoKind VideoType::VideoKind_MAX;
-const int VideoType::VideoKind_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-// ===================================================================
-
-void MediaType::_slow_mutable_image_type() {
-  image_type_ = ::google::protobuf::Arena::CreateMessage< ::ImageType >(
-      GetArenaNoVirtual());
-}
-::ImageType* MediaType::_slow_release_image_type() {
-  if (image_type_ == NULL) {
-    return NULL;
-  } else {
-    ::ImageType* temp = new ::ImageType(*image_type_);
-    image_type_ = NULL;
-    return temp;
-  }
-}
-::ImageType* MediaType::unsafe_arena_release_image_type() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaType.image_type)
-  
-  ::ImageType* temp = image_type_;
-  image_type_ = NULL;
-  return temp;
-}
-void MediaType::_slow_set_allocated_image_type(
-    ::google::protobuf::Arena* message_arena, ::ImageType** image_type) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*image_type) == NULL) {
-      message_arena->Own(*image_type);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*image_type)) {
-      ::ImageType* new_image_type = 
-            ::google::protobuf::Arena::CreateMessage< ::ImageType >(
-            message_arena);
-      new_image_type->CopyFrom(**image_type);
-      *image_type = new_image_type;
-    }
-}
-void MediaType::unsafe_arena_set_allocated_image_type(
-    ::ImageType* image_type) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete image_type_;
-  }
-  image_type_ = image_type;
-  if (image_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaType.image_type)
-}
-void MediaType::_slow_mutable_document_type() {
-  document_type_ = ::google::protobuf::Arena::CreateMessage< ::DocumentType >(
-      GetArenaNoVirtual());
-}
-::DocumentType* MediaType::_slow_release_document_type() {
-  if (document_type_ == NULL) {
-    return NULL;
-  } else {
-    ::DocumentType* temp = new ::DocumentType(*document_type_);
-    document_type_ = NULL;
-    return temp;
-  }
-}
-::DocumentType* MediaType::unsafe_arena_release_document_type() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaType.document_type)
-  
-  ::DocumentType* temp = document_type_;
-  document_type_ = NULL;
-  return temp;
-}
-void MediaType::_slow_set_allocated_document_type(
-    ::google::protobuf::Arena* message_arena, ::DocumentType** document_type) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*document_type) == NULL) {
-      message_arena->Own(*document_type);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*document_type)) {
-      ::DocumentType* new_document_type = 
-            ::google::protobuf::Arena::CreateMessage< ::DocumentType >(
-            message_arena);
-      new_document_type->CopyFrom(**document_type);
-      *document_type = new_document_type;
-    }
-}
-void MediaType::unsafe_arena_set_allocated_document_type(
-    ::DocumentType* document_type) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete document_type_;
-  }
-  document_type_ = document_type;
-  if (document_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaType.document_type)
-}
-void MediaType::_slow_mutable_video_type() {
-  video_type_ = ::google::protobuf::Arena::CreateMessage< ::VideoType >(
-      GetArenaNoVirtual());
-}
-::VideoType* MediaType::_slow_release_video_type() {
-  if (video_type_ == NULL) {
-    return NULL;
-  } else {
-    ::VideoType* temp = new ::VideoType(*video_type_);
-    video_type_ = NULL;
-    return temp;
-  }
-}
-::VideoType* MediaType::unsafe_arena_release_video_type() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:MediaType.video_type)
-  
-  ::VideoType* temp = video_type_;
-  video_type_ = NULL;
-  return temp;
-}
-void MediaType::_slow_set_allocated_video_type(
-    ::google::protobuf::Arena* message_arena, ::VideoType** video_type) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*video_type) == NULL) {
-      message_arena->Own(*video_type);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*video_type)) {
-      ::VideoType* new_video_type = 
-            ::google::protobuf::Arena::CreateMessage< ::VideoType >(
-            message_arena);
-      new_video_type->CopyFrom(**video_type);
-      *video_type = new_video_type;
-    }
-}
-void MediaType::unsafe_arena_set_allocated_video_type(
-    ::VideoType* video_type) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete video_type_;
-  }
-  video_type_ = video_type;
-  if (video_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:MediaType.video_type)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int MediaType::kKindFieldNumber;
-const int MediaType::kImageTypeFieldNumber;
-const int MediaType::kDocumentTypeFieldNumber;
-const int MediaType::kVideoTypeFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-MediaType::MediaType()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_media_2fMediaType_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:MediaType)
-}
-MediaType::MediaType(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:MediaType)
-}
-MediaType::MediaType(const MediaType& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_image_type()) {
-    image_type_ = new ::ImageType(*from.image_type_);
-  } else {
-    image_type_ = NULL;
-  }
-  if (from.has_document_type()) {
-    document_type_ = new ::DocumentType(*from.document_type_);
-  } else {
-    document_type_ = NULL;
-  }
-  if (from.has_video_type()) {
-    video_type_ = new ::VideoType(*from.video_type_);
-  } else {
-    video_type_ = NULL;
-  }
-  kind_ = from.kind_;
-  // @@protoc_insertion_point(copy_constructor:MediaType)
-}
-
-void MediaType::SharedCtor() {
-  ::memset(&image_type_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&kind_) -
-      reinterpret_cast<char*>(&image_type_)) + sizeof(kind_));
-  _cached_size_ = 0;
-}
-
-MediaType::~MediaType() {
-  // @@protoc_insertion_point(destructor:MediaType)
-  SharedDtor();
-}
-
-void MediaType::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete image_type_;
-  if (this != internal_default_instance()) delete document_type_;
-  if (this != internal_default_instance()) delete video_type_;
-}
-
-void MediaType::ArenaDtor(void* object) {
-  MediaType* _this = reinterpret_cast< MediaType* >(object);
-  (void)_this;
-}
-void MediaType::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void MediaType::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* MediaType::descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const MediaType& MediaType::default_instance() {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-MediaType* MediaType::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<MediaType>(arena);
-}
-
-void MediaType::Clear() {
-// @@protoc_insertion_point(message_clear_start:MediaType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == NULL && image_type_ != NULL) {
-    delete image_type_;
-  }
-  image_type_ = NULL;
-  if (GetArenaNoVirtual() == NULL && document_type_ != NULL) {
-    delete document_type_;
-  }
-  document_type_ = NULL;
-  if (GetArenaNoVirtual() == NULL && video_type_ != NULL) {
-    delete video_type_;
-  }
-  video_type_ = NULL;
-  kind_ = 0;
-  _internal_metadata_.Clear();
-}
-
-bool MediaType::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:MediaType)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .MediaType.Kind kind = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_kind(static_cast< ::MediaType_Kind >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .ImageType image_type = 101;
-      case 101: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(42u /* 810 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_image_type()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .DocumentType document_type = 201;
-      case 201: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(74u /* 1610 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_document_type()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .VideoType video_type = 301;
-      case 301: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(106u /* 2410 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_video_type()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:MediaType)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:MediaType)
-  return false;
-#undef DO_
-}
-
-void MediaType::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:MediaType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .MediaType.Kind kind = 1;
-  if (this->kind() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->kind(), output);
-  }
-
-  // .ImageType image_type = 101;
-  if (this->has_image_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      101, *this->image_type_, output);
-  }
-
-  // .DocumentType document_type = 201;
-  if (this->has_document_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      201, *this->document_type_, output);
-  }
-
-  // .VideoType video_type = 301;
-  if (this->has_video_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      301, *this->video_type_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:MediaType)
-}
-
-::google::protobuf::uint8* MediaType::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:MediaType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .MediaType.Kind kind = 1;
-  if (this->kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->kind(), target);
-  }
-
-  // .ImageType image_type = 101;
-  if (this->has_image_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        101, *this->image_type_, deterministic, target);
-  }
-
-  // .DocumentType document_type = 201;
-  if (this->has_document_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        201, *this->document_type_, deterministic, target);
-  }
-
-  // .VideoType video_type = 301;
-  if (this->has_video_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        301, *this->video_type_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:MediaType)
-  return target;
-}
-
-size_t MediaType::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:MediaType)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .ImageType image_type = 101;
-  if (this->has_image_type()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->image_type_);
-  }
-
-  // .DocumentType document_type = 201;
-  if (this->has_document_type()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->document_type_);
-  }
-
-  // .VideoType video_type = 301;
-  if (this->has_video_type()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->video_type_);
-  }
-
-  // .MediaType.Kind kind = 1;
-  if (this->kind() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void MediaType::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:MediaType)
-  GOOGLE_DCHECK_NE(&from, this);
-  const MediaType* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const MediaType>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:MediaType)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:MediaType)
-    MergeFrom(*source);
-  }
-}
-
-void MediaType::MergeFrom(const MediaType& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:MediaType)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_image_type()) {
-    mutable_image_type()->::ImageType::MergeFrom(from.image_type());
-  }
-  if (from.has_document_type()) {
-    mutable_document_type()->::DocumentType::MergeFrom(from.document_type());
-  }
-  if (from.has_video_type()) {
-    mutable_video_type()->::VideoType::MergeFrom(from.video_type());
-  }
-  if (from.kind() != 0) {
-    set_kind(from.kind());
-  }
-}
-
-void MediaType::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:MediaType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void MediaType::CopyFrom(const MediaType& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:MediaType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MediaType::IsInitialized() const {
-  return true;
-}
-
-void MediaType::Swap(MediaType* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    MediaType* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void MediaType::UnsafeArenaSwap(MediaType* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void MediaType::InternalSwap(MediaType* other) {
-  using std::swap;
-  swap(image_type_, other->image_type_);
-  swap(document_type_, other->document_type_);
-  swap(video_type_, other->video_type_);
-  swap(kind_, other->kind_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata MediaType::GetMetadata() const {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// MediaType
-
-// .MediaType.Kind kind = 1;
-void MediaType::clear_kind() {
-  kind_ = 0;
-}
-::MediaType_Kind MediaType::kind() const {
-  // @@protoc_insertion_point(field_get:MediaType.kind)
-  return static_cast< ::MediaType_Kind >(kind_);
-}
-void MediaType::set_kind(::MediaType_Kind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:MediaType.kind)
-}
-
-// .ImageType image_type = 101;
-bool MediaType::has_image_type() const {
-  return this != internal_default_instance() && image_type_ != NULL;
-}
-void MediaType::clear_image_type() {
-  if (GetArenaNoVirtual() == NULL && image_type_ != NULL) delete image_type_;
-  image_type_ = NULL;
-}
-const ::ImageType& MediaType::image_type() const {
-  const ::ImageType* p = image_type_;
-  // @@protoc_insertion_point(field_get:MediaType.image_type)
-  return p != NULL ? *p : *reinterpret_cast<const ::ImageType*>(
-      &::_ImageType_default_instance_);
-}
-::ImageType* MediaType::mutable_image_type() {
-  
-  if (image_type_ == NULL) {
-    _slow_mutable_image_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaType.image_type)
-  return image_type_;
-}
-::ImageType* MediaType::release_image_type() {
-  // @@protoc_insertion_point(field_release:MediaType.image_type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_image_type();
-  } else {
-    ::ImageType* temp = image_type_;
-    image_type_ = NULL;
-    return temp;
-  }
-}
- void MediaType::set_allocated_image_type(::ImageType* image_type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete image_type_;
-  }
-  if (image_type != NULL) {
-    _slow_set_allocated_image_type(message_arena, &image_type);
-  }
-  image_type_ = image_type;
-  if (image_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaType.image_type)
-}
-
-// .DocumentType document_type = 201;
-bool MediaType::has_document_type() const {
-  return this != internal_default_instance() && document_type_ != NULL;
-}
-void MediaType::clear_document_type() {
-  if (GetArenaNoVirtual() == NULL && document_type_ != NULL) delete document_type_;
-  document_type_ = NULL;
-}
-const ::DocumentType& MediaType::document_type() const {
-  const ::DocumentType* p = document_type_;
-  // @@protoc_insertion_point(field_get:MediaType.document_type)
-  return p != NULL ? *p : *reinterpret_cast<const ::DocumentType*>(
-      &::_DocumentType_default_instance_);
-}
-::DocumentType* MediaType::mutable_document_type() {
-  
-  if (document_type_ == NULL) {
-    _slow_mutable_document_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaType.document_type)
-  return document_type_;
-}
-::DocumentType* MediaType::release_document_type() {
-  // @@protoc_insertion_point(field_release:MediaType.document_type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_document_type();
-  } else {
-    ::DocumentType* temp = document_type_;
-    document_type_ = NULL;
-    return temp;
-  }
-}
- void MediaType::set_allocated_document_type(::DocumentType* document_type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete document_type_;
-  }
-  if (document_type != NULL) {
-    _slow_set_allocated_document_type(message_arena, &document_type);
-  }
-  document_type_ = document_type;
-  if (document_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaType.document_type)
-}
-
-// .VideoType video_type = 301;
-bool MediaType::has_video_type() const {
-  return this != internal_default_instance() && video_type_ != NULL;
-}
-void MediaType::clear_video_type() {
-  if (GetArenaNoVirtual() == NULL && video_type_ != NULL) delete video_type_;
-  video_type_ = NULL;
-}
-const ::VideoType& MediaType::video_type() const {
-  const ::VideoType* p = video_type_;
-  // @@protoc_insertion_point(field_get:MediaType.video_type)
-  return p != NULL ? *p : *reinterpret_cast<const ::VideoType*>(
-      &::_VideoType_default_instance_);
-}
-::VideoType* MediaType::mutable_video_type() {
-  
-  if (video_type_ == NULL) {
-    _slow_mutable_video_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaType.video_type)
-  return video_type_;
-}
-::VideoType* MediaType::release_video_type() {
-  // @@protoc_insertion_point(field_release:MediaType.video_type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_video_type();
-  } else {
-    ::VideoType* temp = video_type_;
-    video_type_ = NULL;
-    return temp;
-  }
-}
- void MediaType::set_allocated_video_type(::VideoType* video_type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete video_type_;
-  }
-  if (video_type != NULL) {
-    _slow_set_allocated_video_type(message_arena, &video_type);
-  }
-  video_type_ = video_type;
-  if (video_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaType.video_type)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ImageType::kKindFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ImageType::ImageType()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_media_2fMediaType_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ImageType)
-}
-ImageType::ImageType(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ImageType)
-}
-ImageType::ImageType(const ImageType& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  kind_ = from.kind_;
-  // @@protoc_insertion_point(copy_constructor:ImageType)
-}
-
-void ImageType::SharedCtor() {
-  kind_ = 0;
-  _cached_size_ = 0;
-}
-
-ImageType::~ImageType() {
-  // @@protoc_insertion_point(destructor:ImageType)
-  SharedDtor();
-}
-
-void ImageType::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void ImageType::ArenaDtor(void* object) {
-  ImageType* _this = reinterpret_cast< ImageType* >(object);
-  (void)_this;
-}
-void ImageType::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ImageType::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ImageType::descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ImageType& ImageType::default_instance() {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ImageType* ImageType::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ImageType>(arena);
-}
-
-void ImageType::Clear() {
-// @@protoc_insertion_point(message_clear_start:ImageType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  kind_ = 0;
-  _internal_metadata_.Clear();
-}
-
-bool ImageType::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ImageType)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .ImageType.ImageKind kind = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_kind(static_cast< ::ImageType_ImageKind >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ImageType)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ImageType)
-  return false;
-#undef DO_
-}
-
-void ImageType::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ImageType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ImageType.ImageKind kind = 1;
-  if (this->kind() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->kind(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ImageType)
-}
-
-::google::protobuf::uint8* ImageType::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ImageType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ImageType.ImageKind kind = 1;
-  if (this->kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->kind(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ImageType)
-  return target;
-}
-
-size_t ImageType::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ImageType)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .ImageType.ImageKind kind = 1;
-  if (this->kind() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ImageType::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ImageType)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ImageType* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ImageType>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ImageType)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ImageType)
-    MergeFrom(*source);
-  }
-}
-
-void ImageType::MergeFrom(const ImageType& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ImageType)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.kind() != 0) {
-    set_kind(from.kind());
-  }
-}
-
-void ImageType::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ImageType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ImageType::CopyFrom(const ImageType& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ImageType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ImageType::IsInitialized() const {
-  return true;
-}
-
-void ImageType::Swap(ImageType* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ImageType* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ImageType::UnsafeArenaSwap(ImageType* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ImageType::InternalSwap(ImageType* other) {
-  using std::swap;
-  swap(kind_, other->kind_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ImageType::GetMetadata() const {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ImageType
-
-// .ImageType.ImageKind kind = 1;
-void ImageType::clear_kind() {
-  kind_ = 0;
-}
-::ImageType_ImageKind ImageType::kind() const {
-  // @@protoc_insertion_point(field_get:ImageType.kind)
-  return static_cast< ::ImageType_ImageKind >(kind_);
-}
-void ImageType::set_kind(::ImageType_ImageKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:ImageType.kind)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int DocumentType::kKindFieldNumber;
-const int DocumentType::kCompressedFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-DocumentType::DocumentType()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_media_2fMediaType_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:DocumentType)
-}
-DocumentType::DocumentType(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:DocumentType)
-}
-DocumentType::DocumentType(const DocumentType& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::memcpy(&kind_, &from.kind_,
-    static_cast<size_t>(reinterpret_cast<char*>(&compressed_) -
-    reinterpret_cast<char*>(&kind_)) + sizeof(compressed_));
-  // @@protoc_insertion_point(copy_constructor:DocumentType)
-}
-
-void DocumentType::SharedCtor() {
-  ::memset(&kind_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&compressed_) -
-      reinterpret_cast<char*>(&kind_)) + sizeof(compressed_));
-  _cached_size_ = 0;
-}
-
-DocumentType::~DocumentType() {
-  // @@protoc_insertion_point(destructor:DocumentType)
-  SharedDtor();
-}
-
-void DocumentType::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void DocumentType::ArenaDtor(void* object) {
-  DocumentType* _this = reinterpret_cast< DocumentType* >(object);
-  (void)_this;
-}
-void DocumentType::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void DocumentType::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* DocumentType::descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const DocumentType& DocumentType::default_instance() {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-DocumentType* DocumentType::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<DocumentType>(arena);
-}
-
-void DocumentType::Clear() {
-// @@protoc_insertion_point(message_clear_start:DocumentType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&kind_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&compressed_) -
-      reinterpret_cast<char*>(&kind_)) + sizeof(compressed_));
-  _internal_metadata_.Clear();
-}
-
-bool DocumentType::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:DocumentType)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .DocumentType.DocumentKind kind = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_kind(static_cast< ::DocumentType_DocumentKind >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool compressed = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &compressed_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:DocumentType)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:DocumentType)
-  return false;
-#undef DO_
-}
-
-void DocumentType::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:DocumentType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .DocumentType.DocumentKind kind = 1;
-  if (this->kind() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->kind(), output);
-  }
-
-  // bool compressed = 2;
-  if (this->compressed() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->compressed(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:DocumentType)
-}
-
-::google::protobuf::uint8* DocumentType::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:DocumentType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .DocumentType.DocumentKind kind = 1;
-  if (this->kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->kind(), target);
-  }
-
-  // bool compressed = 2;
-  if (this->compressed() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->compressed(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:DocumentType)
-  return target;
-}
-
-size_t DocumentType::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:DocumentType)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .DocumentType.DocumentKind kind = 1;
-  if (this->kind() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());
-  }
-
-  // bool compressed = 2;
-  if (this->compressed() != 0) {
-    total_size += 1 + 1;
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void DocumentType::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:DocumentType)
-  GOOGLE_DCHECK_NE(&from, this);
-  const DocumentType* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const DocumentType>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:DocumentType)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:DocumentType)
-    MergeFrom(*source);
-  }
-}
-
-void DocumentType::MergeFrom(const DocumentType& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:DocumentType)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.kind() != 0) {
-    set_kind(from.kind());
-  }
-  if (from.compressed() != 0) {
-    set_compressed(from.compressed());
-  }
-}
-
-void DocumentType::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:DocumentType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void DocumentType::CopyFrom(const DocumentType& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:DocumentType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool DocumentType::IsInitialized() const {
-  return true;
-}
-
-void DocumentType::Swap(DocumentType* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    DocumentType* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void DocumentType::UnsafeArenaSwap(DocumentType* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void DocumentType::InternalSwap(DocumentType* other) {
-  using std::swap;
-  swap(kind_, other->kind_);
-  swap(compressed_, other->compressed_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata DocumentType::GetMetadata() const {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// DocumentType
-
-// .DocumentType.DocumentKind kind = 1;
-void DocumentType::clear_kind() {
-  kind_ = 0;
-}
-::DocumentType_DocumentKind DocumentType::kind() const {
-  // @@protoc_insertion_point(field_get:DocumentType.kind)
-  return static_cast< ::DocumentType_DocumentKind >(kind_);
-}
-void DocumentType::set_kind(::DocumentType_DocumentKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:DocumentType.kind)
-}
-
-// bool compressed = 2;
-void DocumentType::clear_compressed() {
-  compressed_ = false;
-}
-bool DocumentType::compressed() const {
-  // @@protoc_insertion_point(field_get:DocumentType.compressed)
-  return compressed_;
-}
-void DocumentType::set_compressed(bool value) {
-  
-  compressed_ = value;
-  // @@protoc_insertion_point(field_set:DocumentType.compressed)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int VideoType::kKindFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-VideoType::VideoType()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_media_2fMediaType_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:VideoType)
-}
-VideoType::VideoType(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:VideoType)
-}
-VideoType::VideoType(const VideoType& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  kind_ = from.kind_;
-  // @@protoc_insertion_point(copy_constructor:VideoType)
-}
-
-void VideoType::SharedCtor() {
-  kind_ = 0;
-  _cached_size_ = 0;
-}
-
-VideoType::~VideoType() {
-  // @@protoc_insertion_point(destructor:VideoType)
-  SharedDtor();
-}
-
-void VideoType::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void VideoType::ArenaDtor(void* object) {
-  VideoType* _this = reinterpret_cast< VideoType* >(object);
-  (void)_this;
-}
-void VideoType::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void VideoType::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* VideoType::descriptor() {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const VideoType& VideoType::default_instance() {
-  protobuf_media_2fMediaType_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-VideoType* VideoType::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<VideoType>(arena);
-}
-
-void VideoType::Clear() {
-// @@protoc_insertion_point(message_clear_start:VideoType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  kind_ = 0;
-  _internal_metadata_.Clear();
-}
-
-bool VideoType::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:VideoType)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .VideoType.VideoKind kind = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_kind(static_cast< ::VideoType_VideoKind >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:VideoType)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:VideoType)
-  return false;
-#undef DO_
-}
-
-void VideoType::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:VideoType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .VideoType.VideoKind kind = 1;
-  if (this->kind() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->kind(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:VideoType)
-}
-
-::google::protobuf::uint8* VideoType::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:VideoType)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .VideoType.VideoKind kind = 1;
-  if (this->kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->kind(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:VideoType)
-  return target;
-}
-
-size_t VideoType::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:VideoType)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .VideoType.VideoKind kind = 1;
-  if (this->kind() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void VideoType::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:VideoType)
-  GOOGLE_DCHECK_NE(&from, this);
-  const VideoType* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const VideoType>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:VideoType)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:VideoType)
-    MergeFrom(*source);
-  }
-}
-
-void VideoType::MergeFrom(const VideoType& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:VideoType)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.kind() != 0) {
-    set_kind(from.kind());
-  }
-}
-
-void VideoType::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:VideoType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void VideoType::CopyFrom(const VideoType& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:VideoType)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool VideoType::IsInitialized() const {
-  return true;
-}
-
-void VideoType::Swap(VideoType* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    VideoType* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void VideoType::UnsafeArenaSwap(VideoType* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void VideoType::InternalSwap(VideoType* other) {
-  using std::swap;
-  swap(kind_, other->kind_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata VideoType::GetMetadata() const {
-  protobuf_media_2fMediaType_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_media_2fMediaType_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// VideoType
-
-// .VideoType.VideoKind kind = 1;
-void VideoType::clear_kind() {
-  kind_ = 0;
-}
-::VideoType_VideoKind VideoType::kind() const {
-  // @@protoc_insertion_point(field_get:VideoType.kind)
-  return static_cast< ::VideoType_VideoKind >(kind_);
-}
-void VideoType::set_kind(::VideoType_VideoKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:VideoType.kind)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/media/MediaType.pb.h b/languages/cpp/media/MediaType.pb.h
deleted file mode 100644
index 72ed00d..0000000
--- a/languages/cpp/media/MediaType.pb.h
+++ /dev/null
@@ -1,1073 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-#ifndef PROTOBUF_media_2fMediaType_2eproto__INCLUDED
-#define PROTOBUF_media_2fMediaType_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class DocumentType;
-class DocumentTypeDefaultTypeInternal;
-extern DocumentTypeDefaultTypeInternal _DocumentType_default_instance_;
-class ImageType;
-class ImageTypeDefaultTypeInternal;
-extern ImageTypeDefaultTypeInternal _ImageType_default_instance_;
-class MediaType;
-class MediaTypeDefaultTypeInternal;
-extern MediaTypeDefaultTypeInternal _MediaType_default_instance_;
-class VideoType;
-class VideoTypeDefaultTypeInternal;
-extern VideoTypeDefaultTypeInternal _VideoType_default_instance_;
-
-namespace protobuf_media_2fMediaType_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_media_2fMediaType_2eproto
-
-enum MediaType_Kind {
-  MediaType_Kind_LINK = 0,
-  MediaType_Kind_IMAGE = 1,
-  MediaType_Kind_DOCUMENT = 2,
-  MediaType_Kind_VIDEO = 3,
-  MediaType_Kind_MediaType_Kind_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  MediaType_Kind_MediaType_Kind_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool MediaType_Kind_IsValid(int value);
-const MediaType_Kind MediaType_Kind_Kind_MIN = MediaType_Kind_LINK;
-const MediaType_Kind MediaType_Kind_Kind_MAX = MediaType_Kind_VIDEO;
-const int MediaType_Kind_Kind_ARRAYSIZE = MediaType_Kind_Kind_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* MediaType_Kind_descriptor();
-inline const ::std::string& MediaType_Kind_Name(MediaType_Kind value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    MediaType_Kind_descriptor(), value);
-}
-inline bool MediaType_Kind_Parse(
-    const ::std::string& name, MediaType_Kind* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<MediaType_Kind>(
-    MediaType_Kind_descriptor(), name, value);
-}
-enum ImageType_ImageKind {
-  ImageType_ImageKind_PNG = 0,
-  ImageType_ImageKind_JPG = 1,
-  ImageType_ImageKind_GIF = 2,
-  ImageType_ImageKind_SVG = 3,
-  ImageType_ImageKind_WEBP = 4,
-  ImageType_ImageKind_ImageType_ImageKind_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  ImageType_ImageKind_ImageType_ImageKind_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool ImageType_ImageKind_IsValid(int value);
-const ImageType_ImageKind ImageType_ImageKind_ImageKind_MIN = ImageType_ImageKind_PNG;
-const ImageType_ImageKind ImageType_ImageKind_ImageKind_MAX = ImageType_ImageKind_WEBP;
-const int ImageType_ImageKind_ImageKind_ARRAYSIZE = ImageType_ImageKind_ImageKind_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* ImageType_ImageKind_descriptor();
-inline const ::std::string& ImageType_ImageKind_Name(ImageType_ImageKind value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    ImageType_ImageKind_descriptor(), value);
-}
-inline bool ImageType_ImageKind_Parse(
-    const ::std::string& name, ImageType_ImageKind* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ImageType_ImageKind>(
-    ImageType_ImageKind_descriptor(), name, value);
-}
-enum DocumentType_DocumentKind {
-  DocumentType_DocumentKind_TXT = 0,
-  DocumentType_DocumentKind_HTML = 1,
-  DocumentType_DocumentKind_PDF = 2,
-  DocumentType_DocumentKind_MARKDOWN = 3,
-  DocumentType_DocumentKind_DocumentType_DocumentKind_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  DocumentType_DocumentKind_DocumentType_DocumentKind_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool DocumentType_DocumentKind_IsValid(int value);
-const DocumentType_DocumentKind DocumentType_DocumentKind_DocumentKind_MIN = DocumentType_DocumentKind_TXT;
-const DocumentType_DocumentKind DocumentType_DocumentKind_DocumentKind_MAX = DocumentType_DocumentKind_MARKDOWN;
-const int DocumentType_DocumentKind_DocumentKind_ARRAYSIZE = DocumentType_DocumentKind_DocumentKind_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* DocumentType_DocumentKind_descriptor();
-inline const ::std::string& DocumentType_DocumentKind_Name(DocumentType_DocumentKind value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    DocumentType_DocumentKind_descriptor(), value);
-}
-inline bool DocumentType_DocumentKind_Parse(
-    const ::std::string& name, DocumentType_DocumentKind* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<DocumentType_DocumentKind>(
-    DocumentType_DocumentKind_descriptor(), name, value);
-}
-enum VideoType_VideoKind {
-  VideoType_VideoKind_MP4 = 0,
-  VideoType_VideoKind_FLV = 1,
-  VideoType_VideoKind_HLS = 2,
-  VideoType_VideoKind_VideoType_VideoKind_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  VideoType_VideoKind_VideoType_VideoKind_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool VideoType_VideoKind_IsValid(int value);
-const VideoType_VideoKind VideoType_VideoKind_VideoKind_MIN = VideoType_VideoKind_MP4;
-const VideoType_VideoKind VideoType_VideoKind_VideoKind_MAX = VideoType_VideoKind_HLS;
-const int VideoType_VideoKind_VideoKind_ARRAYSIZE = VideoType_VideoKind_VideoKind_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* VideoType_VideoKind_descriptor();
-inline const ::std::string& VideoType_VideoKind_Name(VideoType_VideoKind value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    VideoType_VideoKind_descriptor(), value);
-}
-inline bool VideoType_VideoKind_Parse(
-    const ::std::string& name, VideoType_VideoKind* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<VideoType_VideoKind>(
-    VideoType_VideoKind_descriptor(), name, value);
-}
-// ===================================================================
-
-class MediaType : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:MediaType) */ {
- public:
-  MediaType();
-  virtual ~MediaType();
-
-  MediaType(const MediaType& from);
-
-  inline MediaType& operator=(const MediaType& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  MediaType(MediaType&& from) noexcept
-    : MediaType() {
-    *this = ::std::move(from);
-  }
-
-  inline MediaType& operator=(MediaType&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const MediaType& default_instance();
-
-  static inline const MediaType* internal_default_instance() {
-    return reinterpret_cast<const MediaType*>(
-               &_MediaType_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(MediaType* other);
-  void Swap(MediaType* other);
-  friend void swap(MediaType& a, MediaType& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline MediaType* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  MediaType* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const MediaType& from);
-  void MergeFrom(const MediaType& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(MediaType* other);
-  protected:
-  explicit MediaType(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  typedef MediaType_Kind Kind;
-  static const Kind LINK =
-    MediaType_Kind_LINK;
-  static const Kind IMAGE =
-    MediaType_Kind_IMAGE;
-  static const Kind DOCUMENT =
-    MediaType_Kind_DOCUMENT;
-  static const Kind VIDEO =
-    MediaType_Kind_VIDEO;
-  static inline bool Kind_IsValid(int value) {
-    return MediaType_Kind_IsValid(value);
-  }
-  static const Kind Kind_MIN =
-    MediaType_Kind_Kind_MIN;
-  static const Kind Kind_MAX =
-    MediaType_Kind_Kind_MAX;
-  static const int Kind_ARRAYSIZE =
-    MediaType_Kind_Kind_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  Kind_descriptor() {
-    return MediaType_Kind_descriptor();
-  }
-  static inline const ::std::string& Kind_Name(Kind value) {
-    return MediaType_Kind_Name(value);
-  }
-  static inline bool Kind_Parse(const ::std::string& name,
-      Kind* value) {
-    return MediaType_Kind_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  // .ImageType image_type = 101;
-  bool has_image_type() const;
-  void clear_image_type();
-  static const int kImageTypeFieldNumber = 101;
-  private:
-  void _slow_mutable_image_type();
-  void _slow_set_allocated_image_type(
-      ::google::protobuf::Arena* message_arena, ::ImageType** image_type);
-  ::ImageType* _slow_release_image_type();
-  public:
-  const ::ImageType& image_type() const;
-  ::ImageType* mutable_image_type();
-  ::ImageType* release_image_type();
-  void set_allocated_image_type(::ImageType* image_type);
-  ::ImageType* unsafe_arena_release_image_type();
-  void unsafe_arena_set_allocated_image_type(
-      ::ImageType* image_type);
-
-  // .DocumentType document_type = 201;
-  bool has_document_type() const;
-  void clear_document_type();
-  static const int kDocumentTypeFieldNumber = 201;
-  private:
-  void _slow_mutable_document_type();
-  void _slow_set_allocated_document_type(
-      ::google::protobuf::Arena* message_arena, ::DocumentType** document_type);
-  ::DocumentType* _slow_release_document_type();
-  public:
-  const ::DocumentType& document_type() const;
-  ::DocumentType* mutable_document_type();
-  ::DocumentType* release_document_type();
-  void set_allocated_document_type(::DocumentType* document_type);
-  ::DocumentType* unsafe_arena_release_document_type();
-  void unsafe_arena_set_allocated_document_type(
-      ::DocumentType* document_type);
-
-  // .VideoType video_type = 301;
-  bool has_video_type() const;
-  void clear_video_type();
-  static const int kVideoTypeFieldNumber = 301;
-  private:
-  void _slow_mutable_video_type();
-  void _slow_set_allocated_video_type(
-      ::google::protobuf::Arena* message_arena, ::VideoType** video_type);
-  ::VideoType* _slow_release_video_type();
-  public:
-  const ::VideoType& video_type() const;
-  ::VideoType* mutable_video_type();
-  ::VideoType* release_video_type();
-  void set_allocated_video_type(::VideoType* video_type);
-  ::VideoType* unsafe_arena_release_video_type();
-  void unsafe_arena_set_allocated_video_type(
-      ::VideoType* video_type);
-
-  // .MediaType.Kind kind = 1;
-  void clear_kind();
-  static const int kKindFieldNumber = 1;
-  ::MediaType_Kind kind() const;
-  void set_kind(::MediaType_Kind value);
-
-  // @@protoc_insertion_point(class_scope:MediaType)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::ImageType* image_type_;
-  ::DocumentType* document_type_;
-  ::VideoType* video_type_;
-  int kind_;
-  mutable int _cached_size_;
-  friend struct protobuf_media_2fMediaType_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class ImageType : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ImageType) */ {
- public:
-  ImageType();
-  virtual ~ImageType();
-
-  ImageType(const ImageType& from);
-
-  inline ImageType& operator=(const ImageType& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ImageType(ImageType&& from) noexcept
-    : ImageType() {
-    *this = ::std::move(from);
-  }
-
-  inline ImageType& operator=(ImageType&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ImageType& default_instance();
-
-  static inline const ImageType* internal_default_instance() {
-    return reinterpret_cast<const ImageType*>(
-               &_ImageType_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    1;
-
-  void UnsafeArenaSwap(ImageType* other);
-  void Swap(ImageType* other);
-  friend void swap(ImageType& a, ImageType& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ImageType* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ImageType* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ImageType& from);
-  void MergeFrom(const ImageType& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ImageType* other);
-  protected:
-  explicit ImageType(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  typedef ImageType_ImageKind ImageKind;
-  static const ImageKind PNG =
-    ImageType_ImageKind_PNG;
-  static const ImageKind JPG =
-    ImageType_ImageKind_JPG;
-  static const ImageKind GIF =
-    ImageType_ImageKind_GIF;
-  static const ImageKind SVG =
-    ImageType_ImageKind_SVG;
-  static const ImageKind WEBP =
-    ImageType_ImageKind_WEBP;
-  static inline bool ImageKind_IsValid(int value) {
-    return ImageType_ImageKind_IsValid(value);
-  }
-  static const ImageKind ImageKind_MIN =
-    ImageType_ImageKind_ImageKind_MIN;
-  static const ImageKind ImageKind_MAX =
-    ImageType_ImageKind_ImageKind_MAX;
-  static const int ImageKind_ARRAYSIZE =
-    ImageType_ImageKind_ImageKind_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  ImageKind_descriptor() {
-    return ImageType_ImageKind_descriptor();
-  }
-  static inline const ::std::string& ImageKind_Name(ImageKind value) {
-    return ImageType_ImageKind_Name(value);
-  }
-  static inline bool ImageKind_Parse(const ::std::string& name,
-      ImageKind* value) {
-    return ImageType_ImageKind_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  // .ImageType.ImageKind kind = 1;
-  void clear_kind();
-  static const int kKindFieldNumber = 1;
-  ::ImageType_ImageKind kind() const;
-  void set_kind(::ImageType_ImageKind value);
-
-  // @@protoc_insertion_point(class_scope:ImageType)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  int kind_;
-  mutable int _cached_size_;
-  friend struct protobuf_media_2fMediaType_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class DocumentType : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:DocumentType) */ {
- public:
-  DocumentType();
-  virtual ~DocumentType();
-
-  DocumentType(const DocumentType& from);
-
-  inline DocumentType& operator=(const DocumentType& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  DocumentType(DocumentType&& from) noexcept
-    : DocumentType() {
-    *this = ::std::move(from);
-  }
-
-  inline DocumentType& operator=(DocumentType&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const DocumentType& default_instance();
-
-  static inline const DocumentType* internal_default_instance() {
-    return reinterpret_cast<const DocumentType*>(
-               &_DocumentType_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    2;
-
-  void UnsafeArenaSwap(DocumentType* other);
-  void Swap(DocumentType* other);
-  friend void swap(DocumentType& a, DocumentType& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline DocumentType* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  DocumentType* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const DocumentType& from);
-  void MergeFrom(const DocumentType& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(DocumentType* other);
-  protected:
-  explicit DocumentType(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  typedef DocumentType_DocumentKind DocumentKind;
-  static const DocumentKind TXT =
-    DocumentType_DocumentKind_TXT;
-  static const DocumentKind HTML =
-    DocumentType_DocumentKind_HTML;
-  static const DocumentKind PDF =
-    DocumentType_DocumentKind_PDF;
-  static const DocumentKind MARKDOWN =
-    DocumentType_DocumentKind_MARKDOWN;
-  static inline bool DocumentKind_IsValid(int value) {
-    return DocumentType_DocumentKind_IsValid(value);
-  }
-  static const DocumentKind DocumentKind_MIN =
-    DocumentType_DocumentKind_DocumentKind_MIN;
-  static const DocumentKind DocumentKind_MAX =
-    DocumentType_DocumentKind_DocumentKind_MAX;
-  static const int DocumentKind_ARRAYSIZE =
-    DocumentType_DocumentKind_DocumentKind_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  DocumentKind_descriptor() {
-    return DocumentType_DocumentKind_descriptor();
-  }
-  static inline const ::std::string& DocumentKind_Name(DocumentKind value) {
-    return DocumentType_DocumentKind_Name(value);
-  }
-  static inline bool DocumentKind_Parse(const ::std::string& name,
-      DocumentKind* value) {
-    return DocumentType_DocumentKind_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  // .DocumentType.DocumentKind kind = 1;
-  void clear_kind();
-  static const int kKindFieldNumber = 1;
-  ::DocumentType_DocumentKind kind() const;
-  void set_kind(::DocumentType_DocumentKind value);
-
-  // bool compressed = 2;
-  void clear_compressed();
-  static const int kCompressedFieldNumber = 2;
-  bool compressed() const;
-  void set_compressed(bool value);
-
-  // @@protoc_insertion_point(class_scope:DocumentType)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  int kind_;
-  bool compressed_;
-  mutable int _cached_size_;
-  friend struct protobuf_media_2fMediaType_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class VideoType : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:VideoType) */ {
- public:
-  VideoType();
-  virtual ~VideoType();
-
-  VideoType(const VideoType& from);
-
-  inline VideoType& operator=(const VideoType& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  VideoType(VideoType&& from) noexcept
-    : VideoType() {
-    *this = ::std::move(from);
-  }
-
-  inline VideoType& operator=(VideoType&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const VideoType& default_instance();
-
-  static inline const VideoType* internal_default_instance() {
-    return reinterpret_cast<const VideoType*>(
-               &_VideoType_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    3;
-
-  void UnsafeArenaSwap(VideoType* other);
-  void Swap(VideoType* other);
-  friend void swap(VideoType& a, VideoType& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline VideoType* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  VideoType* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const VideoType& from);
-  void MergeFrom(const VideoType& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(VideoType* other);
-  protected:
-  explicit VideoType(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  typedef VideoType_VideoKind VideoKind;
-  static const VideoKind MP4 =
-    VideoType_VideoKind_MP4;
-  static const VideoKind FLV =
-    VideoType_VideoKind_FLV;
-  static const VideoKind HLS =
-    VideoType_VideoKind_HLS;
-  static inline bool VideoKind_IsValid(int value) {
-    return VideoType_VideoKind_IsValid(value);
-  }
-  static const VideoKind VideoKind_MIN =
-    VideoType_VideoKind_VideoKind_MIN;
-  static const VideoKind VideoKind_MAX =
-    VideoType_VideoKind_VideoKind_MAX;
-  static const int VideoKind_ARRAYSIZE =
-    VideoType_VideoKind_VideoKind_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  VideoKind_descriptor() {
-    return VideoType_VideoKind_descriptor();
-  }
-  static inline const ::std::string& VideoKind_Name(VideoKind value) {
-    return VideoType_VideoKind_Name(value);
-  }
-  static inline bool VideoKind_Parse(const ::std::string& name,
-      VideoKind* value) {
-    return VideoType_VideoKind_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  // .VideoType.VideoKind kind = 1;
-  void clear_kind();
-  static const int kKindFieldNumber = 1;
-  ::VideoType_VideoKind kind() const;
-  void set_kind(::VideoType_VideoKind value);
-
-  // @@protoc_insertion_point(class_scope:VideoType)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  int kind_;
-  mutable int _cached_size_;
-  friend struct protobuf_media_2fMediaType_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// MediaType
-
-// .MediaType.Kind kind = 1;
-inline void MediaType::clear_kind() {
-  kind_ = 0;
-}
-inline ::MediaType_Kind MediaType::kind() const {
-  // @@protoc_insertion_point(field_get:MediaType.kind)
-  return static_cast< ::MediaType_Kind >(kind_);
-}
-inline void MediaType::set_kind(::MediaType_Kind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:MediaType.kind)
-}
-
-// .ImageType image_type = 101;
-inline bool MediaType::has_image_type() const {
-  return this != internal_default_instance() && image_type_ != NULL;
-}
-inline void MediaType::clear_image_type() {
-  if (GetArenaNoVirtual() == NULL && image_type_ != NULL) delete image_type_;
-  image_type_ = NULL;
-}
-inline const ::ImageType& MediaType::image_type() const {
-  const ::ImageType* p = image_type_;
-  // @@protoc_insertion_point(field_get:MediaType.image_type)
-  return p != NULL ? *p : *reinterpret_cast<const ::ImageType*>(
-      &::_ImageType_default_instance_);
-}
-inline ::ImageType* MediaType::mutable_image_type() {
-  
-  if (image_type_ == NULL) {
-    _slow_mutable_image_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaType.image_type)
-  return image_type_;
-}
-inline ::ImageType* MediaType::release_image_type() {
-  // @@protoc_insertion_point(field_release:MediaType.image_type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_image_type();
-  } else {
-    ::ImageType* temp = image_type_;
-    image_type_ = NULL;
-    return temp;
-  }
-}
-inline  void MediaType::set_allocated_image_type(::ImageType* image_type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete image_type_;
-  }
-  if (image_type != NULL) {
-    _slow_set_allocated_image_type(message_arena, &image_type);
-  }
-  image_type_ = image_type;
-  if (image_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaType.image_type)
-}
-
-// .DocumentType document_type = 201;
-inline bool MediaType::has_document_type() const {
-  return this != internal_default_instance() && document_type_ != NULL;
-}
-inline void MediaType::clear_document_type() {
-  if (GetArenaNoVirtual() == NULL && document_type_ != NULL) delete document_type_;
-  document_type_ = NULL;
-}
-inline const ::DocumentType& MediaType::document_type() const {
-  const ::DocumentType* p = document_type_;
-  // @@protoc_insertion_point(field_get:MediaType.document_type)
-  return p != NULL ? *p : *reinterpret_cast<const ::DocumentType*>(
-      &::_DocumentType_default_instance_);
-}
-inline ::DocumentType* MediaType::mutable_document_type() {
-  
-  if (document_type_ == NULL) {
-    _slow_mutable_document_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaType.document_type)
-  return document_type_;
-}
-inline ::DocumentType* MediaType::release_document_type() {
-  // @@protoc_insertion_point(field_release:MediaType.document_type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_document_type();
-  } else {
-    ::DocumentType* temp = document_type_;
-    document_type_ = NULL;
-    return temp;
-  }
-}
-inline  void MediaType::set_allocated_document_type(::DocumentType* document_type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete document_type_;
-  }
-  if (document_type != NULL) {
-    _slow_set_allocated_document_type(message_arena, &document_type);
-  }
-  document_type_ = document_type;
-  if (document_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaType.document_type)
-}
-
-// .VideoType video_type = 301;
-inline bool MediaType::has_video_type() const {
-  return this != internal_default_instance() && video_type_ != NULL;
-}
-inline void MediaType::clear_video_type() {
-  if (GetArenaNoVirtual() == NULL && video_type_ != NULL) delete video_type_;
-  video_type_ = NULL;
-}
-inline const ::VideoType& MediaType::video_type() const {
-  const ::VideoType* p = video_type_;
-  // @@protoc_insertion_point(field_get:MediaType.video_type)
-  return p != NULL ? *p : *reinterpret_cast<const ::VideoType*>(
-      &::_VideoType_default_instance_);
-}
-inline ::VideoType* MediaType::mutable_video_type() {
-  
-  if (video_type_ == NULL) {
-    _slow_mutable_video_type();
-  }
-  // @@protoc_insertion_point(field_mutable:MediaType.video_type)
-  return video_type_;
-}
-inline ::VideoType* MediaType::release_video_type() {
-  // @@protoc_insertion_point(field_release:MediaType.video_type)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_video_type();
-  } else {
-    ::VideoType* temp = video_type_;
-    video_type_ = NULL;
-    return temp;
-  }
-}
-inline  void MediaType::set_allocated_video_type(::VideoType* video_type) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete video_type_;
-  }
-  if (video_type != NULL) {
-    _slow_set_allocated_video_type(message_arena, &video_type);
-  }
-  video_type_ = video_type;
-  if (video_type) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:MediaType.video_type)
-}
-
-// -------------------------------------------------------------------
-
-// ImageType
-
-// .ImageType.ImageKind kind = 1;
-inline void ImageType::clear_kind() {
-  kind_ = 0;
-}
-inline ::ImageType_ImageKind ImageType::kind() const {
-  // @@protoc_insertion_point(field_get:ImageType.kind)
-  return static_cast< ::ImageType_ImageKind >(kind_);
-}
-inline void ImageType::set_kind(::ImageType_ImageKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:ImageType.kind)
-}
-
-// -------------------------------------------------------------------
-
-// DocumentType
-
-// .DocumentType.DocumentKind kind = 1;
-inline void DocumentType::clear_kind() {
-  kind_ = 0;
-}
-inline ::DocumentType_DocumentKind DocumentType::kind() const {
-  // @@protoc_insertion_point(field_get:DocumentType.kind)
-  return static_cast< ::DocumentType_DocumentKind >(kind_);
-}
-inline void DocumentType::set_kind(::DocumentType_DocumentKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:DocumentType.kind)
-}
-
-// bool compressed = 2;
-inline void DocumentType::clear_compressed() {
-  compressed_ = false;
-}
-inline bool DocumentType::compressed() const {
-  // @@protoc_insertion_point(field_get:DocumentType.compressed)
-  return compressed_;
-}
-inline void DocumentType::set_compressed(bool value) {
-  
-  compressed_ = value;
-  // @@protoc_insertion_point(field_set:DocumentType.compressed)
-}
-
-// -------------------------------------------------------------------
-
-// VideoType
-
-// .VideoType.VideoKind kind = 1;
-inline void VideoType::clear_kind() {
-  kind_ = 0;
-}
-inline ::VideoType_VideoKind VideoType::kind() const {
-  // @@protoc_insertion_point(field_get:VideoType.kind)
-  return static_cast< ::VideoType_VideoKind >(kind_);
-}
-inline void VideoType::set_kind(::VideoType_VideoKind value) {
-  
-  kind_ = value;
-  // @@protoc_insertion_point(field_set:VideoType.kind)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::MediaType_Kind> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::MediaType_Kind>() {
-  return ::MediaType_Kind_descriptor();
-}
-template <> struct is_proto_enum< ::ImageType_ImageKind> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::ImageType_ImageKind>() {
-  return ::ImageType_ImageKind_descriptor();
-}
-template <> struct is_proto_enum< ::DocumentType_DocumentKind> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::DocumentType_DocumentKind>() {
-  return ::DocumentType_DocumentKind_descriptor();
-}
-template <> struct is_proto_enum< ::VideoType_VideoKind> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::VideoType_VideoKind>() {
-  return ::VideoType_VideoKind_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_media_2fMediaType_2eproto__INCLUDED
diff --git a/languages/cpp/products/Flower.pb.cc b/languages/cpp/products/Flower.pb.cc
deleted file mode 100644
index 225df91..0000000
--- a/languages/cpp/products/Flower.pb.cc
+++ /dev/null
@@ -1,1116 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "products/Flower.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class FlowerDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Flower>
-     _instance;
-} _Flower_default_instance_;
-
-namespace protobuf_products_2fFlower_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Flower, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Flower, key_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Flower, product_data_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Flower, material_data_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Flower, flags_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Flower, pricing_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Flower)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Flower_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "products/Flower.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_base_2fProductKey_2eproto::InitDefaults();
-  ::protobuf_content_2fMaterialsData_2eproto::InitDefaults();
-  ::protobuf_content_2fProductContent_2eproto::InitDefaults();
-  ::protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  ::protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  _Flower_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Flower_default_instance_);_Flower_default_instance_._instance.get_mutable()->key_ = const_cast< ::ProductKey*>(
-      ::ProductKey::internal_default_instance());
-  _Flower_default_instance_._instance.get_mutable()->product_data_ = const_cast< ::ProductContent*>(
-      ::ProductContent::internal_default_instance());
-  _Flower_default_instance_._instance.get_mutable()->material_data_ = const_cast< ::MaterialsData*>(
-      ::MaterialsData::internal_default_instance());
-  _Flower_default_instance_._instance.get_mutable()->flags_ = const_cast< ::FlagsDescriptor*>(
-      ::FlagsDescriptor::internal_default_instance());
-  _Flower_default_instance_._instance.get_mutable()->pricing_ = const_cast< ::ProductPricing*>(
-      ::ProductPricing::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\025products/Flower.proto\032\025base/ProductKey"
-      ".proto\032\033content/MaterialsData.proto\032\034con"
-      "tent/ProductContent.proto\032\035structs/Flags"
-      "Descriptor.proto\032\'structs/pricing/Pricin"
-      "gDescriptor.proto\"\263\001\n\006Flower\022\030\n\003key\030\001 \001("
-      "\0132\013.ProductKey\022%\n\014product_data\030\024 \001(\0132\017.P"
-      "roductContent\022%\n\rmaterial_data\030\025 \001(\0132\016.M"
-      "aterialsData\022\037\n\005flags\030\026 \001(\0132\020.FlagsDescr"
-      "iptor\022 \n\007pricing\030\027 \001(\0132\017.ProductPricingB"
-      "2\n\032io.bloombox.schema.productB\rFlowerPro"
-      "ductH\001P\000\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 419);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "products/Flower.proto", &protobuf_RegisterTypes);
-  ::protobuf_base_2fProductKey_2eproto::AddDescriptors();
-  ::protobuf_content_2fMaterialsData_2eproto::AddDescriptors();
-  ::protobuf_content_2fProductContent_2eproto::AddDescriptors();
-  ::protobuf_structs_2fFlagsDescriptor_2eproto::AddDescriptors();
-  ::protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_products_2fFlower_2eproto
-
-
-// ===================================================================
-
-void Flower::_slow_mutable_key() {
-  key_ = ::google::protobuf::Arena::CreateMessage< ::ProductKey >(
-      GetArenaNoVirtual());
-}
-::ProductKey* Flower::_slow_release_key() {
-  if (key_ == NULL) {
-    return NULL;
-  } else {
-    ::ProductKey* temp = new ::ProductKey(*key_);
-    key_ = NULL;
-    return temp;
-  }
-}
-::ProductKey* Flower::unsafe_arena_release_key() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Flower.key)
-  
-  ::ProductKey* temp = key_;
-  key_ = NULL;
-  return temp;
-}
-void Flower::_slow_set_allocated_key(
-    ::google::protobuf::Arena* message_arena, ::ProductKey** key) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*key) == NULL) {
-      message_arena->Own(*key);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*key)) {
-      ::ProductKey* new_key = 
-            ::google::protobuf::Arena::CreateMessage< ::ProductKey >(
-            message_arena);
-      new_key->CopyFrom(**key);
-      *key = new_key;
-    }
-}
-void Flower::unsafe_arena_set_allocated_key(
-    ::ProductKey* key) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete key_;
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Flower.key)
-}
-void Flower::_slow_mutable_product_data() {
-  product_data_ = ::google::protobuf::Arena::CreateMessage< ::ProductContent >(
-      GetArenaNoVirtual());
-}
-::ProductContent* Flower::_slow_release_product_data() {
-  if (product_data_ == NULL) {
-    return NULL;
-  } else {
-    ::ProductContent* temp = new ::ProductContent(*product_data_);
-    product_data_ = NULL;
-    return temp;
-  }
-}
-::ProductContent* Flower::unsafe_arena_release_product_data() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Flower.product_data)
-  
-  ::ProductContent* temp = product_data_;
-  product_data_ = NULL;
-  return temp;
-}
-void Flower::_slow_set_allocated_product_data(
-    ::google::protobuf::Arena* message_arena, ::ProductContent** product_data) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*product_data) == NULL) {
-      message_arena->Own(*product_data);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*product_data)) {
-      ::ProductContent* new_product_data = 
-            ::google::protobuf::Arena::CreateMessage< ::ProductContent >(
-            message_arena);
-      new_product_data->CopyFrom(**product_data);
-      *product_data = new_product_data;
-    }
-}
-void Flower::unsafe_arena_set_allocated_product_data(
-    ::ProductContent* product_data) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete product_data_;
-  }
-  product_data_ = product_data;
-  if (product_data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Flower.product_data)
-}
-void Flower::_slow_mutable_material_data() {
-  material_data_ = ::google::protobuf::Arena::CreateMessage< ::MaterialsData >(
-      GetArenaNoVirtual());
-}
-::MaterialsData* Flower::_slow_release_material_data() {
-  if (material_data_ == NULL) {
-    return NULL;
-  } else {
-    ::MaterialsData* temp = new ::MaterialsData(*material_data_);
-    material_data_ = NULL;
-    return temp;
-  }
-}
-::MaterialsData* Flower::unsafe_arena_release_material_data() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Flower.material_data)
-  
-  ::MaterialsData* temp = material_data_;
-  material_data_ = NULL;
-  return temp;
-}
-void Flower::_slow_set_allocated_material_data(
-    ::google::protobuf::Arena* message_arena, ::MaterialsData** material_data) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*material_data) == NULL) {
-      message_arena->Own(*material_data);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*material_data)) {
-      ::MaterialsData* new_material_data = 
-            ::google::protobuf::Arena::CreateMessage< ::MaterialsData >(
-            message_arena);
-      new_material_data->CopyFrom(**material_data);
-      *material_data = new_material_data;
-    }
-}
-void Flower::unsafe_arena_set_allocated_material_data(
-    ::MaterialsData* material_data) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete material_data_;
-  }
-  material_data_ = material_data;
-  if (material_data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Flower.material_data)
-}
-void Flower::_slow_mutable_flags() {
-  flags_ = ::google::protobuf::Arena::CreateMessage< ::FlagsDescriptor >(
-      GetArenaNoVirtual());
-}
-::FlagsDescriptor* Flower::_slow_release_flags() {
-  if (flags_ == NULL) {
-    return NULL;
-  } else {
-    ::FlagsDescriptor* temp = new ::FlagsDescriptor(*flags_);
-    flags_ = NULL;
-    return temp;
-  }
-}
-::FlagsDescriptor* Flower::unsafe_arena_release_flags() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Flower.flags)
-  
-  ::FlagsDescriptor* temp = flags_;
-  flags_ = NULL;
-  return temp;
-}
-void Flower::_slow_set_allocated_flags(
-    ::google::protobuf::Arena* message_arena, ::FlagsDescriptor** flags) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*flags) == NULL) {
-      message_arena->Own(*flags);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*flags)) {
-      ::FlagsDescriptor* new_flags = 
-            ::google::protobuf::Arena::CreateMessage< ::FlagsDescriptor >(
-            message_arena);
-      new_flags->CopyFrom(**flags);
-      *flags = new_flags;
-    }
-}
-void Flower::unsafe_arena_set_allocated_flags(
-    ::FlagsDescriptor* flags) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete flags_;
-  }
-  flags_ = flags;
-  if (flags) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Flower.flags)
-}
-void Flower::_slow_mutable_pricing() {
-  pricing_ = ::google::protobuf::Arena::CreateMessage< ::ProductPricing >(
-      GetArenaNoVirtual());
-}
-::ProductPricing* Flower::_slow_release_pricing() {
-  if (pricing_ == NULL) {
-    return NULL;
-  } else {
-    ::ProductPricing* temp = new ::ProductPricing(*pricing_);
-    pricing_ = NULL;
-    return temp;
-  }
-}
-::ProductPricing* Flower::unsafe_arena_release_pricing() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Flower.pricing)
-  
-  ::ProductPricing* temp = pricing_;
-  pricing_ = NULL;
-  return temp;
-}
-void Flower::_slow_set_allocated_pricing(
-    ::google::protobuf::Arena* message_arena, ::ProductPricing** pricing) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*pricing) == NULL) {
-      message_arena->Own(*pricing);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*pricing)) {
-      ::ProductPricing* new_pricing = 
-            ::google::protobuf::Arena::CreateMessage< ::ProductPricing >(
-            message_arena);
-      new_pricing->CopyFrom(**pricing);
-      *pricing = new_pricing;
-    }
-}
-void Flower::unsafe_arena_set_allocated_pricing(
-    ::ProductPricing* pricing) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete pricing_;
-  }
-  pricing_ = pricing;
-  if (pricing) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Flower.pricing)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Flower::kKeyFieldNumber;
-const int Flower::kProductDataFieldNumber;
-const int Flower::kMaterialDataFieldNumber;
-const int Flower::kFlagsFieldNumber;
-const int Flower::kPricingFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Flower::Flower()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_products_2fFlower_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Flower)
-}
-Flower::Flower(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_products_2fFlower_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Flower)
-}
-Flower::Flower(const Flower& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_key()) {
-    key_ = new ::ProductKey(*from.key_);
-  } else {
-    key_ = NULL;
-  }
-  if (from.has_product_data()) {
-    product_data_ = new ::ProductContent(*from.product_data_);
-  } else {
-    product_data_ = NULL;
-  }
-  if (from.has_material_data()) {
-    material_data_ = new ::MaterialsData(*from.material_data_);
-  } else {
-    material_data_ = NULL;
-  }
-  if (from.has_flags()) {
-    flags_ = new ::FlagsDescriptor(*from.flags_);
-  } else {
-    flags_ = NULL;
-  }
-  if (from.has_pricing()) {
-    pricing_ = new ::ProductPricing(*from.pricing_);
-  } else {
-    pricing_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:Flower)
-}
-
-void Flower::SharedCtor() {
-  ::memset(&key_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&pricing_) -
-      reinterpret_cast<char*>(&key_)) + sizeof(pricing_));
-  _cached_size_ = 0;
-}
-
-Flower::~Flower() {
-  // @@protoc_insertion_point(destructor:Flower)
-  SharedDtor();
-}
-
-void Flower::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete key_;
-  if (this != internal_default_instance()) delete product_data_;
-  if (this != internal_default_instance()) delete material_data_;
-  if (this != internal_default_instance()) delete flags_;
-  if (this != internal_default_instance()) delete pricing_;
-}
-
-void Flower::ArenaDtor(void* object) {
-  Flower* _this = reinterpret_cast< Flower* >(object);
-  (void)_this;
-}
-void Flower::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Flower::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Flower::descriptor() {
-  protobuf_products_2fFlower_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_products_2fFlower_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Flower& Flower::default_instance() {
-  protobuf_products_2fFlower_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Flower* Flower::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Flower>(arena);
-}
-
-void Flower::Clear() {
-// @@protoc_insertion_point(message_clear_start:Flower)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) {
-    delete key_;
-  }
-  key_ = NULL;
-  if (GetArenaNoVirtual() == NULL && product_data_ != NULL) {
-    delete product_data_;
-  }
-  product_data_ = NULL;
-  if (GetArenaNoVirtual() == NULL && material_data_ != NULL) {
-    delete material_data_;
-  }
-  material_data_ = NULL;
-  if (GetArenaNoVirtual() == NULL && flags_ != NULL) {
-    delete flags_;
-  }
-  flags_ = NULL;
-  if (GetArenaNoVirtual() == NULL && pricing_ != NULL) {
-    delete pricing_;
-  }
-  pricing_ = NULL;
-  _internal_metadata_.Clear();
-}
-
-bool Flower::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Flower)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .ProductKey key = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_key()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .ProductContent product_data = 20;
-      case 20: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(162u /* 162 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_product_data()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .MaterialsData material_data = 21;
-      case 21: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(170u /* 170 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_material_data()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .FlagsDescriptor flags = 22;
-      case 22: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(178u /* 178 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_flags()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .ProductPricing pricing = 23;
-      case 23: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(186u /* 186 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_pricing()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Flower)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Flower)
-  return false;
-#undef DO_
-}
-
-void Flower::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Flower)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->key_, output);
-  }
-
-  // .ProductContent product_data = 20;
-  if (this->has_product_data()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, *this->product_data_, output);
-  }
-
-  // .MaterialsData material_data = 21;
-  if (this->has_material_data()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      21, *this->material_data_, output);
-  }
-
-  // .FlagsDescriptor flags = 22;
-  if (this->has_flags()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      22, *this->flags_, output);
-  }
-
-  // .ProductPricing pricing = 23;
-  if (this->has_pricing()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      23, *this->pricing_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Flower)
-}
-
-::google::protobuf::uint8* Flower::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Flower)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->key_, deterministic, target);
-  }
-
-  // .ProductContent product_data = 20;
-  if (this->has_product_data()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        20, *this->product_data_, deterministic, target);
-  }
-
-  // .MaterialsData material_data = 21;
-  if (this->has_material_data()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        21, *this->material_data_, deterministic, target);
-  }
-
-  // .FlagsDescriptor flags = 22;
-  if (this->has_flags()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        22, *this->flags_, deterministic, target);
-  }
-
-  // .ProductPricing pricing = 23;
-  if (this->has_pricing()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        23, *this->pricing_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Flower)
-  return target;
-}
-
-size_t Flower::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Flower)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .ProductKey key = 1;
-  if (this->has_key()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->key_);
-  }
-
-  // .ProductContent product_data = 20;
-  if (this->has_product_data()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->product_data_);
-  }
-
-  // .MaterialsData material_data = 21;
-  if (this->has_material_data()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->material_data_);
-  }
-
-  // .FlagsDescriptor flags = 22;
-  if (this->has_flags()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->flags_);
-  }
-
-  // .ProductPricing pricing = 23;
-  if (this->has_pricing()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->pricing_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Flower::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Flower)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Flower* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Flower>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Flower)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Flower)
-    MergeFrom(*source);
-  }
-}
-
-void Flower::MergeFrom(const Flower& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Flower)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_key()) {
-    mutable_key()->::ProductKey::MergeFrom(from.key());
-  }
-  if (from.has_product_data()) {
-    mutable_product_data()->::ProductContent::MergeFrom(from.product_data());
-  }
-  if (from.has_material_data()) {
-    mutable_material_data()->::MaterialsData::MergeFrom(from.material_data());
-  }
-  if (from.has_flags()) {
-    mutable_flags()->::FlagsDescriptor::MergeFrom(from.flags());
-  }
-  if (from.has_pricing()) {
-    mutable_pricing()->::ProductPricing::MergeFrom(from.pricing());
-  }
-}
-
-void Flower::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Flower)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Flower::CopyFrom(const Flower& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Flower)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Flower::IsInitialized() const {
-  return true;
-}
-
-void Flower::Swap(Flower* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Flower* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Flower::UnsafeArenaSwap(Flower* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Flower::InternalSwap(Flower* other) {
-  using std::swap;
-  swap(key_, other->key_);
-  swap(product_data_, other->product_data_);
-  swap(material_data_, other->material_data_);
-  swap(flags_, other->flags_);
-  swap(pricing_, other->pricing_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Flower::GetMetadata() const {
-  protobuf_products_2fFlower_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_products_2fFlower_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Flower
-
-// .ProductKey key = 1;
-bool Flower::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-void Flower::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-const ::ProductKey& Flower::key() const {
-  const ::ProductKey* p = key_;
-  // @@protoc_insertion_point(field_get:Flower.key)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductKey*>(
-      &::_ProductKey_default_instance_);
-}
-::ProductKey* Flower::mutable_key() {
-  
-  if (key_ == NULL) {
-    _slow_mutable_key();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.key)
-  return key_;
-}
-::ProductKey* Flower::release_key() {
-  // @@protoc_insertion_point(field_release:Flower.key)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_key();
-  } else {
-    ::ProductKey* temp = key_;
-    key_ = NULL;
-    return temp;
-  }
-}
- void Flower::set_allocated_key(::ProductKey* key) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete key_;
-  }
-  if (key != NULL) {
-    _slow_set_allocated_key(message_arena, &key);
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.key)
-}
-
-// .ProductContent product_data = 20;
-bool Flower::has_product_data() const {
-  return this != internal_default_instance() && product_data_ != NULL;
-}
-void Flower::clear_product_data() {
-  if (GetArenaNoVirtual() == NULL && product_data_ != NULL) delete product_data_;
-  product_data_ = NULL;
-}
-const ::ProductContent& Flower::product_data() const {
-  const ::ProductContent* p = product_data_;
-  // @@protoc_insertion_point(field_get:Flower.product_data)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductContent*>(
-      &::_ProductContent_default_instance_);
-}
-::ProductContent* Flower::mutable_product_data() {
-  
-  if (product_data_ == NULL) {
-    _slow_mutable_product_data();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.product_data)
-  return product_data_;
-}
-::ProductContent* Flower::release_product_data() {
-  // @@protoc_insertion_point(field_release:Flower.product_data)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_product_data();
-  } else {
-    ::ProductContent* temp = product_data_;
-    product_data_ = NULL;
-    return temp;
-  }
-}
- void Flower::set_allocated_product_data(::ProductContent* product_data) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete product_data_;
-  }
-  if (product_data != NULL) {
-    _slow_set_allocated_product_data(message_arena, &product_data);
-  }
-  product_data_ = product_data;
-  if (product_data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.product_data)
-}
-
-// .MaterialsData material_data = 21;
-bool Flower::has_material_data() const {
-  return this != internal_default_instance() && material_data_ != NULL;
-}
-void Flower::clear_material_data() {
-  if (GetArenaNoVirtual() == NULL && material_data_ != NULL) delete material_data_;
-  material_data_ = NULL;
-}
-const ::MaterialsData& Flower::material_data() const {
-  const ::MaterialsData* p = material_data_;
-  // @@protoc_insertion_point(field_get:Flower.material_data)
-  return p != NULL ? *p : *reinterpret_cast<const ::MaterialsData*>(
-      &::_MaterialsData_default_instance_);
-}
-::MaterialsData* Flower::mutable_material_data() {
-  
-  if (material_data_ == NULL) {
-    _slow_mutable_material_data();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.material_data)
-  return material_data_;
-}
-::MaterialsData* Flower::release_material_data() {
-  // @@protoc_insertion_point(field_release:Flower.material_data)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_material_data();
-  } else {
-    ::MaterialsData* temp = material_data_;
-    material_data_ = NULL;
-    return temp;
-  }
-}
- void Flower::set_allocated_material_data(::MaterialsData* material_data) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete material_data_;
-  }
-  if (material_data != NULL) {
-    _slow_set_allocated_material_data(message_arena, &material_data);
-  }
-  material_data_ = material_data;
-  if (material_data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.material_data)
-}
-
-// .FlagsDescriptor flags = 22;
-bool Flower::has_flags() const {
-  return this != internal_default_instance() && flags_ != NULL;
-}
-void Flower::clear_flags() {
-  if (GetArenaNoVirtual() == NULL && flags_ != NULL) delete flags_;
-  flags_ = NULL;
-}
-const ::FlagsDescriptor& Flower::flags() const {
-  const ::FlagsDescriptor* p = flags_;
-  // @@protoc_insertion_point(field_get:Flower.flags)
-  return p != NULL ? *p : *reinterpret_cast<const ::FlagsDescriptor*>(
-      &::_FlagsDescriptor_default_instance_);
-}
-::FlagsDescriptor* Flower::mutable_flags() {
-  
-  if (flags_ == NULL) {
-    _slow_mutable_flags();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.flags)
-  return flags_;
-}
-::FlagsDescriptor* Flower::release_flags() {
-  // @@protoc_insertion_point(field_release:Flower.flags)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_flags();
-  } else {
-    ::FlagsDescriptor* temp = flags_;
-    flags_ = NULL;
-    return temp;
-  }
-}
- void Flower::set_allocated_flags(::FlagsDescriptor* flags) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete flags_;
-  }
-  if (flags != NULL) {
-    _slow_set_allocated_flags(message_arena, &flags);
-  }
-  flags_ = flags;
-  if (flags) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.flags)
-}
-
-// .ProductPricing pricing = 23;
-bool Flower::has_pricing() const {
-  return this != internal_default_instance() && pricing_ != NULL;
-}
-void Flower::clear_pricing() {
-  if (GetArenaNoVirtual() == NULL && pricing_ != NULL) delete pricing_;
-  pricing_ = NULL;
-}
-const ::ProductPricing& Flower::pricing() const {
-  const ::ProductPricing* p = pricing_;
-  // @@protoc_insertion_point(field_get:Flower.pricing)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductPricing*>(
-      &::_ProductPricing_default_instance_);
-}
-::ProductPricing* Flower::mutable_pricing() {
-  
-  if (pricing_ == NULL) {
-    _slow_mutable_pricing();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.pricing)
-  return pricing_;
-}
-::ProductPricing* Flower::release_pricing() {
-  // @@protoc_insertion_point(field_release:Flower.pricing)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_pricing();
-  } else {
-    ::ProductPricing* temp = pricing_;
-    pricing_ = NULL;
-    return temp;
-  }
-}
- void Flower::set_allocated_pricing(::ProductPricing* pricing) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete pricing_;
-  }
-  if (pricing != NULL) {
-    _slow_set_allocated_pricing(message_arena, &pricing);
-  }
-  pricing_ = pricing;
-  if (pricing) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.pricing)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/products/Flower.pb.h b/languages/cpp/products/Flower.pb.h
deleted file mode 100644
index 67651cc..0000000
--- a/languages/cpp/products/Flower.pb.h
+++ /dev/null
@@ -1,529 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-
-#ifndef PROTOBUF_products_2fFlower_2eproto__INCLUDED
-#define PROTOBUF_products_2fFlower_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "base/ProductKey.pb.h"
-#include "content/MaterialsData.pb.h"
-#include "content/ProductContent.pb.h"
-#include "structs/FlagsDescriptor.pb.h"
-#include "structs/pricing/PricingDescriptor.pb.h"
-// @@protoc_insertion_point(includes)
-class Flower;
-class FlowerDefaultTypeInternal;
-extern FlowerDefaultTypeInternal _Flower_default_instance_;
-
-namespace protobuf_products_2fFlower_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_products_2fFlower_2eproto
-
-// ===================================================================
-
-class Flower : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Flower) */ {
- public:
-  Flower();
-  virtual ~Flower();
-
-  Flower(const Flower& from);
-
-  inline Flower& operator=(const Flower& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Flower(Flower&& from) noexcept
-    : Flower() {
-    *this = ::std::move(from);
-  }
-
-  inline Flower& operator=(Flower&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Flower& default_instance();
-
-  static inline const Flower* internal_default_instance() {
-    return reinterpret_cast<const Flower*>(
-               &_Flower_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Flower* other);
-  void Swap(Flower* other);
-  friend void swap(Flower& a, Flower& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Flower* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Flower* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Flower& from);
-  void MergeFrom(const Flower& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Flower* other);
-  protected:
-  explicit Flower(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .ProductKey key = 1;
-  bool has_key() const;
-  void clear_key();
-  static const int kKeyFieldNumber = 1;
-  private:
-  void _slow_mutable_key();
-  void _slow_set_allocated_key(
-      ::google::protobuf::Arena* message_arena, ::ProductKey** key);
-  ::ProductKey* _slow_release_key();
-  public:
-  const ::ProductKey& key() const;
-  ::ProductKey* mutable_key();
-  ::ProductKey* release_key();
-  void set_allocated_key(::ProductKey* key);
-  ::ProductKey* unsafe_arena_release_key();
-  void unsafe_arena_set_allocated_key(
-      ::ProductKey* key);
-
-  // .ProductContent product_data = 20;
-  bool has_product_data() const;
-  void clear_product_data();
-  static const int kProductDataFieldNumber = 20;
-  private:
-  void _slow_mutable_product_data();
-  void _slow_set_allocated_product_data(
-      ::google::protobuf::Arena* message_arena, ::ProductContent** product_data);
-  ::ProductContent* _slow_release_product_data();
-  public:
-  const ::ProductContent& product_data() const;
-  ::ProductContent* mutable_product_data();
-  ::ProductContent* release_product_data();
-  void set_allocated_product_data(::ProductContent* product_data);
-  ::ProductContent* unsafe_arena_release_product_data();
-  void unsafe_arena_set_allocated_product_data(
-      ::ProductContent* product_data);
-
-  // .MaterialsData material_data = 21;
-  bool has_material_data() const;
-  void clear_material_data();
-  static const int kMaterialDataFieldNumber = 21;
-  private:
-  void _slow_mutable_material_data();
-  void _slow_set_allocated_material_data(
-      ::google::protobuf::Arena* message_arena, ::MaterialsData** material_data);
-  ::MaterialsData* _slow_release_material_data();
-  public:
-  const ::MaterialsData& material_data() const;
-  ::MaterialsData* mutable_material_data();
-  ::MaterialsData* release_material_data();
-  void set_allocated_material_data(::MaterialsData* material_data);
-  ::MaterialsData* unsafe_arena_release_material_data();
-  void unsafe_arena_set_allocated_material_data(
-      ::MaterialsData* material_data);
-
-  // .FlagsDescriptor flags = 22;
-  bool has_flags() const;
-  void clear_flags();
-  static const int kFlagsFieldNumber = 22;
-  private:
-  void _slow_mutable_flags();
-  void _slow_set_allocated_flags(
-      ::google::protobuf::Arena* message_arena, ::FlagsDescriptor** flags);
-  ::FlagsDescriptor* _slow_release_flags();
-  public:
-  const ::FlagsDescriptor& flags() const;
-  ::FlagsDescriptor* mutable_flags();
-  ::FlagsDescriptor* release_flags();
-  void set_allocated_flags(::FlagsDescriptor* flags);
-  ::FlagsDescriptor* unsafe_arena_release_flags();
-  void unsafe_arena_set_allocated_flags(
-      ::FlagsDescriptor* flags);
-
-  // .ProductPricing pricing = 23;
-  bool has_pricing() const;
-  void clear_pricing();
-  static const int kPricingFieldNumber = 23;
-  private:
-  void _slow_mutable_pricing();
-  void _slow_set_allocated_pricing(
-      ::google::protobuf::Arena* message_arena, ::ProductPricing** pricing);
-  ::ProductPricing* _slow_release_pricing();
-  public:
-  const ::ProductPricing& pricing() const;
-  ::ProductPricing* mutable_pricing();
-  ::ProductPricing* release_pricing();
-  void set_allocated_pricing(::ProductPricing* pricing);
-  ::ProductPricing* unsafe_arena_release_pricing();
-  void unsafe_arena_set_allocated_pricing(
-      ::ProductPricing* pricing);
-
-  // @@protoc_insertion_point(class_scope:Flower)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::ProductKey* key_;
-  ::ProductContent* product_data_;
-  ::MaterialsData* material_data_;
-  ::FlagsDescriptor* flags_;
-  ::ProductPricing* pricing_;
-  mutable int _cached_size_;
-  friend struct protobuf_products_2fFlower_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Flower
-
-// .ProductKey key = 1;
-inline bool Flower::has_key() const {
-  return this != internal_default_instance() && key_ != NULL;
-}
-inline void Flower::clear_key() {
-  if (GetArenaNoVirtual() == NULL && key_ != NULL) delete key_;
-  key_ = NULL;
-}
-inline const ::ProductKey& Flower::key() const {
-  const ::ProductKey* p = key_;
-  // @@protoc_insertion_point(field_get:Flower.key)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductKey*>(
-      &::_ProductKey_default_instance_);
-}
-inline ::ProductKey* Flower::mutable_key() {
-  
-  if (key_ == NULL) {
-    _slow_mutable_key();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.key)
-  return key_;
-}
-inline ::ProductKey* Flower::release_key() {
-  // @@protoc_insertion_point(field_release:Flower.key)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_key();
-  } else {
-    ::ProductKey* temp = key_;
-    key_ = NULL;
-    return temp;
-  }
-}
-inline  void Flower::set_allocated_key(::ProductKey* key) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete key_;
-  }
-  if (key != NULL) {
-    _slow_set_allocated_key(message_arena, &key);
-  }
-  key_ = key;
-  if (key) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.key)
-}
-
-// .ProductContent product_data = 20;
-inline bool Flower::has_product_data() const {
-  return this != internal_default_instance() && product_data_ != NULL;
-}
-inline void Flower::clear_product_data() {
-  if (GetArenaNoVirtual() == NULL && product_data_ != NULL) delete product_data_;
-  product_data_ = NULL;
-}
-inline const ::ProductContent& Flower::product_data() const {
-  const ::ProductContent* p = product_data_;
-  // @@protoc_insertion_point(field_get:Flower.product_data)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductContent*>(
-      &::_ProductContent_default_instance_);
-}
-inline ::ProductContent* Flower::mutable_product_data() {
-  
-  if (product_data_ == NULL) {
-    _slow_mutable_product_data();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.product_data)
-  return product_data_;
-}
-inline ::ProductContent* Flower::release_product_data() {
-  // @@protoc_insertion_point(field_release:Flower.product_data)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_product_data();
-  } else {
-    ::ProductContent* temp = product_data_;
-    product_data_ = NULL;
-    return temp;
-  }
-}
-inline  void Flower::set_allocated_product_data(::ProductContent* product_data) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete product_data_;
-  }
-  if (product_data != NULL) {
-    _slow_set_allocated_product_data(message_arena, &product_data);
-  }
-  product_data_ = product_data;
-  if (product_data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.product_data)
-}
-
-// .MaterialsData material_data = 21;
-inline bool Flower::has_material_data() const {
-  return this != internal_default_instance() && material_data_ != NULL;
-}
-inline void Flower::clear_material_data() {
-  if (GetArenaNoVirtual() == NULL && material_data_ != NULL) delete material_data_;
-  material_data_ = NULL;
-}
-inline const ::MaterialsData& Flower::material_data() const {
-  const ::MaterialsData* p = material_data_;
-  // @@protoc_insertion_point(field_get:Flower.material_data)
-  return p != NULL ? *p : *reinterpret_cast<const ::MaterialsData*>(
-      &::_MaterialsData_default_instance_);
-}
-inline ::MaterialsData* Flower::mutable_material_data() {
-  
-  if (material_data_ == NULL) {
-    _slow_mutable_material_data();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.material_data)
-  return material_data_;
-}
-inline ::MaterialsData* Flower::release_material_data() {
-  // @@protoc_insertion_point(field_release:Flower.material_data)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_material_data();
-  } else {
-    ::MaterialsData* temp = material_data_;
-    material_data_ = NULL;
-    return temp;
-  }
-}
-inline  void Flower::set_allocated_material_data(::MaterialsData* material_data) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete material_data_;
-  }
-  if (material_data != NULL) {
-    _slow_set_allocated_material_data(message_arena, &material_data);
-  }
-  material_data_ = material_data;
-  if (material_data) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.material_data)
-}
-
-// .FlagsDescriptor flags = 22;
-inline bool Flower::has_flags() const {
-  return this != internal_default_instance() && flags_ != NULL;
-}
-inline void Flower::clear_flags() {
-  if (GetArenaNoVirtual() == NULL && flags_ != NULL) delete flags_;
-  flags_ = NULL;
-}
-inline const ::FlagsDescriptor& Flower::flags() const {
-  const ::FlagsDescriptor* p = flags_;
-  // @@protoc_insertion_point(field_get:Flower.flags)
-  return p != NULL ? *p : *reinterpret_cast<const ::FlagsDescriptor*>(
-      &::_FlagsDescriptor_default_instance_);
-}
-inline ::FlagsDescriptor* Flower::mutable_flags() {
-  
-  if (flags_ == NULL) {
-    _slow_mutable_flags();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.flags)
-  return flags_;
-}
-inline ::FlagsDescriptor* Flower::release_flags() {
-  // @@protoc_insertion_point(field_release:Flower.flags)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_flags();
-  } else {
-    ::FlagsDescriptor* temp = flags_;
-    flags_ = NULL;
-    return temp;
-  }
-}
-inline  void Flower::set_allocated_flags(::FlagsDescriptor* flags) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete flags_;
-  }
-  if (flags != NULL) {
-    _slow_set_allocated_flags(message_arena, &flags);
-  }
-  flags_ = flags;
-  if (flags) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.flags)
-}
-
-// .ProductPricing pricing = 23;
-inline bool Flower::has_pricing() const {
-  return this != internal_default_instance() && pricing_ != NULL;
-}
-inline void Flower::clear_pricing() {
-  if (GetArenaNoVirtual() == NULL && pricing_ != NULL) delete pricing_;
-  pricing_ = NULL;
-}
-inline const ::ProductPricing& Flower::pricing() const {
-  const ::ProductPricing* p = pricing_;
-  // @@protoc_insertion_point(field_get:Flower.pricing)
-  return p != NULL ? *p : *reinterpret_cast<const ::ProductPricing*>(
-      &::_ProductPricing_default_instance_);
-}
-inline ::ProductPricing* Flower::mutable_pricing() {
-  
-  if (pricing_ == NULL) {
-    _slow_mutable_pricing();
-  }
-  // @@protoc_insertion_point(field_mutable:Flower.pricing)
-  return pricing_;
-}
-inline ::ProductPricing* Flower::release_pricing() {
-  // @@protoc_insertion_point(field_release:Flower.pricing)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_pricing();
-  } else {
-    ::ProductPricing* temp = pricing_;
-    pricing_ = NULL;
-    return temp;
-  }
-}
-inline  void Flower::set_allocated_pricing(::ProductPricing* pricing) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete pricing_;
-  }
-  if (pricing != NULL) {
-    _slow_set_allocated_pricing(message_arena, &pricing);
-  }
-  pricing_ = pricing;
-  if (pricing) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Flower.pricing)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_products_2fFlower_2eproto__INCLUDED
diff --git a/languages/cpp/structs/FlagsDescriptor.pb.cc b/languages/cpp/structs/FlagsDescriptor.pb.cc
deleted file mode 100644
index 4d2eb6e..0000000
--- a/languages/cpp/structs/FlagsDescriptor.pb.cc
+++ /dev/null
@@ -1,1320 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "structs/FlagsDescriptor.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class ProductFlagValueDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ProductFlagValue>
-     _instance;
-} _ProductFlagValue_default_instance_;
-class ProductFlagsetDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ProductFlagset>
-     _instance;
-} _ProductFlagset_default_instance_;
-class FlagsDescriptorDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<FlagsDescriptor>
-     _instance;
-} _FlagsDescriptor_default_instance_;
-
-namespace protobuf_structs_2fFlagsDescriptor_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[3];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductFlagValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductFlagValue, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductFlagValue, value_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductFlagset, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductFlagset, flags_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FlagsDescriptor, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FlagsDescriptor, visible_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FlagsDescriptor, premium_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FlagsDescriptor, featured_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FlagsDescriptor, lastchance_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FlagsDescriptor, inhouse_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(ProductFlagValue)},
-  { 7, -1, sizeof(ProductFlagset)},
-  { 13, -1, sizeof(FlagsDescriptor)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ProductFlagValue_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ProductFlagset_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_FlagsDescriptor_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "structs/FlagsDescriptor.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 3);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _ProductFlagValue_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ProductFlagValue_default_instance_);_ProductFlagset_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ProductFlagset_default_instance_);_FlagsDescriptor_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_FlagsDescriptor_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\035structs/FlagsDescriptor.proto\"=\n\020Produ"
-      "ctFlagValue\022\032\n\004type\030\001 \001(\0162\014.ProductFlag\022"
-      "\r\n\005value\030\002 \001(\010\"2\n\016ProductFlagset\022 \n\005flag"
-      "s\030\001 \003(\0132\021.ProductFlagValue\"j\n\017FlagsDescr"
-      "iptor\022\017\n\007visible\030\001 \001(\010\022\017\n\007premium\030\002 \001(\010\022"
-      "\020\n\010featured\030\003 \001(\010\022\022\n\nlastchance\030\004 \001(\010\022\017\n"
-      "\007inhouse\030\005 \001(\010*R\n\013ProductFlag\022\013\n\007VISIBLE"
-      "\020\000\022\013\n\007PREMIUM\020\001\022\014\n\010FEATURED\020\002\022\016\n\nLASTCHA"
-      "NCE\020\003\022\013\n\007INHOUSE\020\004B7\n!io.bloombox.schema"
-      ".product.structB\013BaseStructsH\001P\001\370\001\001b\006pro"
-      "to3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 403);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "structs/FlagsDescriptor.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_structs_2fFlagsDescriptor_2eproto
-
-const ::google::protobuf::EnumDescriptor* ProductFlag_descriptor() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_enum_descriptors[0];
-}
-bool ProductFlag_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ProductFlagValue::kTypeFieldNumber;
-const int ProductFlagValue::kValueFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ProductFlagValue::ProductFlagValue()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ProductFlagValue)
-}
-ProductFlagValue::ProductFlagValue(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ProductFlagValue)
-}
-ProductFlagValue::ProductFlagValue(const ProductFlagValue& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::memcpy(&type_, &from.type_,
-    static_cast<size_t>(reinterpret_cast<char*>(&value_) -
-    reinterpret_cast<char*>(&type_)) + sizeof(value_));
-  // @@protoc_insertion_point(copy_constructor:ProductFlagValue)
-}
-
-void ProductFlagValue::SharedCtor() {
-  ::memset(&type_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&value_) -
-      reinterpret_cast<char*>(&type_)) + sizeof(value_));
-  _cached_size_ = 0;
-}
-
-ProductFlagValue::~ProductFlagValue() {
-  // @@protoc_insertion_point(destructor:ProductFlagValue)
-  SharedDtor();
-}
-
-void ProductFlagValue::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void ProductFlagValue::ArenaDtor(void* object) {
-  ProductFlagValue* _this = reinterpret_cast< ProductFlagValue* >(object);
-  (void)_this;
-}
-void ProductFlagValue::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ProductFlagValue::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ProductFlagValue::descriptor() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ProductFlagValue& ProductFlagValue::default_instance() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ProductFlagValue* ProductFlagValue::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ProductFlagValue>(arena);
-}
-
-void ProductFlagValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:ProductFlagValue)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&type_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&value_) -
-      reinterpret_cast<char*>(&type_)) + sizeof(value_));
-  _internal_metadata_.Clear();
-}
-
-bool ProductFlagValue::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ProductFlagValue)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .ProductFlag type = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_type(static_cast< ::ProductFlag >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool value = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &value_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ProductFlagValue)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ProductFlagValue)
-  return false;
-#undef DO_
-}
-
-void ProductFlagValue::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ProductFlagValue)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductFlag type = 1;
-  if (this->type() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->type(), output);
-  }
-
-  // bool value = 2;
-  if (this->value() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->value(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ProductFlagValue)
-}
-
-::google::protobuf::uint8* ProductFlagValue::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ProductFlagValue)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .ProductFlag type = 1;
-  if (this->type() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->type(), target);
-  }
-
-  // bool value = 2;
-  if (this->value() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->value(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ProductFlagValue)
-  return target;
-}
-
-size_t ProductFlagValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ProductFlagValue)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .ProductFlag type = 1;
-  if (this->type() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-  }
-
-  // bool value = 2;
-  if (this->value() != 0) {
-    total_size += 1 + 1;
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ProductFlagValue::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ProductFlagValue)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ProductFlagValue* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ProductFlagValue>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ProductFlagValue)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ProductFlagValue)
-    MergeFrom(*source);
-  }
-}
-
-void ProductFlagValue::MergeFrom(const ProductFlagValue& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ProductFlagValue)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.type() != 0) {
-    set_type(from.type());
-  }
-  if (from.value() != 0) {
-    set_value(from.value());
-  }
-}
-
-void ProductFlagValue::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ProductFlagValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ProductFlagValue::CopyFrom(const ProductFlagValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ProductFlagValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ProductFlagValue::IsInitialized() const {
-  return true;
-}
-
-void ProductFlagValue::Swap(ProductFlagValue* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ProductFlagValue* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ProductFlagValue::UnsafeArenaSwap(ProductFlagValue* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ProductFlagValue::InternalSwap(ProductFlagValue* other) {
-  using std::swap;
-  swap(type_, other->type_);
-  swap(value_, other->value_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ProductFlagValue::GetMetadata() const {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ProductFlagValue
-
-// .ProductFlag type = 1;
-void ProductFlagValue::clear_type() {
-  type_ = 0;
-}
-::ProductFlag ProductFlagValue::type() const {
-  // @@protoc_insertion_point(field_get:ProductFlagValue.type)
-  return static_cast< ::ProductFlag >(type_);
-}
-void ProductFlagValue::set_type(::ProductFlag value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:ProductFlagValue.type)
-}
-
-// bool value = 2;
-void ProductFlagValue::clear_value() {
-  value_ = false;
-}
-bool ProductFlagValue::value() const {
-  // @@protoc_insertion_point(field_get:ProductFlagValue.value)
-  return value_;
-}
-void ProductFlagValue::set_value(bool value) {
-  
-  value_ = value;
-  // @@protoc_insertion_point(field_set:ProductFlagValue.value)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ProductFlagset::kFlagsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ProductFlagset::ProductFlagset()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ProductFlagset)
-}
-ProductFlagset::ProductFlagset(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena),
-  flags_(arena) {
-  protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ProductFlagset)
-}
-ProductFlagset::ProductFlagset(const ProductFlagset& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      flags_(from.flags_),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:ProductFlagset)
-}
-
-void ProductFlagset::SharedCtor() {
-  _cached_size_ = 0;
-}
-
-ProductFlagset::~ProductFlagset() {
-  // @@protoc_insertion_point(destructor:ProductFlagset)
-  SharedDtor();
-}
-
-void ProductFlagset::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void ProductFlagset::ArenaDtor(void* object) {
-  ProductFlagset* _this = reinterpret_cast< ProductFlagset* >(object);
-  (void)_this;
-}
-void ProductFlagset::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ProductFlagset::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ProductFlagset::descriptor() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ProductFlagset& ProductFlagset::default_instance() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ProductFlagset* ProductFlagset::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ProductFlagset>(arena);
-}
-
-void ProductFlagset::Clear() {
-// @@protoc_insertion_point(message_clear_start:ProductFlagset)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  flags_.Clear();
-  _internal_metadata_.Clear();
-}
-
-bool ProductFlagset::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ProductFlagset)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .ProductFlagValue flags = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_flags()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ProductFlagset)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ProductFlagset)
-  return false;
-#undef DO_
-}
-
-void ProductFlagset::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ProductFlagset)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .ProductFlagValue flags = 1;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->flags_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->flags(static_cast<int>(i)), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ProductFlagset)
-}
-
-::google::protobuf::uint8* ProductFlagset::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ProductFlagset)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .ProductFlagValue flags = 1;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->flags_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, this->flags(static_cast<int>(i)), deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ProductFlagset)
-  return target;
-}
-
-size_t ProductFlagset::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ProductFlagset)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // repeated .ProductFlagValue flags = 1;
-  {
-    unsigned int count = static_cast<unsigned int>(this->flags_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->flags(static_cast<int>(i)));
-    }
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ProductFlagset::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ProductFlagset)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ProductFlagset* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ProductFlagset>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ProductFlagset)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ProductFlagset)
-    MergeFrom(*source);
-  }
-}
-
-void ProductFlagset::MergeFrom(const ProductFlagset& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ProductFlagset)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  flags_.MergeFrom(from.flags_);
-}
-
-void ProductFlagset::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ProductFlagset)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ProductFlagset::CopyFrom(const ProductFlagset& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ProductFlagset)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ProductFlagset::IsInitialized() const {
-  return true;
-}
-
-void ProductFlagset::Swap(ProductFlagset* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ProductFlagset* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ProductFlagset::UnsafeArenaSwap(ProductFlagset* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ProductFlagset::InternalSwap(ProductFlagset* other) {
-  using std::swap;
-  flags_.InternalSwap(&other->flags_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ProductFlagset::GetMetadata() const {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ProductFlagset
-
-// repeated .ProductFlagValue flags = 1;
-int ProductFlagset::flags_size() const {
-  return flags_.size();
-}
-void ProductFlagset::clear_flags() {
-  flags_.Clear();
-}
-const ::ProductFlagValue& ProductFlagset::flags(int index) const {
-  // @@protoc_insertion_point(field_get:ProductFlagset.flags)
-  return flags_.Get(index);
-}
-::ProductFlagValue* ProductFlagset::mutable_flags(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductFlagset.flags)
-  return flags_.Mutable(index);
-}
-::ProductFlagValue* ProductFlagset::add_flags() {
-  // @@protoc_insertion_point(field_add:ProductFlagset.flags)
-  return flags_.Add();
-}
-::google::protobuf::RepeatedPtrField< ::ProductFlagValue >*
-ProductFlagset::mutable_flags() {
-  // @@protoc_insertion_point(field_mutable_list:ProductFlagset.flags)
-  return &flags_;
-}
-const ::google::protobuf::RepeatedPtrField< ::ProductFlagValue >&
-ProductFlagset::flags() const {
-  // @@protoc_insertion_point(field_list:ProductFlagset.flags)
-  return flags_;
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int FlagsDescriptor::kVisibleFieldNumber;
-const int FlagsDescriptor::kPremiumFieldNumber;
-const int FlagsDescriptor::kFeaturedFieldNumber;
-const int FlagsDescriptor::kLastchanceFieldNumber;
-const int FlagsDescriptor::kInhouseFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-FlagsDescriptor::FlagsDescriptor()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:FlagsDescriptor)
-}
-FlagsDescriptor::FlagsDescriptor(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:FlagsDescriptor)
-}
-FlagsDescriptor::FlagsDescriptor(const FlagsDescriptor& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::memcpy(&visible_, &from.visible_,
-    static_cast<size_t>(reinterpret_cast<char*>(&inhouse_) -
-    reinterpret_cast<char*>(&visible_)) + sizeof(inhouse_));
-  // @@protoc_insertion_point(copy_constructor:FlagsDescriptor)
-}
-
-void FlagsDescriptor::SharedCtor() {
-  ::memset(&visible_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&inhouse_) -
-      reinterpret_cast<char*>(&visible_)) + sizeof(inhouse_));
-  _cached_size_ = 0;
-}
-
-FlagsDescriptor::~FlagsDescriptor() {
-  // @@protoc_insertion_point(destructor:FlagsDescriptor)
-  SharedDtor();
-}
-
-void FlagsDescriptor::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void FlagsDescriptor::ArenaDtor(void* object) {
-  FlagsDescriptor* _this = reinterpret_cast< FlagsDescriptor* >(object);
-  (void)_this;
-}
-void FlagsDescriptor::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void FlagsDescriptor::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* FlagsDescriptor::descriptor() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const FlagsDescriptor& FlagsDescriptor::default_instance() {
-  protobuf_structs_2fFlagsDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-FlagsDescriptor* FlagsDescriptor::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<FlagsDescriptor>(arena);
-}
-
-void FlagsDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:FlagsDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&visible_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&inhouse_) -
-      reinterpret_cast<char*>(&visible_)) + sizeof(inhouse_));
-  _internal_metadata_.Clear();
-}
-
-bool FlagsDescriptor::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:FlagsDescriptor)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // bool visible = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &visible_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool premium = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &premium_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool featured = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &featured_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool lastchance = 4;
-      case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(32u /* 32 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &lastchance_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool inhouse = 5;
-      case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(40u /* 40 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &inhouse_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:FlagsDescriptor)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:FlagsDescriptor)
-  return false;
-#undef DO_
-}
-
-void FlagsDescriptor::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:FlagsDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool visible = 1;
-  if (this->visible() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->visible(), output);
-  }
-
-  // bool premium = 2;
-  if (this->premium() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->premium(), output);
-  }
-
-  // bool featured = 3;
-  if (this->featured() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->featured(), output);
-  }
-
-  // bool lastchance = 4;
-  if (this->lastchance() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->lastchance(), output);
-  }
-
-  // bool inhouse = 5;
-  if (this->inhouse() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->inhouse(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:FlagsDescriptor)
-}
-
-::google::protobuf::uint8* FlagsDescriptor::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:FlagsDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool visible = 1;
-  if (this->visible() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->visible(), target);
-  }
-
-  // bool premium = 2;
-  if (this->premium() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->premium(), target);
-  }
-
-  // bool featured = 3;
-  if (this->featured() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->featured(), target);
-  }
-
-  // bool lastchance = 4;
-  if (this->lastchance() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->lastchance(), target);
-  }
-
-  // bool inhouse = 5;
-  if (this->inhouse() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->inhouse(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:FlagsDescriptor)
-  return target;
-}
-
-size_t FlagsDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:FlagsDescriptor)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // bool visible = 1;
-  if (this->visible() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // bool premium = 2;
-  if (this->premium() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // bool featured = 3;
-  if (this->featured() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // bool lastchance = 4;
-  if (this->lastchance() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // bool inhouse = 5;
-  if (this->inhouse() != 0) {
-    total_size += 1 + 1;
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void FlagsDescriptor::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:FlagsDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  const FlagsDescriptor* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const FlagsDescriptor>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:FlagsDescriptor)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:FlagsDescriptor)
-    MergeFrom(*source);
-  }
-}
-
-void FlagsDescriptor::MergeFrom(const FlagsDescriptor& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:FlagsDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.visible() != 0) {
-    set_visible(from.visible());
-  }
-  if (from.premium() != 0) {
-    set_premium(from.premium());
-  }
-  if (from.featured() != 0) {
-    set_featured(from.featured());
-  }
-  if (from.lastchance() != 0) {
-    set_lastchance(from.lastchance());
-  }
-  if (from.inhouse() != 0) {
-    set_inhouse(from.inhouse());
-  }
-}
-
-void FlagsDescriptor::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:FlagsDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void FlagsDescriptor::CopyFrom(const FlagsDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:FlagsDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FlagsDescriptor::IsInitialized() const {
-  return true;
-}
-
-void FlagsDescriptor::Swap(FlagsDescriptor* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    FlagsDescriptor* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void FlagsDescriptor::UnsafeArenaSwap(FlagsDescriptor* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void FlagsDescriptor::InternalSwap(FlagsDescriptor* other) {
-  using std::swap;
-  swap(visible_, other->visible_);
-  swap(premium_, other->premium_);
-  swap(featured_, other->featured_);
-  swap(lastchance_, other->lastchance_);
-  swap(inhouse_, other->inhouse_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata FlagsDescriptor::GetMetadata() const {
-  protobuf_structs_2fFlagsDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fFlagsDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// FlagsDescriptor
-
-// bool visible = 1;
-void FlagsDescriptor::clear_visible() {
-  visible_ = false;
-}
-bool FlagsDescriptor::visible() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.visible)
-  return visible_;
-}
-void FlagsDescriptor::set_visible(bool value) {
-  
-  visible_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.visible)
-}
-
-// bool premium = 2;
-void FlagsDescriptor::clear_premium() {
-  premium_ = false;
-}
-bool FlagsDescriptor::premium() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.premium)
-  return premium_;
-}
-void FlagsDescriptor::set_premium(bool value) {
-  
-  premium_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.premium)
-}
-
-// bool featured = 3;
-void FlagsDescriptor::clear_featured() {
-  featured_ = false;
-}
-bool FlagsDescriptor::featured() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.featured)
-  return featured_;
-}
-void FlagsDescriptor::set_featured(bool value) {
-  
-  featured_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.featured)
-}
-
-// bool lastchance = 4;
-void FlagsDescriptor::clear_lastchance() {
-  lastchance_ = false;
-}
-bool FlagsDescriptor::lastchance() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.lastchance)
-  return lastchance_;
-}
-void FlagsDescriptor::set_lastchance(bool value) {
-  
-  lastchance_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.lastchance)
-}
-
-// bool inhouse = 5;
-void FlagsDescriptor::clear_inhouse() {
-  inhouse_ = false;
-}
-bool FlagsDescriptor::inhouse() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.inhouse)
-  return inhouse_;
-}
-void FlagsDescriptor::set_inhouse(bool value) {
-  
-  inhouse_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.inhouse)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/structs/FlagsDescriptor.pb.h b/languages/cpp/structs/FlagsDescriptor.pb.h
deleted file mode 100644
index 71807de..0000000
--- a/languages/cpp/structs/FlagsDescriptor.pb.h
+++ /dev/null
@@ -1,634 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-#ifndef PROTOBUF_structs_2fFlagsDescriptor_2eproto__INCLUDED
-#define PROTOBUF_structs_2fFlagsDescriptor_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class FlagsDescriptor;
-class FlagsDescriptorDefaultTypeInternal;
-extern FlagsDescriptorDefaultTypeInternal _FlagsDescriptor_default_instance_;
-class ProductFlagValue;
-class ProductFlagValueDefaultTypeInternal;
-extern ProductFlagValueDefaultTypeInternal _ProductFlagValue_default_instance_;
-class ProductFlagset;
-class ProductFlagsetDefaultTypeInternal;
-extern ProductFlagsetDefaultTypeInternal _ProductFlagset_default_instance_;
-
-namespace protobuf_structs_2fFlagsDescriptor_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_structs_2fFlagsDescriptor_2eproto
-
-enum ProductFlag {
-  VISIBLE = 0,
-  PREMIUM = 1,
-  FEATURED = 2,
-  LASTCHANCE = 3,
-  INHOUSE = 4,
-  ProductFlag_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  ProductFlag_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool ProductFlag_IsValid(int value);
-const ProductFlag ProductFlag_MIN = VISIBLE;
-const ProductFlag ProductFlag_MAX = INHOUSE;
-const int ProductFlag_ARRAYSIZE = ProductFlag_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* ProductFlag_descriptor();
-inline const ::std::string& ProductFlag_Name(ProductFlag value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    ProductFlag_descriptor(), value);
-}
-inline bool ProductFlag_Parse(
-    const ::std::string& name, ProductFlag* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ProductFlag>(
-    ProductFlag_descriptor(), name, value);
-}
-// ===================================================================
-
-class ProductFlagValue : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ProductFlagValue) */ {
- public:
-  ProductFlagValue();
-  virtual ~ProductFlagValue();
-
-  ProductFlagValue(const ProductFlagValue& from);
-
-  inline ProductFlagValue& operator=(const ProductFlagValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ProductFlagValue(ProductFlagValue&& from) noexcept
-    : ProductFlagValue() {
-    *this = ::std::move(from);
-  }
-
-  inline ProductFlagValue& operator=(ProductFlagValue&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ProductFlagValue& default_instance();
-
-  static inline const ProductFlagValue* internal_default_instance() {
-    return reinterpret_cast<const ProductFlagValue*>(
-               &_ProductFlagValue_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(ProductFlagValue* other);
-  void Swap(ProductFlagValue* other);
-  friend void swap(ProductFlagValue& a, ProductFlagValue& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ProductFlagValue* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ProductFlagValue* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ProductFlagValue& from);
-  void MergeFrom(const ProductFlagValue& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ProductFlagValue* other);
-  protected:
-  explicit ProductFlagValue(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .ProductFlag type = 1;
-  void clear_type();
-  static const int kTypeFieldNumber = 1;
-  ::ProductFlag type() const;
-  void set_type(::ProductFlag value);
-
-  // bool value = 2;
-  void clear_value();
-  static const int kValueFieldNumber = 2;
-  bool value() const;
-  void set_value(bool value);
-
-  // @@protoc_insertion_point(class_scope:ProductFlagValue)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  int type_;
-  bool value_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fFlagsDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class ProductFlagset : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ProductFlagset) */ {
- public:
-  ProductFlagset();
-  virtual ~ProductFlagset();
-
-  ProductFlagset(const ProductFlagset& from);
-
-  inline ProductFlagset& operator=(const ProductFlagset& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ProductFlagset(ProductFlagset&& from) noexcept
-    : ProductFlagset() {
-    *this = ::std::move(from);
-  }
-
-  inline ProductFlagset& operator=(ProductFlagset&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ProductFlagset& default_instance();
-
-  static inline const ProductFlagset* internal_default_instance() {
-    return reinterpret_cast<const ProductFlagset*>(
-               &_ProductFlagset_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    1;
-
-  void UnsafeArenaSwap(ProductFlagset* other);
-  void Swap(ProductFlagset* other);
-  friend void swap(ProductFlagset& a, ProductFlagset& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ProductFlagset* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ProductFlagset* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ProductFlagset& from);
-  void MergeFrom(const ProductFlagset& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ProductFlagset* other);
-  protected:
-  explicit ProductFlagset(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .ProductFlagValue flags = 1;
-  int flags_size() const;
-  void clear_flags();
-  static const int kFlagsFieldNumber = 1;
-  const ::ProductFlagValue& flags(int index) const;
-  ::ProductFlagValue* mutable_flags(int index);
-  ::ProductFlagValue* add_flags();
-  ::google::protobuf::RepeatedPtrField< ::ProductFlagValue >*
-      mutable_flags();
-  const ::google::protobuf::RepeatedPtrField< ::ProductFlagValue >&
-      flags() const;
-
-  // @@protoc_insertion_point(class_scope:ProductFlagset)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::RepeatedPtrField< ::ProductFlagValue > flags_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fFlagsDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class FlagsDescriptor : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:FlagsDescriptor) */ {
- public:
-  FlagsDescriptor();
-  virtual ~FlagsDescriptor();
-
-  FlagsDescriptor(const FlagsDescriptor& from);
-
-  inline FlagsDescriptor& operator=(const FlagsDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  FlagsDescriptor(FlagsDescriptor&& from) noexcept
-    : FlagsDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FlagsDescriptor& operator=(FlagsDescriptor&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const FlagsDescriptor& default_instance();
-
-  static inline const FlagsDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FlagsDescriptor*>(
-               &_FlagsDescriptor_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    2;
-
-  void UnsafeArenaSwap(FlagsDescriptor* other);
-  void Swap(FlagsDescriptor* other);
-  friend void swap(FlagsDescriptor& a, FlagsDescriptor& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline FlagsDescriptor* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  FlagsDescriptor* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const FlagsDescriptor& from);
-  void MergeFrom(const FlagsDescriptor& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(FlagsDescriptor* other);
-  protected:
-  explicit FlagsDescriptor(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // bool visible = 1;
-  void clear_visible();
-  static const int kVisibleFieldNumber = 1;
-  bool visible() const;
-  void set_visible(bool value);
-
-  // bool premium = 2;
-  void clear_premium();
-  static const int kPremiumFieldNumber = 2;
-  bool premium() const;
-  void set_premium(bool value);
-
-  // bool featured = 3;
-  void clear_featured();
-  static const int kFeaturedFieldNumber = 3;
-  bool featured() const;
-  void set_featured(bool value);
-
-  // bool lastchance = 4;
-  void clear_lastchance();
-  static const int kLastchanceFieldNumber = 4;
-  bool lastchance() const;
-  void set_lastchance(bool value);
-
-  // bool inhouse = 5;
-  void clear_inhouse();
-  static const int kInhouseFieldNumber = 5;
-  bool inhouse() const;
-  void set_inhouse(bool value);
-
-  // @@protoc_insertion_point(class_scope:FlagsDescriptor)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  bool visible_;
-  bool premium_;
-  bool featured_;
-  bool lastchance_;
-  bool inhouse_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fFlagsDescriptor_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// ProductFlagValue
-
-// .ProductFlag type = 1;
-inline void ProductFlagValue::clear_type() {
-  type_ = 0;
-}
-inline ::ProductFlag ProductFlagValue::type() const {
-  // @@protoc_insertion_point(field_get:ProductFlagValue.type)
-  return static_cast< ::ProductFlag >(type_);
-}
-inline void ProductFlagValue::set_type(::ProductFlag value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:ProductFlagValue.type)
-}
-
-// bool value = 2;
-inline void ProductFlagValue::clear_value() {
-  value_ = false;
-}
-inline bool ProductFlagValue::value() const {
-  // @@protoc_insertion_point(field_get:ProductFlagValue.value)
-  return value_;
-}
-inline void ProductFlagValue::set_value(bool value) {
-  
-  value_ = value;
-  // @@protoc_insertion_point(field_set:ProductFlagValue.value)
-}
-
-// -------------------------------------------------------------------
-
-// ProductFlagset
-
-// repeated .ProductFlagValue flags = 1;
-inline int ProductFlagset::flags_size() const {
-  return flags_.size();
-}
-inline void ProductFlagset::clear_flags() {
-  flags_.Clear();
-}
-inline const ::ProductFlagValue& ProductFlagset::flags(int index) const {
-  // @@protoc_insertion_point(field_get:ProductFlagset.flags)
-  return flags_.Get(index);
-}
-inline ::ProductFlagValue* ProductFlagset::mutable_flags(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductFlagset.flags)
-  return flags_.Mutable(index);
-}
-inline ::ProductFlagValue* ProductFlagset::add_flags() {
-  // @@protoc_insertion_point(field_add:ProductFlagset.flags)
-  return flags_.Add();
-}
-inline ::google::protobuf::RepeatedPtrField< ::ProductFlagValue >*
-ProductFlagset::mutable_flags() {
-  // @@protoc_insertion_point(field_mutable_list:ProductFlagset.flags)
-  return &flags_;
-}
-inline const ::google::protobuf::RepeatedPtrField< ::ProductFlagValue >&
-ProductFlagset::flags() const {
-  // @@protoc_insertion_point(field_list:ProductFlagset.flags)
-  return flags_;
-}
-
-// -------------------------------------------------------------------
-
-// FlagsDescriptor
-
-// bool visible = 1;
-inline void FlagsDescriptor::clear_visible() {
-  visible_ = false;
-}
-inline bool FlagsDescriptor::visible() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.visible)
-  return visible_;
-}
-inline void FlagsDescriptor::set_visible(bool value) {
-  
-  visible_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.visible)
-}
-
-// bool premium = 2;
-inline void FlagsDescriptor::clear_premium() {
-  premium_ = false;
-}
-inline bool FlagsDescriptor::premium() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.premium)
-  return premium_;
-}
-inline void FlagsDescriptor::set_premium(bool value) {
-  
-  premium_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.premium)
-}
-
-// bool featured = 3;
-inline void FlagsDescriptor::clear_featured() {
-  featured_ = false;
-}
-inline bool FlagsDescriptor::featured() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.featured)
-  return featured_;
-}
-inline void FlagsDescriptor::set_featured(bool value) {
-  
-  featured_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.featured)
-}
-
-// bool lastchance = 4;
-inline void FlagsDescriptor::clear_lastchance() {
-  lastchance_ = false;
-}
-inline bool FlagsDescriptor::lastchance() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.lastchance)
-  return lastchance_;
-}
-inline void FlagsDescriptor::set_lastchance(bool value) {
-  
-  lastchance_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.lastchance)
-}
-
-// bool inhouse = 5;
-inline void FlagsDescriptor::clear_inhouse() {
-  inhouse_ = false;
-}
-inline bool FlagsDescriptor::inhouse() const {
-  // @@protoc_insertion_point(field_get:FlagsDescriptor.inhouse)
-  return inhouse_;
-}
-inline void FlagsDescriptor::set_inhouse(bool value) {
-  
-  inhouse_ = value;
-  // @@protoc_insertion_point(field_set:FlagsDescriptor.inhouse)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::ProductFlag> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::ProductFlag>() {
-  return ::ProductFlag_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_structs_2fFlagsDescriptor_2eproto__INCLUDED
diff --git a/languages/cpp/structs/Genetics.pb.cc b/languages/cpp/structs/Genetics.pb.cc
deleted file mode 100644
index 05a6fa7..0000000
--- a/languages/cpp/structs/Genetics.pb.cc
+++ /dev/null
@@ -1,661 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "structs/Genetics.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class GeneticsDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<Genetics>
-     _instance;
-} _Genetics_default_instance_;
-
-namespace protobuf_structs_2fGenetics_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Genetics, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Genetics, male_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Genetics, female_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(Genetics)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_Genetics_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "structs/Genetics.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, NULL, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_content_2fName_2eproto::InitDefaults();
-  _Genetics_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_Genetics_default_instance_);_Genetics_default_instance_._instance.get_mutable()->male_ = const_cast< ::Name*>(
-      ::Name::internal_default_instance());
-  _Genetics_default_instance_._instance.get_mutable()->female_ = const_cast< ::Name*>(
-      ::Name::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\026structs/Genetics.proto\032\022content/Name.p"
-      "roto\"6\n\010Genetics\022\023\n\004male\030\001 \001(\0132\005.Name\022\025\n"
-      "\006female\030\002 \001(\0132\005.NameB;\n!io.bloombox.sche"
-      "ma.product.structB\017GeneticsStructsH\001P\001\370\001"
-      "\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 169);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "structs/Genetics.proto", &protobuf_RegisterTypes);
-  ::protobuf_content_2fName_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_structs_2fGenetics_2eproto
-
-
-// ===================================================================
-
-void Genetics::_slow_mutable_male() {
-  male_ = ::google::protobuf::Arena::CreateMessage< ::Name >(
-      GetArenaNoVirtual());
-}
-::Name* Genetics::_slow_release_male() {
-  if (male_ == NULL) {
-    return NULL;
-  } else {
-    ::Name* temp = new ::Name(*male_);
-    male_ = NULL;
-    return temp;
-  }
-}
-::Name* Genetics::unsafe_arena_release_male() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Genetics.male)
-  
-  ::Name* temp = male_;
-  male_ = NULL;
-  return temp;
-}
-void Genetics::_slow_set_allocated_male(
-    ::google::protobuf::Arena* message_arena, ::Name** male) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*male) == NULL) {
-      message_arena->Own(*male);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*male)) {
-      ::Name* new_male = 
-            ::google::protobuf::Arena::CreateMessage< ::Name >(
-            message_arena);
-      new_male->CopyFrom(**male);
-      *male = new_male;
-    }
-}
-void Genetics::unsafe_arena_set_allocated_male(
-    ::Name* male) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete male_;
-  }
-  male_ = male;
-  if (male) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Genetics.male)
-}
-void Genetics::_slow_mutable_female() {
-  female_ = ::google::protobuf::Arena::CreateMessage< ::Name >(
-      GetArenaNoVirtual());
-}
-::Name* Genetics::_slow_release_female() {
-  if (female_ == NULL) {
-    return NULL;
-  } else {
-    ::Name* temp = new ::Name(*female_);
-    female_ = NULL;
-    return temp;
-  }
-}
-::Name* Genetics::unsafe_arena_release_female() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:Genetics.female)
-  
-  ::Name* temp = female_;
-  female_ = NULL;
-  return temp;
-}
-void Genetics::_slow_set_allocated_female(
-    ::google::protobuf::Arena* message_arena, ::Name** female) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*female) == NULL) {
-      message_arena->Own(*female);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*female)) {
-      ::Name* new_female = 
-            ::google::protobuf::Arena::CreateMessage< ::Name >(
-            message_arena);
-      new_female->CopyFrom(**female);
-      *female = new_female;
-    }
-}
-void Genetics::unsafe_arena_set_allocated_female(
-    ::Name* female) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete female_;
-  }
-  female_ = female;
-  if (female) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:Genetics.female)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Genetics::kMaleFieldNumber;
-const int Genetics::kFemaleFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Genetics::Genetics()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fGenetics_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:Genetics)
-}
-Genetics::Genetics(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fGenetics_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:Genetics)
-}
-Genetics::Genetics(const Genetics& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_male()) {
-    male_ = new ::Name(*from.male_);
-  } else {
-    male_ = NULL;
-  }
-  if (from.has_female()) {
-    female_ = new ::Name(*from.female_);
-  } else {
-    female_ = NULL;
-  }
-  // @@protoc_insertion_point(copy_constructor:Genetics)
-}
-
-void Genetics::SharedCtor() {
-  ::memset(&male_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&female_) -
-      reinterpret_cast<char*>(&male_)) + sizeof(female_));
-  _cached_size_ = 0;
-}
-
-Genetics::~Genetics() {
-  // @@protoc_insertion_point(destructor:Genetics)
-  SharedDtor();
-}
-
-void Genetics::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete male_;
-  if (this != internal_default_instance()) delete female_;
-}
-
-void Genetics::ArenaDtor(void* object) {
-  Genetics* _this = reinterpret_cast< Genetics* >(object);
-  (void)_this;
-}
-void Genetics::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void Genetics::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Genetics::descriptor() {
-  protobuf_structs_2fGenetics_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fGenetics_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Genetics& Genetics::default_instance() {
-  protobuf_structs_2fGenetics_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-Genetics* Genetics::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<Genetics>(arena);
-}
-
-void Genetics::Clear() {
-// @@protoc_insertion_point(message_clear_start:Genetics)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == NULL && male_ != NULL) {
-    delete male_;
-  }
-  male_ = NULL;
-  if (GetArenaNoVirtual() == NULL && female_ != NULL) {
-    delete female_;
-  }
-  female_ = NULL;
-  _internal_metadata_.Clear();
-}
-
-bool Genetics::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:Genetics)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .Name male = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_male()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .Name female = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_female()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:Genetics)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:Genetics)
-  return false;
-#undef DO_
-}
-
-void Genetics::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:Genetics)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Name male = 1;
-  if (this->has_male()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, *this->male_, output);
-  }
-
-  // .Name female = 2;
-  if (this->has_female()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->female_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:Genetics)
-}
-
-::google::protobuf::uint8* Genetics::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:Genetics)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .Name male = 1;
-  if (this->has_male()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, *this->male_, deterministic, target);
-  }
-
-  // .Name female = 2;
-  if (this->has_female()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->female_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:Genetics)
-  return target;
-}
-
-size_t Genetics::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:Genetics)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .Name male = 1;
-  if (this->has_male()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->male_);
-  }
-
-  // .Name female = 2;
-  if (this->has_female()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->female_);
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Genetics::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:Genetics)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Genetics* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Genetics>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:Genetics)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:Genetics)
-    MergeFrom(*source);
-  }
-}
-
-void Genetics::MergeFrom(const Genetics& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:Genetics)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_male()) {
-    mutable_male()->::Name::MergeFrom(from.male());
-  }
-  if (from.has_female()) {
-    mutable_female()->::Name::MergeFrom(from.female());
-  }
-}
-
-void Genetics::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:Genetics)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Genetics::CopyFrom(const Genetics& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:Genetics)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Genetics::IsInitialized() const {
-  return true;
-}
-
-void Genetics::Swap(Genetics* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    Genetics* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void Genetics::UnsafeArenaSwap(Genetics* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void Genetics::InternalSwap(Genetics* other) {
-  using std::swap;
-  swap(male_, other->male_);
-  swap(female_, other->female_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata Genetics::GetMetadata() const {
-  protobuf_structs_2fGenetics_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fGenetics_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// Genetics
-
-// .Name male = 1;
-bool Genetics::has_male() const {
-  return this != internal_default_instance() && male_ != NULL;
-}
-void Genetics::clear_male() {
-  if (GetArenaNoVirtual() == NULL && male_ != NULL) delete male_;
-  male_ = NULL;
-}
-const ::Name& Genetics::male() const {
-  const ::Name* p = male_;
-  // @@protoc_insertion_point(field_get:Genetics.male)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-::Name* Genetics::mutable_male() {
-  
-  if (male_ == NULL) {
-    _slow_mutable_male();
-  }
-  // @@protoc_insertion_point(field_mutable:Genetics.male)
-  return male_;
-}
-::Name* Genetics::release_male() {
-  // @@protoc_insertion_point(field_release:Genetics.male)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_male();
-  } else {
-    ::Name* temp = male_;
-    male_ = NULL;
-    return temp;
-  }
-}
- void Genetics::set_allocated_male(::Name* male) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete male_;
-  }
-  if (male != NULL) {
-    _slow_set_allocated_male(message_arena, &male);
-  }
-  male_ = male;
-  if (male) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Genetics.male)
-}
-
-// .Name female = 2;
-bool Genetics::has_female() const {
-  return this != internal_default_instance() && female_ != NULL;
-}
-void Genetics::clear_female() {
-  if (GetArenaNoVirtual() == NULL && female_ != NULL) delete female_;
-  female_ = NULL;
-}
-const ::Name& Genetics::female() const {
-  const ::Name* p = female_;
-  // @@protoc_insertion_point(field_get:Genetics.female)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-::Name* Genetics::mutable_female() {
-  
-  if (female_ == NULL) {
-    _slow_mutable_female();
-  }
-  // @@protoc_insertion_point(field_mutable:Genetics.female)
-  return female_;
-}
-::Name* Genetics::release_female() {
-  // @@protoc_insertion_point(field_release:Genetics.female)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_female();
-  } else {
-    ::Name* temp = female_;
-    female_ = NULL;
-    return temp;
-  }
-}
- void Genetics::set_allocated_female(::Name* female) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete female_;
-  }
-  if (female != NULL) {
-    _slow_set_allocated_female(message_arena, &female);
-  }
-  female_ = female;
-  if (female) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Genetics.female)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/structs/Genetics.pb.h b/languages/cpp/structs/Genetics.pb.h
deleted file mode 100644
index c8e446c..0000000
--- a/languages/cpp/structs/Genetics.pb.h
+++ /dev/null
@@ -1,318 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-#ifndef PROTOBUF_structs_2fGenetics_2eproto__INCLUDED
-#define PROTOBUF_structs_2fGenetics_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include "content/Name.pb.h"
-// @@protoc_insertion_point(includes)
-class Genetics;
-class GeneticsDefaultTypeInternal;
-extern GeneticsDefaultTypeInternal _Genetics_default_instance_;
-
-namespace protobuf_structs_2fGenetics_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_structs_2fGenetics_2eproto
-
-// ===================================================================
-
-class Genetics : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:Genetics) */ {
- public:
-  Genetics();
-  virtual ~Genetics();
-
-  Genetics(const Genetics& from);
-
-  inline Genetics& operator=(const Genetics& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Genetics(Genetics&& from) noexcept
-    : Genetics() {
-    *this = ::std::move(from);
-  }
-
-  inline Genetics& operator=(Genetics&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Genetics& default_instance();
-
-  static inline const Genetics* internal_default_instance() {
-    return reinterpret_cast<const Genetics*>(
-               &_Genetics_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(Genetics* other);
-  void Swap(Genetics* other);
-  friend void swap(Genetics& a, Genetics& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Genetics* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Genetics* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Genetics& from);
-  void MergeFrom(const Genetics& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Genetics* other);
-  protected:
-  explicit Genetics(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .Name male = 1;
-  bool has_male() const;
-  void clear_male();
-  static const int kMaleFieldNumber = 1;
-  private:
-  void _slow_mutable_male();
-  void _slow_set_allocated_male(
-      ::google::protobuf::Arena* message_arena, ::Name** male);
-  ::Name* _slow_release_male();
-  public:
-  const ::Name& male() const;
-  ::Name* mutable_male();
-  ::Name* release_male();
-  void set_allocated_male(::Name* male);
-  ::Name* unsafe_arena_release_male();
-  void unsafe_arena_set_allocated_male(
-      ::Name* male);
-
-  // .Name female = 2;
-  bool has_female() const;
-  void clear_female();
-  static const int kFemaleFieldNumber = 2;
-  private:
-  void _slow_mutable_female();
-  void _slow_set_allocated_female(
-      ::google::protobuf::Arena* message_arena, ::Name** female);
-  ::Name* _slow_release_female();
-  public:
-  const ::Name& female() const;
-  ::Name* mutable_female();
-  ::Name* release_female();
-  void set_allocated_female(::Name* female);
-  ::Name* unsafe_arena_release_female();
-  void unsafe_arena_set_allocated_female(
-      ::Name* female);
-
-  // @@protoc_insertion_point(class_scope:Genetics)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::Name* male_;
-  ::Name* female_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fGenetics_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Genetics
-
-// .Name male = 1;
-inline bool Genetics::has_male() const {
-  return this != internal_default_instance() && male_ != NULL;
-}
-inline void Genetics::clear_male() {
-  if (GetArenaNoVirtual() == NULL && male_ != NULL) delete male_;
-  male_ = NULL;
-}
-inline const ::Name& Genetics::male() const {
-  const ::Name* p = male_;
-  // @@protoc_insertion_point(field_get:Genetics.male)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-inline ::Name* Genetics::mutable_male() {
-  
-  if (male_ == NULL) {
-    _slow_mutable_male();
-  }
-  // @@protoc_insertion_point(field_mutable:Genetics.male)
-  return male_;
-}
-inline ::Name* Genetics::release_male() {
-  // @@protoc_insertion_point(field_release:Genetics.male)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_male();
-  } else {
-    ::Name* temp = male_;
-    male_ = NULL;
-    return temp;
-  }
-}
-inline  void Genetics::set_allocated_male(::Name* male) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete male_;
-  }
-  if (male != NULL) {
-    _slow_set_allocated_male(message_arena, &male);
-  }
-  male_ = male;
-  if (male) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Genetics.male)
-}
-
-// .Name female = 2;
-inline bool Genetics::has_female() const {
-  return this != internal_default_instance() && female_ != NULL;
-}
-inline void Genetics::clear_female() {
-  if (GetArenaNoVirtual() == NULL && female_ != NULL) delete female_;
-  female_ = NULL;
-}
-inline const ::Name& Genetics::female() const {
-  const ::Name* p = female_;
-  // @@protoc_insertion_point(field_get:Genetics.female)
-  return p != NULL ? *p : *reinterpret_cast<const ::Name*>(
-      &::_Name_default_instance_);
-}
-inline ::Name* Genetics::mutable_female() {
-  
-  if (female_ == NULL) {
-    _slow_mutable_female();
-  }
-  // @@protoc_insertion_point(field_mutable:Genetics.female)
-  return female_;
-}
-inline ::Name* Genetics::release_female() {
-  // @@protoc_insertion_point(field_release:Genetics.female)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_female();
-  } else {
-    ::Name* temp = female_;
-    female_ = NULL;
-    return temp;
-  }
-}
-inline  void Genetics::set_allocated_female(::Name* female) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete female_;
-  }
-  if (female != NULL) {
-    _slow_set_allocated_female(message_arena, &female);
-  }
-  female_ = female;
-  if (female) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:Genetics.female)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_structs_2fGenetics_2eproto__INCLUDED
diff --git a/languages/cpp/structs/Grow.pb.cc b/languages/cpp/structs/Grow.pb.cc
deleted file mode 100644
index 9645c7b..0000000
--- a/languages/cpp/structs/Grow.pb.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "structs/Grow.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_structs_2fGrow_2eproto {
-
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[1] = {};
-static const ::google::protobuf::internal::MigrationSchema* schemas = NULL;
-static const ::google::protobuf::Message* const* file_default_instances = NULL;
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "structs/Grow.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      NULL, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\022structs/Grow.proto*<\n\004Grow\022\013\n\007GENERIC\020"
-      "\000\022\n\n\006INDOOR\020\001\022\016\n\nGREENHOUSE\020\002\022\013\n\007OUTDOOR"
-      "\020\003B8\n!io.bloombox.schema.product.structB"
-      "\014MaterialGrowH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 148);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "structs/Grow.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_structs_2fGrow_2eproto
-
-const ::google::protobuf::EnumDescriptor* Grow_descriptor() {
-  protobuf_structs_2fGrow_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fGrow_2eproto::file_level_enum_descriptors[0];
-}
-bool Grow_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/structs/Grow.pb.h b/languages/cpp/structs/Grow.pb.h
deleted file mode 100644
index c6cefd7..0000000
--- a/languages/cpp/structs/Grow.pb.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-#ifndef PROTOBUF_structs_2fGrow_2eproto__INCLUDED
-#define PROTOBUF_structs_2fGrow_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_structs_2fGrow_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_structs_2fGrow_2eproto
-
-enum Grow {
-  GENERIC = 0,
-  INDOOR = 1,
-  GREENHOUSE = 2,
-  OUTDOOR = 3,
-  Grow_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  Grow_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool Grow_IsValid(int value);
-const Grow Grow_MIN = GENERIC;
-const Grow Grow_MAX = OUTDOOR;
-const int Grow_ARRAYSIZE = Grow_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* Grow_descriptor();
-inline const ::std::string& Grow_Name(Grow value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    Grow_descriptor(), value);
-}
-inline bool Grow_Parse(
-    const ::std::string& name, Grow* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Grow>(
-    Grow_descriptor(), name, value);
-}
-// ===================================================================
-
-
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::Grow> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::Grow>() {
-  return ::Grow_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_structs_2fGrow_2eproto__INCLUDED
diff --git a/languages/cpp/structs/Species.pb.cc b/languages/cpp/structs/Species.pb.cc
deleted file mode 100644
index 8d04d94..0000000
--- a/languages/cpp/structs/Species.pb.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "structs/Species.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_structs_2fSpecies_2eproto {
-
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[1] = {};
-static const ::google::protobuf::internal::MigrationSchema* schemas = NULL;
-static const ::google::protobuf::Message* const* file_default_instances = NULL;
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "structs/Species.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      NULL, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\025structs/Species.proto*d\n\007Species\022\017\n\013UN"
-      "SPECIFIED\020\000\022\n\n\006SATIVA\020\001\022\021\n\rHYBRID_SATIVA"
-      "\020\002\022\n\n\006HYBRID\020\003\022\021\n\rHYBRID_INDICA\020\004\022\n\n\006IND"
-      "ICA\020\005B;\n!io.bloombox.schema.product.stru"
-      "ctB\017MaterialSpeciesH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 194);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "structs/Species.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_structs_2fSpecies_2eproto
-
-const ::google::protobuf::EnumDescriptor* Species_descriptor() {
-  protobuf_structs_2fSpecies_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fSpecies_2eproto::file_level_enum_descriptors[0];
-}
-bool Species_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/structs/Species.pb.h b/languages/cpp/structs/Species.pb.h
deleted file mode 100644
index ee90482..0000000
--- a/languages/cpp/structs/Species.pb.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-#ifndef PROTOBUF_structs_2fSpecies_2eproto__INCLUDED
-#define PROTOBUF_structs_2fSpecies_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_structs_2fSpecies_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_structs_2fSpecies_2eproto
-
-enum Species {
-  UNSPECIFIED = 0,
-  SATIVA = 1,
-  HYBRID_SATIVA = 2,
-  HYBRID = 3,
-  HYBRID_INDICA = 4,
-  INDICA = 5,
-  Species_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  Species_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool Species_IsValid(int value);
-const Species Species_MIN = UNSPECIFIED;
-const Species Species_MAX = INDICA;
-const int Species_ARRAYSIZE = Species_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* Species_descriptor();
-inline const ::std::string& Species_Name(Species value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    Species_descriptor(), value);
-}
-inline bool Species_Parse(
-    const ::std::string& name, Species* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Species>(
-    Species_descriptor(), name, value);
-}
-// ===================================================================
-
-
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::Species> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::Species>() {
-  return ::Species_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_structs_2fSpecies_2eproto__INCLUDED
diff --git a/languages/cpp/structs/pricing/PricingDescriptor.pb.cc b/languages/cpp/structs/pricing/PricingDescriptor.pb.cc
deleted file mode 100644
index f2f7cdb..0000000
--- a/languages/cpp/structs/pricing/PricingDescriptor.pb.cc
+++ /dev/null
@@ -1,2941 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "structs/pricing/PricingDescriptor.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class PricingTierAvailabilityDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<PricingTierAvailability>
-     _instance;
-} _PricingTierAvailability_default_instance_;
-class UnitPricingDescriptorDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<UnitPricingDescriptor>
-     _instance;
-} _UnitPricingDescriptor_default_instance_;
-class WeightedPricingDescriptorDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<WeightedPricingDescriptor>
-     _instance;
-} _WeightedPricingDescriptor_default_instance_;
-class FreebiePricingDescriptorDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<FreebiePricingDescriptor>
-     _instance;
-} _FreebiePricingDescriptor_default_instance_;
-class PricingDescriptorDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<PricingDescriptor>
-     _instance;
-} _PricingDescriptor_default_instance_;
-class ProductPricingDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<ProductPricing>
-     _instance;
-} _ProductPricing_default_instance_;
-
-namespace protobuf_structs_2fpricing_2fPricingDescriptor_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[6];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingTierAvailability, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingTierAvailability, offered_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingTierAvailability, available_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnitPricingDescriptor, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnitPricingDescriptor, price_value_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnitPricingDescriptor, status_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnitPricingDescriptor, discounts_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WeightedPricingDescriptor, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WeightedPricingDescriptor, weight_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WeightedPricingDescriptor, tier_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WeightedPricingDescriptor, weightingrams_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FreebiePricingDescriptor, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingDescriptor, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingDescriptor, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingDescriptor, unit_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingDescriptor, weighted_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PricingDescriptor, freebie_),
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductPricing, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductPricing, discounts_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ProductPricing, manifest_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(PricingTierAvailability)},
-  { 7, -1, sizeof(UnitPricingDescriptor)},
-  { 15, -1, sizeof(WeightedPricingDescriptor)},
-  { 23, -1, sizeof(FreebiePricingDescriptor)},
-  { 28, -1, sizeof(PricingDescriptor)},
-  { 37, -1, sizeof(ProductPricing)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_PricingTierAvailability_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_UnitPricingDescriptor_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_WeightedPricingDescriptor_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_FreebiePricingDescriptor_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_PricingDescriptor_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&_ProductPricing_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "structs/pricing/PricingDescriptor.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 6);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  ::protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::InitDefaults();
-  _PricingTierAvailability_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_PricingTierAvailability_default_instance_);_UnitPricingDescriptor_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_UnitPricingDescriptor_default_instance_);_WeightedPricingDescriptor_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_WeightedPricingDescriptor_default_instance_);_FreebiePricingDescriptor_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_FreebiePricingDescriptor_default_instance_);_PricingDescriptor_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_PricingDescriptor_default_instance_);_ProductPricing_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_ProductPricing_default_instance_);_UnitPricingDescriptor_default_instance_._instance.get_mutable()->status_ = const_cast< ::PricingTierAvailability*>(
-      ::PricingTierAvailability::internal_default_instance());
-  _WeightedPricingDescriptor_default_instance_._instance.get_mutable()->tier_ = const_cast< ::UnitPricingDescriptor*>(
-      ::UnitPricingDescriptor::internal_default_instance());
-  _PricingDescriptor_default_instance_._instance.get_mutable()->unit_ = const_cast< ::UnitPricingDescriptor*>(
-      ::UnitPricingDescriptor::internal_default_instance());
-  _PricingDescriptor_default_instance_._instance.get_mutable()->weighted_ = const_cast< ::WeightedPricingDescriptor*>(
-      ::WeightedPricingDescriptor::internal_default_instance());
-  _PricingDescriptor_default_instance_._instance.get_mutable()->freebie_ = const_cast< ::FreebiePricingDescriptor*>(
-      ::FreebiePricingDescriptor::internal_default_instance());
-}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\'structs/pricing/PricingDescriptor.prot"
-      "o\032$structs/pricing/SaleDescriptor.proto\""
-      "=\n\027PricingTierAvailability\022\017\n\007offered\030\001 "
-      "\001(\010\022\021\n\tavailable\030\002 \001(\010\"z\n\025UnitPricingDes"
-      "criptor\022\023\n\013price_value\030\001 \001(\002\022(\n\006status\030\002"
-      " \001(\0132\030.PricingTierAvailability\022\"\n\tdiscou"
-      "nts\030\003 \003(\0132\017.SaleDescriptor\"|\n\031WeightedPr"
-      "icingDescriptor\022\"\n\006weight\030\001 \001(\0162\022.Pricin"
-      "gWeightTier\022$\n\004tier\030\002 \001(\0132\026.UnitPricingD"
-      "escriptor\022\025\n\rweightInGrams\030\003 \001(\002\"\032\n\030Free"
-      "biePricingDescriptor\"\257\001\n\021PricingDescript"
-      "or\022\032\n\004type\030\001 \001(\0162\014.PricingType\022$\n\004unit\030\024"
-      " \001(\0132\026.UnitPricingDescriptor\022,\n\010weighted"
-      "\030\025 \001(\0132\032.WeightedPricingDescriptor\022*\n\007fr"
-      "eebie\030\026 \001(\0132\031.FreebiePricingDescriptor\"Z"
-      "\n\016ProductPricing\022\"\n\tdiscounts\030\001 \003(\0132\017.Sa"
-      "leDescriptor\022$\n\010manifest\030\002 \003(\0132\022.Pricing"
-      "Descriptor*2\n\013PricingType\022\010\n\004UNIT\020\000\022\014\n\010W"
-      "EIGHTED\020\001\022\013\n\007FREEBIE\020\002*\211\001\n\021PricingWeight"
-      "Tier\022\t\n\005OTHER\020\000\022\010\n\004GRAM\020\001\022\014\n\010HALFGRAM\020\002\022"
-      "\017\n\013QUARTERGRAM\020\003\022\007\n\003DUB\020\004\022\n\n\006EIGHTH\020\005\022\013\n"
-      "\007QUARTER\020\006\022\010\n\004HALF\020\007\022\t\n\005OUNCE\020\010\022\t\n\005POUND"
-      "\020\tB>\n!io.bloombox.schema.product.structB"
-      "\022ProductPricingSpecH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 954);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "structs/pricing/PricingDescriptor.proto", &protobuf_RegisterTypes);
-  ::protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::AddDescriptors();
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_structs_2fpricing_2fPricingDescriptor_2eproto
-
-const ::google::protobuf::EnumDescriptor* PricingType_descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_enum_descriptors[0];
-}
-bool PricingType_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* PricingWeightTier_descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_enum_descriptors[1];
-}
-bool PricingWeightTier_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int PricingTierAvailability::kOfferedFieldNumber;
-const int PricingTierAvailability::kAvailableFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-PricingTierAvailability::PricingTierAvailability()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:PricingTierAvailability)
-}
-PricingTierAvailability::PricingTierAvailability(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:PricingTierAvailability)
-}
-PricingTierAvailability::PricingTierAvailability(const PricingTierAvailability& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::memcpy(&offered_, &from.offered_,
-    static_cast<size_t>(reinterpret_cast<char*>(&available_) -
-    reinterpret_cast<char*>(&offered_)) + sizeof(available_));
-  // @@protoc_insertion_point(copy_constructor:PricingTierAvailability)
-}
-
-void PricingTierAvailability::SharedCtor() {
-  ::memset(&offered_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&available_) -
-      reinterpret_cast<char*>(&offered_)) + sizeof(available_));
-  _cached_size_ = 0;
-}
-
-PricingTierAvailability::~PricingTierAvailability() {
-  // @@protoc_insertion_point(destructor:PricingTierAvailability)
-  SharedDtor();
-}
-
-void PricingTierAvailability::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void PricingTierAvailability::ArenaDtor(void* object) {
-  PricingTierAvailability* _this = reinterpret_cast< PricingTierAvailability* >(object);
-  (void)_this;
-}
-void PricingTierAvailability::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void PricingTierAvailability::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* PricingTierAvailability::descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const PricingTierAvailability& PricingTierAvailability::default_instance() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-PricingTierAvailability* PricingTierAvailability::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<PricingTierAvailability>(arena);
-}
-
-void PricingTierAvailability::Clear() {
-// @@protoc_insertion_point(message_clear_start:PricingTierAvailability)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&offered_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&available_) -
-      reinterpret_cast<char*>(&offered_)) + sizeof(available_));
-  _internal_metadata_.Clear();
-}
-
-bool PricingTierAvailability::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:PricingTierAvailability)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // bool offered = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &offered_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // bool available = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &available_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:PricingTierAvailability)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:PricingTierAvailability)
-  return false;
-#undef DO_
-}
-
-void PricingTierAvailability::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:PricingTierAvailability)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool offered = 1;
-  if (this->offered() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->offered(), output);
-  }
-
-  // bool available = 2;
-  if (this->available() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->available(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:PricingTierAvailability)
-}
-
-::google::protobuf::uint8* PricingTierAvailability::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:PricingTierAvailability)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool offered = 1;
-  if (this->offered() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->offered(), target);
-  }
-
-  // bool available = 2;
-  if (this->available() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->available(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:PricingTierAvailability)
-  return target;
-}
-
-size_t PricingTierAvailability::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:PricingTierAvailability)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // bool offered = 1;
-  if (this->offered() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // bool available = 2;
-  if (this->available() != 0) {
-    total_size += 1 + 1;
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void PricingTierAvailability::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:PricingTierAvailability)
-  GOOGLE_DCHECK_NE(&from, this);
-  const PricingTierAvailability* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const PricingTierAvailability>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:PricingTierAvailability)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:PricingTierAvailability)
-    MergeFrom(*source);
-  }
-}
-
-void PricingTierAvailability::MergeFrom(const PricingTierAvailability& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:PricingTierAvailability)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.offered() != 0) {
-    set_offered(from.offered());
-  }
-  if (from.available() != 0) {
-    set_available(from.available());
-  }
-}
-
-void PricingTierAvailability::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:PricingTierAvailability)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void PricingTierAvailability::CopyFrom(const PricingTierAvailability& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:PricingTierAvailability)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool PricingTierAvailability::IsInitialized() const {
-  return true;
-}
-
-void PricingTierAvailability::Swap(PricingTierAvailability* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    PricingTierAvailability* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void PricingTierAvailability::UnsafeArenaSwap(PricingTierAvailability* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void PricingTierAvailability::InternalSwap(PricingTierAvailability* other) {
-  using std::swap;
-  swap(offered_, other->offered_);
-  swap(available_, other->available_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata PricingTierAvailability::GetMetadata() const {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// PricingTierAvailability
-
-// bool offered = 1;
-void PricingTierAvailability::clear_offered() {
-  offered_ = false;
-}
-bool PricingTierAvailability::offered() const {
-  // @@protoc_insertion_point(field_get:PricingTierAvailability.offered)
-  return offered_;
-}
-void PricingTierAvailability::set_offered(bool value) {
-  
-  offered_ = value;
-  // @@protoc_insertion_point(field_set:PricingTierAvailability.offered)
-}
-
-// bool available = 2;
-void PricingTierAvailability::clear_available() {
-  available_ = false;
-}
-bool PricingTierAvailability::available() const {
-  // @@protoc_insertion_point(field_get:PricingTierAvailability.available)
-  return available_;
-}
-void PricingTierAvailability::set_available(bool value) {
-  
-  available_ = value;
-  // @@protoc_insertion_point(field_set:PricingTierAvailability.available)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-void UnitPricingDescriptor::_slow_mutable_status() {
-  status_ = ::google::protobuf::Arena::CreateMessage< ::PricingTierAvailability >(
-      GetArenaNoVirtual());
-}
-::PricingTierAvailability* UnitPricingDescriptor::_slow_release_status() {
-  if (status_ == NULL) {
-    return NULL;
-  } else {
-    ::PricingTierAvailability* temp = new ::PricingTierAvailability(*status_);
-    status_ = NULL;
-    return temp;
-  }
-}
-::PricingTierAvailability* UnitPricingDescriptor::unsafe_arena_release_status() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:UnitPricingDescriptor.status)
-  
-  ::PricingTierAvailability* temp = status_;
-  status_ = NULL;
-  return temp;
-}
-void UnitPricingDescriptor::_slow_set_allocated_status(
-    ::google::protobuf::Arena* message_arena, ::PricingTierAvailability** status) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*status) == NULL) {
-      message_arena->Own(*status);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*status)) {
-      ::PricingTierAvailability* new_status = 
-            ::google::protobuf::Arena::CreateMessage< ::PricingTierAvailability >(
-            message_arena);
-      new_status->CopyFrom(**status);
-      *status = new_status;
-    }
-}
-void UnitPricingDescriptor::unsafe_arena_set_allocated_status(
-    ::PricingTierAvailability* status) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete status_;
-  }
-  status_ = status;
-  if (status) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:UnitPricingDescriptor.status)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int UnitPricingDescriptor::kPriceValueFieldNumber;
-const int UnitPricingDescriptor::kStatusFieldNumber;
-const int UnitPricingDescriptor::kDiscountsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-UnitPricingDescriptor::UnitPricingDescriptor()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:UnitPricingDescriptor)
-}
-UnitPricingDescriptor::UnitPricingDescriptor(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena),
-  discounts_(arena) {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:UnitPricingDescriptor)
-}
-UnitPricingDescriptor::UnitPricingDescriptor(const UnitPricingDescriptor& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      discounts_(from.discounts_),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_status()) {
-    status_ = new ::PricingTierAvailability(*from.status_);
-  } else {
-    status_ = NULL;
-  }
-  price_value_ = from.price_value_;
-  // @@protoc_insertion_point(copy_constructor:UnitPricingDescriptor)
-}
-
-void UnitPricingDescriptor::SharedCtor() {
-  ::memset(&status_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&price_value_) -
-      reinterpret_cast<char*>(&status_)) + sizeof(price_value_));
-  _cached_size_ = 0;
-}
-
-UnitPricingDescriptor::~UnitPricingDescriptor() {
-  // @@protoc_insertion_point(destructor:UnitPricingDescriptor)
-  SharedDtor();
-}
-
-void UnitPricingDescriptor::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete status_;
-}
-
-void UnitPricingDescriptor::ArenaDtor(void* object) {
-  UnitPricingDescriptor* _this = reinterpret_cast< UnitPricingDescriptor* >(object);
-  (void)_this;
-}
-void UnitPricingDescriptor::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void UnitPricingDescriptor::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* UnitPricingDescriptor::descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const UnitPricingDescriptor& UnitPricingDescriptor::default_instance() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-UnitPricingDescriptor* UnitPricingDescriptor::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<UnitPricingDescriptor>(arena);
-}
-
-void UnitPricingDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:UnitPricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  discounts_.Clear();
-  if (GetArenaNoVirtual() == NULL && status_ != NULL) {
-    delete status_;
-  }
-  status_ = NULL;
-  price_value_ = 0;
-  _internal_metadata_.Clear();
-}
-
-bool UnitPricingDescriptor::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:UnitPricingDescriptor)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // float price_value = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(13u /* 13 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
-                 input, &price_value_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .PricingTierAvailability status = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_status()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // repeated .SaleDescriptor discounts = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_discounts()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:UnitPricingDescriptor)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:UnitPricingDescriptor)
-  return false;
-#undef DO_
-}
-
-void UnitPricingDescriptor::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:UnitPricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // float price_value = 1;
-  if (this->price_value() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteFloat(1, this->price_value(), output);
-  }
-
-  // .PricingTierAvailability status = 2;
-  if (this->has_status()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->status_, output);
-  }
-
-  // repeated .SaleDescriptor discounts = 3;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->discounts_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->discounts(static_cast<int>(i)), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:UnitPricingDescriptor)
-}
-
-::google::protobuf::uint8* UnitPricingDescriptor::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:UnitPricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // float price_value = 1;
-  if (this->price_value() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(1, this->price_value(), target);
-  }
-
-  // .PricingTierAvailability status = 2;
-  if (this->has_status()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->status_, deterministic, target);
-  }
-
-  // repeated .SaleDescriptor discounts = 3;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->discounts_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        3, this->discounts(static_cast<int>(i)), deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:UnitPricingDescriptor)
-  return target;
-}
-
-size_t UnitPricingDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:UnitPricingDescriptor)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // repeated .SaleDescriptor discounts = 3;
-  {
-    unsigned int count = static_cast<unsigned int>(this->discounts_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->discounts(static_cast<int>(i)));
-    }
-  }
-
-  // .PricingTierAvailability status = 2;
-  if (this->has_status()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->status_);
-  }
-
-  // float price_value = 1;
-  if (this->price_value() != 0) {
-    total_size += 1 + 4;
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void UnitPricingDescriptor::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:UnitPricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  const UnitPricingDescriptor* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const UnitPricingDescriptor>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:UnitPricingDescriptor)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:UnitPricingDescriptor)
-    MergeFrom(*source);
-  }
-}
-
-void UnitPricingDescriptor::MergeFrom(const UnitPricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:UnitPricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  discounts_.MergeFrom(from.discounts_);
-  if (from.has_status()) {
-    mutable_status()->::PricingTierAvailability::MergeFrom(from.status());
-  }
-  if (from.price_value() != 0) {
-    set_price_value(from.price_value());
-  }
-}
-
-void UnitPricingDescriptor::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:UnitPricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void UnitPricingDescriptor::CopyFrom(const UnitPricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:UnitPricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool UnitPricingDescriptor::IsInitialized() const {
-  return true;
-}
-
-void UnitPricingDescriptor::Swap(UnitPricingDescriptor* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    UnitPricingDescriptor* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void UnitPricingDescriptor::UnsafeArenaSwap(UnitPricingDescriptor* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void UnitPricingDescriptor::InternalSwap(UnitPricingDescriptor* other) {
-  using std::swap;
-  discounts_.InternalSwap(&other->discounts_);
-  swap(status_, other->status_);
-  swap(price_value_, other->price_value_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata UnitPricingDescriptor::GetMetadata() const {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// UnitPricingDescriptor
-
-// float price_value = 1;
-void UnitPricingDescriptor::clear_price_value() {
-  price_value_ = 0;
-}
-float UnitPricingDescriptor::price_value() const {
-  // @@protoc_insertion_point(field_get:UnitPricingDescriptor.price_value)
-  return price_value_;
-}
-void UnitPricingDescriptor::set_price_value(float value) {
-  
-  price_value_ = value;
-  // @@protoc_insertion_point(field_set:UnitPricingDescriptor.price_value)
-}
-
-// .PricingTierAvailability status = 2;
-bool UnitPricingDescriptor::has_status() const {
-  return this != internal_default_instance() && status_ != NULL;
-}
-void UnitPricingDescriptor::clear_status() {
-  if (GetArenaNoVirtual() == NULL && status_ != NULL) delete status_;
-  status_ = NULL;
-}
-const ::PricingTierAvailability& UnitPricingDescriptor::status() const {
-  const ::PricingTierAvailability* p = status_;
-  // @@protoc_insertion_point(field_get:UnitPricingDescriptor.status)
-  return p != NULL ? *p : *reinterpret_cast<const ::PricingTierAvailability*>(
-      &::_PricingTierAvailability_default_instance_);
-}
-::PricingTierAvailability* UnitPricingDescriptor::mutable_status() {
-  
-  if (status_ == NULL) {
-    _slow_mutable_status();
-  }
-  // @@protoc_insertion_point(field_mutable:UnitPricingDescriptor.status)
-  return status_;
-}
-::PricingTierAvailability* UnitPricingDescriptor::release_status() {
-  // @@protoc_insertion_point(field_release:UnitPricingDescriptor.status)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_status();
-  } else {
-    ::PricingTierAvailability* temp = status_;
-    status_ = NULL;
-    return temp;
-  }
-}
- void UnitPricingDescriptor::set_allocated_status(::PricingTierAvailability* status) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete status_;
-  }
-  if (status != NULL) {
-    _slow_set_allocated_status(message_arena, &status);
-  }
-  status_ = status;
-  if (status) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:UnitPricingDescriptor.status)
-}
-
-// repeated .SaleDescriptor discounts = 3;
-int UnitPricingDescriptor::discounts_size() const {
-  return discounts_.size();
-}
-void UnitPricingDescriptor::clear_discounts() {
-  discounts_.Clear();
-}
-const ::SaleDescriptor& UnitPricingDescriptor::discounts(int index) const {
-  // @@protoc_insertion_point(field_get:UnitPricingDescriptor.discounts)
-  return discounts_.Get(index);
-}
-::SaleDescriptor* UnitPricingDescriptor::mutable_discounts(int index) {
-  // @@protoc_insertion_point(field_mutable:UnitPricingDescriptor.discounts)
-  return discounts_.Mutable(index);
-}
-::SaleDescriptor* UnitPricingDescriptor::add_discounts() {
-  // @@protoc_insertion_point(field_add:UnitPricingDescriptor.discounts)
-  return discounts_.Add();
-}
-::google::protobuf::RepeatedPtrField< ::SaleDescriptor >*
-UnitPricingDescriptor::mutable_discounts() {
-  // @@protoc_insertion_point(field_mutable_list:UnitPricingDescriptor.discounts)
-  return &discounts_;
-}
-const ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >&
-UnitPricingDescriptor::discounts() const {
-  // @@protoc_insertion_point(field_list:UnitPricingDescriptor.discounts)
-  return discounts_;
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-void WeightedPricingDescriptor::_slow_mutable_tier() {
-  tier_ = ::google::protobuf::Arena::CreateMessage< ::UnitPricingDescriptor >(
-      GetArenaNoVirtual());
-}
-::UnitPricingDescriptor* WeightedPricingDescriptor::_slow_release_tier() {
-  if (tier_ == NULL) {
-    return NULL;
-  } else {
-    ::UnitPricingDescriptor* temp = new ::UnitPricingDescriptor(*tier_);
-    tier_ = NULL;
-    return temp;
-  }
-}
-::UnitPricingDescriptor* WeightedPricingDescriptor::unsafe_arena_release_tier() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:WeightedPricingDescriptor.tier)
-  
-  ::UnitPricingDescriptor* temp = tier_;
-  tier_ = NULL;
-  return temp;
-}
-void WeightedPricingDescriptor::_slow_set_allocated_tier(
-    ::google::protobuf::Arena* message_arena, ::UnitPricingDescriptor** tier) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*tier) == NULL) {
-      message_arena->Own(*tier);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*tier)) {
-      ::UnitPricingDescriptor* new_tier = 
-            ::google::protobuf::Arena::CreateMessage< ::UnitPricingDescriptor >(
-            message_arena);
-      new_tier->CopyFrom(**tier);
-      *tier = new_tier;
-    }
-}
-void WeightedPricingDescriptor::unsafe_arena_set_allocated_tier(
-    ::UnitPricingDescriptor* tier) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete tier_;
-  }
-  tier_ = tier;
-  if (tier) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:WeightedPricingDescriptor.tier)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int WeightedPricingDescriptor::kWeightFieldNumber;
-const int WeightedPricingDescriptor::kTierFieldNumber;
-const int WeightedPricingDescriptor::kWeightInGramsFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-WeightedPricingDescriptor::WeightedPricingDescriptor()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:WeightedPricingDescriptor)
-}
-WeightedPricingDescriptor::WeightedPricingDescriptor(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:WeightedPricingDescriptor)
-}
-WeightedPricingDescriptor::WeightedPricingDescriptor(const WeightedPricingDescriptor& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_tier()) {
-    tier_ = new ::UnitPricingDescriptor(*from.tier_);
-  } else {
-    tier_ = NULL;
-  }
-  ::memcpy(&weight_, &from.weight_,
-    static_cast<size_t>(reinterpret_cast<char*>(&weightingrams_) -
-    reinterpret_cast<char*>(&weight_)) + sizeof(weightingrams_));
-  // @@protoc_insertion_point(copy_constructor:WeightedPricingDescriptor)
-}
-
-void WeightedPricingDescriptor::SharedCtor() {
-  ::memset(&tier_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&weightingrams_) -
-      reinterpret_cast<char*>(&tier_)) + sizeof(weightingrams_));
-  _cached_size_ = 0;
-}
-
-WeightedPricingDescriptor::~WeightedPricingDescriptor() {
-  // @@protoc_insertion_point(destructor:WeightedPricingDescriptor)
-  SharedDtor();
-}
-
-void WeightedPricingDescriptor::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete tier_;
-}
-
-void WeightedPricingDescriptor::ArenaDtor(void* object) {
-  WeightedPricingDescriptor* _this = reinterpret_cast< WeightedPricingDescriptor* >(object);
-  (void)_this;
-}
-void WeightedPricingDescriptor::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void WeightedPricingDescriptor::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* WeightedPricingDescriptor::descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const WeightedPricingDescriptor& WeightedPricingDescriptor::default_instance() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-WeightedPricingDescriptor* WeightedPricingDescriptor::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<WeightedPricingDescriptor>(arena);
-}
-
-void WeightedPricingDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:WeightedPricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == NULL && tier_ != NULL) {
-    delete tier_;
-  }
-  tier_ = NULL;
-  ::memset(&weight_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&weightingrams_) -
-      reinterpret_cast<char*>(&weight_)) + sizeof(weightingrams_));
-  _internal_metadata_.Clear();
-}
-
-bool WeightedPricingDescriptor::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:WeightedPricingDescriptor)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .PricingWeightTier weight = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_weight(static_cast< ::PricingWeightTier >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .UnitPricingDescriptor tier = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tier()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // float weightInGrams = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(29u /* 29 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
-                 input, &weightingrams_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:WeightedPricingDescriptor)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:WeightedPricingDescriptor)
-  return false;
-#undef DO_
-}
-
-void WeightedPricingDescriptor::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:WeightedPricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .PricingWeightTier weight = 1;
-  if (this->weight() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->weight(), output);
-  }
-
-  // .UnitPricingDescriptor tier = 2;
-  if (this->has_tier()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, *this->tier_, output);
-  }
-
-  // float weightInGrams = 3;
-  if (this->weightingrams() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteFloat(3, this->weightingrams(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:WeightedPricingDescriptor)
-}
-
-::google::protobuf::uint8* WeightedPricingDescriptor::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:WeightedPricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .PricingWeightTier weight = 1;
-  if (this->weight() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->weight(), target);
-  }
-
-  // .UnitPricingDescriptor tier = 2;
-  if (this->has_tier()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, *this->tier_, deterministic, target);
-  }
-
-  // float weightInGrams = 3;
-  if (this->weightingrams() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(3, this->weightingrams(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:WeightedPricingDescriptor)
-  return target;
-}
-
-size_t WeightedPricingDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:WeightedPricingDescriptor)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .UnitPricingDescriptor tier = 2;
-  if (this->has_tier()) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->tier_);
-  }
-
-  // .PricingWeightTier weight = 1;
-  if (this->weight() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->weight());
-  }
-
-  // float weightInGrams = 3;
-  if (this->weightingrams() != 0) {
-    total_size += 1 + 4;
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void WeightedPricingDescriptor::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:WeightedPricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  const WeightedPricingDescriptor* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const WeightedPricingDescriptor>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:WeightedPricingDescriptor)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:WeightedPricingDescriptor)
-    MergeFrom(*source);
-  }
-}
-
-void WeightedPricingDescriptor::MergeFrom(const WeightedPricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:WeightedPricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_tier()) {
-    mutable_tier()->::UnitPricingDescriptor::MergeFrom(from.tier());
-  }
-  if (from.weight() != 0) {
-    set_weight(from.weight());
-  }
-  if (from.weightingrams() != 0) {
-    set_weightingrams(from.weightingrams());
-  }
-}
-
-void WeightedPricingDescriptor::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:WeightedPricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void WeightedPricingDescriptor::CopyFrom(const WeightedPricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:WeightedPricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool WeightedPricingDescriptor::IsInitialized() const {
-  return true;
-}
-
-void WeightedPricingDescriptor::Swap(WeightedPricingDescriptor* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    WeightedPricingDescriptor* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void WeightedPricingDescriptor::UnsafeArenaSwap(WeightedPricingDescriptor* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void WeightedPricingDescriptor::InternalSwap(WeightedPricingDescriptor* other) {
-  using std::swap;
-  swap(tier_, other->tier_);
-  swap(weight_, other->weight_);
-  swap(weightingrams_, other->weightingrams_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata WeightedPricingDescriptor::GetMetadata() const {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// WeightedPricingDescriptor
-
-// .PricingWeightTier weight = 1;
-void WeightedPricingDescriptor::clear_weight() {
-  weight_ = 0;
-}
-::PricingWeightTier WeightedPricingDescriptor::weight() const {
-  // @@protoc_insertion_point(field_get:WeightedPricingDescriptor.weight)
-  return static_cast< ::PricingWeightTier >(weight_);
-}
-void WeightedPricingDescriptor::set_weight(::PricingWeightTier value) {
-  
-  weight_ = value;
-  // @@protoc_insertion_point(field_set:WeightedPricingDescriptor.weight)
-}
-
-// .UnitPricingDescriptor tier = 2;
-bool WeightedPricingDescriptor::has_tier() const {
-  return this != internal_default_instance() && tier_ != NULL;
-}
-void WeightedPricingDescriptor::clear_tier() {
-  if (GetArenaNoVirtual() == NULL && tier_ != NULL) delete tier_;
-  tier_ = NULL;
-}
-const ::UnitPricingDescriptor& WeightedPricingDescriptor::tier() const {
-  const ::UnitPricingDescriptor* p = tier_;
-  // @@protoc_insertion_point(field_get:WeightedPricingDescriptor.tier)
-  return p != NULL ? *p : *reinterpret_cast<const ::UnitPricingDescriptor*>(
-      &::_UnitPricingDescriptor_default_instance_);
-}
-::UnitPricingDescriptor* WeightedPricingDescriptor::mutable_tier() {
-  
-  if (tier_ == NULL) {
-    _slow_mutable_tier();
-  }
-  // @@protoc_insertion_point(field_mutable:WeightedPricingDescriptor.tier)
-  return tier_;
-}
-::UnitPricingDescriptor* WeightedPricingDescriptor::release_tier() {
-  // @@protoc_insertion_point(field_release:WeightedPricingDescriptor.tier)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_tier();
-  } else {
-    ::UnitPricingDescriptor* temp = tier_;
-    tier_ = NULL;
-    return temp;
-  }
-}
- void WeightedPricingDescriptor::set_allocated_tier(::UnitPricingDescriptor* tier) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete tier_;
-  }
-  if (tier != NULL) {
-    _slow_set_allocated_tier(message_arena, &tier);
-  }
-  tier_ = tier;
-  if (tier) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:WeightedPricingDescriptor.tier)
-}
-
-// float weightInGrams = 3;
-void WeightedPricingDescriptor::clear_weightingrams() {
-  weightingrams_ = 0;
-}
-float WeightedPricingDescriptor::weightingrams() const {
-  // @@protoc_insertion_point(field_get:WeightedPricingDescriptor.weightInGrams)
-  return weightingrams_;
-}
-void WeightedPricingDescriptor::set_weightingrams(float value) {
-  
-  weightingrams_ = value;
-  // @@protoc_insertion_point(field_set:WeightedPricingDescriptor.weightInGrams)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-FreebiePricingDescriptor::FreebiePricingDescriptor()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:FreebiePricingDescriptor)
-}
-FreebiePricingDescriptor::FreebiePricingDescriptor(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:FreebiePricingDescriptor)
-}
-FreebiePricingDescriptor::FreebiePricingDescriptor(const FreebiePricingDescriptor& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:FreebiePricingDescriptor)
-}
-
-void FreebiePricingDescriptor::SharedCtor() {
-  _cached_size_ = 0;
-}
-
-FreebiePricingDescriptor::~FreebiePricingDescriptor() {
-  // @@protoc_insertion_point(destructor:FreebiePricingDescriptor)
-  SharedDtor();
-}
-
-void FreebiePricingDescriptor::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void FreebiePricingDescriptor::ArenaDtor(void* object) {
-  FreebiePricingDescriptor* _this = reinterpret_cast< FreebiePricingDescriptor* >(object);
-  (void)_this;
-}
-void FreebiePricingDescriptor::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void FreebiePricingDescriptor::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* FreebiePricingDescriptor::descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const FreebiePricingDescriptor& FreebiePricingDescriptor::default_instance() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-FreebiePricingDescriptor* FreebiePricingDescriptor::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<FreebiePricingDescriptor>(arena);
-}
-
-void FreebiePricingDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:FreebiePricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _internal_metadata_.Clear();
-}
-
-bool FreebiePricingDescriptor::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:FreebiePricingDescriptor)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-  handle_unusual:
-    if (tag == 0) {
-      goto success;
-    }
-    DO_(::google::protobuf::internal::WireFormat::SkipField(
-          input, tag, _internal_metadata_.mutable_unknown_fields()));
-  }
-success:
-  // @@protoc_insertion_point(parse_success:FreebiePricingDescriptor)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:FreebiePricingDescriptor)
-  return false;
-#undef DO_
-}
-
-void FreebiePricingDescriptor::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:FreebiePricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:FreebiePricingDescriptor)
-}
-
-::google::protobuf::uint8* FreebiePricingDescriptor::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:FreebiePricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:FreebiePricingDescriptor)
-  return target;
-}
-
-size_t FreebiePricingDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:FreebiePricingDescriptor)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void FreebiePricingDescriptor::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:FreebiePricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  const FreebiePricingDescriptor* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const FreebiePricingDescriptor>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:FreebiePricingDescriptor)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:FreebiePricingDescriptor)
-    MergeFrom(*source);
-  }
-}
-
-void FreebiePricingDescriptor::MergeFrom(const FreebiePricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:FreebiePricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-}
-
-void FreebiePricingDescriptor::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:FreebiePricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void FreebiePricingDescriptor::CopyFrom(const FreebiePricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:FreebiePricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FreebiePricingDescriptor::IsInitialized() const {
-  return true;
-}
-
-void FreebiePricingDescriptor::Swap(FreebiePricingDescriptor* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    FreebiePricingDescriptor* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void FreebiePricingDescriptor::UnsafeArenaSwap(FreebiePricingDescriptor* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void FreebiePricingDescriptor::InternalSwap(FreebiePricingDescriptor* other) {
-  using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata FreebiePricingDescriptor::GetMetadata() const {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// FreebiePricingDescriptor
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-void PricingDescriptor::_slow_mutable_unit() {
-  unit_ = ::google::protobuf::Arena::CreateMessage< ::UnitPricingDescriptor >(
-      GetArenaNoVirtual());
-}
-::UnitPricingDescriptor* PricingDescriptor::_slow_release_unit() {
-  if (unit_ == NULL) {
-    return NULL;
-  } else {
-    ::UnitPricingDescriptor* temp = new ::UnitPricingDescriptor(*unit_);
-    unit_ = NULL;
-    return temp;
-  }
-}
-::UnitPricingDescriptor* PricingDescriptor::unsafe_arena_release_unit() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:PricingDescriptor.unit)
-  
-  ::UnitPricingDescriptor* temp = unit_;
-  unit_ = NULL;
-  return temp;
-}
-void PricingDescriptor::_slow_set_allocated_unit(
-    ::google::protobuf::Arena* message_arena, ::UnitPricingDescriptor** unit) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*unit) == NULL) {
-      message_arena->Own(*unit);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*unit)) {
-      ::UnitPricingDescriptor* new_unit = 
-            ::google::protobuf::Arena::CreateMessage< ::UnitPricingDescriptor >(
-            message_arena);
-      new_unit->CopyFrom(**unit);
-      *unit = new_unit;
-    }
-}
-void PricingDescriptor::unsafe_arena_set_allocated_unit(
-    ::UnitPricingDescriptor* unit) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete unit_;
-  }
-  unit_ = unit;
-  if (unit) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:PricingDescriptor.unit)
-}
-void PricingDescriptor::_slow_mutable_weighted() {
-  weighted_ = ::google::protobuf::Arena::CreateMessage< ::WeightedPricingDescriptor >(
-      GetArenaNoVirtual());
-}
-::WeightedPricingDescriptor* PricingDescriptor::_slow_release_weighted() {
-  if (weighted_ == NULL) {
-    return NULL;
-  } else {
-    ::WeightedPricingDescriptor* temp = new ::WeightedPricingDescriptor(*weighted_);
-    weighted_ = NULL;
-    return temp;
-  }
-}
-::WeightedPricingDescriptor* PricingDescriptor::unsafe_arena_release_weighted() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:PricingDescriptor.weighted)
-  
-  ::WeightedPricingDescriptor* temp = weighted_;
-  weighted_ = NULL;
-  return temp;
-}
-void PricingDescriptor::_slow_set_allocated_weighted(
-    ::google::protobuf::Arena* message_arena, ::WeightedPricingDescriptor** weighted) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*weighted) == NULL) {
-      message_arena->Own(*weighted);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*weighted)) {
-      ::WeightedPricingDescriptor* new_weighted = 
-            ::google::protobuf::Arena::CreateMessage< ::WeightedPricingDescriptor >(
-            message_arena);
-      new_weighted->CopyFrom(**weighted);
-      *weighted = new_weighted;
-    }
-}
-void PricingDescriptor::unsafe_arena_set_allocated_weighted(
-    ::WeightedPricingDescriptor* weighted) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete weighted_;
-  }
-  weighted_ = weighted;
-  if (weighted) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:PricingDescriptor.weighted)
-}
-void PricingDescriptor::_slow_mutable_freebie() {
-  freebie_ = ::google::protobuf::Arena::CreateMessage< ::FreebiePricingDescriptor >(
-      GetArenaNoVirtual());
-}
-::FreebiePricingDescriptor* PricingDescriptor::_slow_release_freebie() {
-  if (freebie_ == NULL) {
-    return NULL;
-  } else {
-    ::FreebiePricingDescriptor* temp = new ::FreebiePricingDescriptor(*freebie_);
-    freebie_ = NULL;
-    return temp;
-  }
-}
-::FreebiePricingDescriptor* PricingDescriptor::unsafe_arena_release_freebie() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:PricingDescriptor.freebie)
-  
-  ::FreebiePricingDescriptor* temp = freebie_;
-  freebie_ = NULL;
-  return temp;
-}
-void PricingDescriptor::_slow_set_allocated_freebie(
-    ::google::protobuf::Arena* message_arena, ::FreebiePricingDescriptor** freebie) {
-    if (message_arena != NULL && 
-        ::google::protobuf::Arena::GetArena(*freebie) == NULL) {
-      message_arena->Own(*freebie);
-    } else if (message_arena !=
-               ::google::protobuf::Arena::GetArena(*freebie)) {
-      ::FreebiePricingDescriptor* new_freebie = 
-            ::google::protobuf::Arena::CreateMessage< ::FreebiePricingDescriptor >(
-            message_arena);
-      new_freebie->CopyFrom(**freebie);
-      *freebie = new_freebie;
-    }
-}
-void PricingDescriptor::unsafe_arena_set_allocated_freebie(
-    ::FreebiePricingDescriptor* freebie) {
-  if (GetArenaNoVirtual() == NULL) {
-    delete freebie_;
-  }
-  freebie_ = freebie;
-  if (freebie) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:PricingDescriptor.freebie)
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int PricingDescriptor::kTypeFieldNumber;
-const int PricingDescriptor::kUnitFieldNumber;
-const int PricingDescriptor::kWeightedFieldNumber;
-const int PricingDescriptor::kFreebieFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-PricingDescriptor::PricingDescriptor()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:PricingDescriptor)
-}
-PricingDescriptor::PricingDescriptor(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:PricingDescriptor)
-}
-PricingDescriptor::PricingDescriptor(const PricingDescriptor& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_unit()) {
-    unit_ = new ::UnitPricingDescriptor(*from.unit_);
-  } else {
-    unit_ = NULL;
-  }
-  if (from.has_weighted()) {
-    weighted_ = new ::WeightedPricingDescriptor(*from.weighted_);
-  } else {
-    weighted_ = NULL;
-  }
-  if (from.has_freebie()) {
-    freebie_ = new ::FreebiePricingDescriptor(*from.freebie_);
-  } else {
-    freebie_ = NULL;
-  }
-  type_ = from.type_;
-  // @@protoc_insertion_point(copy_constructor:PricingDescriptor)
-}
-
-void PricingDescriptor::SharedCtor() {
-  ::memset(&unit_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&type_) -
-      reinterpret_cast<char*>(&unit_)) + sizeof(type_));
-  _cached_size_ = 0;
-}
-
-PricingDescriptor::~PricingDescriptor() {
-  // @@protoc_insertion_point(destructor:PricingDescriptor)
-  SharedDtor();
-}
-
-void PricingDescriptor::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-  if (this != internal_default_instance()) delete unit_;
-  if (this != internal_default_instance()) delete weighted_;
-  if (this != internal_default_instance()) delete freebie_;
-}
-
-void PricingDescriptor::ArenaDtor(void* object) {
-  PricingDescriptor* _this = reinterpret_cast< PricingDescriptor* >(object);
-  (void)_this;
-}
-void PricingDescriptor::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void PricingDescriptor::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* PricingDescriptor::descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const PricingDescriptor& PricingDescriptor::default_instance() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-PricingDescriptor* PricingDescriptor::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<PricingDescriptor>(arena);
-}
-
-void PricingDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:PricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  if (GetArenaNoVirtual() == NULL && unit_ != NULL) {
-    delete unit_;
-  }
-  unit_ = NULL;
-  if (GetArenaNoVirtual() == NULL && weighted_ != NULL) {
-    delete weighted_;
-  }
-  weighted_ = NULL;
-  if (GetArenaNoVirtual() == NULL && freebie_ != NULL) {
-    delete freebie_;
-  }
-  freebie_ = NULL;
-  type_ = 0;
-  _internal_metadata_.Clear();
-}
-
-bool PricingDescriptor::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:PricingDescriptor)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .PricingType type = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_type(static_cast< ::PricingType >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .UnitPricingDescriptor unit = 20;
-      case 20: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(162u /* 162 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_unit()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .WeightedPricingDescriptor weighted = 21;
-      case 21: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(170u /* 170 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_weighted()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // .FreebiePricingDescriptor freebie = 22;
-      case 22: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(178u /* 178 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_freebie()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:PricingDescriptor)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:PricingDescriptor)
-  return false;
-#undef DO_
-}
-
-void PricingDescriptor::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:PricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .PricingType type = 1;
-  if (this->type() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->type(), output);
-  }
-
-  // .UnitPricingDescriptor unit = 20;
-  if (this->has_unit()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, *this->unit_, output);
-  }
-
-  // .WeightedPricingDescriptor weighted = 21;
-  if (this->has_weighted()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      21, *this->weighted_, output);
-  }
-
-  // .FreebiePricingDescriptor freebie = 22;
-  if (this->has_freebie()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      22, *this->freebie_, output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:PricingDescriptor)
-}
-
-::google::protobuf::uint8* PricingDescriptor::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:PricingDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .PricingType type = 1;
-  if (this->type() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->type(), target);
-  }
-
-  // .UnitPricingDescriptor unit = 20;
-  if (this->has_unit()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        20, *this->unit_, deterministic, target);
-  }
-
-  // .WeightedPricingDescriptor weighted = 21;
-  if (this->has_weighted()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        21, *this->weighted_, deterministic, target);
-  }
-
-  // .FreebiePricingDescriptor freebie = 22;
-  if (this->has_freebie()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        22, *this->freebie_, deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:PricingDescriptor)
-  return target;
-}
-
-size_t PricingDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:PricingDescriptor)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // .UnitPricingDescriptor unit = 20;
-  if (this->has_unit()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->unit_);
-  }
-
-  // .WeightedPricingDescriptor weighted = 21;
-  if (this->has_weighted()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->weighted_);
-  }
-
-  // .FreebiePricingDescriptor freebie = 22;
-  if (this->has_freebie()) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        *this->freebie_);
-  }
-
-  // .PricingType type = 1;
-  if (this->type() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void PricingDescriptor::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:PricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  const PricingDescriptor* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const PricingDescriptor>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:PricingDescriptor)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:PricingDescriptor)
-    MergeFrom(*source);
-  }
-}
-
-void PricingDescriptor::MergeFrom(const PricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:PricingDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.has_unit()) {
-    mutable_unit()->::UnitPricingDescriptor::MergeFrom(from.unit());
-  }
-  if (from.has_weighted()) {
-    mutable_weighted()->::WeightedPricingDescriptor::MergeFrom(from.weighted());
-  }
-  if (from.has_freebie()) {
-    mutable_freebie()->::FreebiePricingDescriptor::MergeFrom(from.freebie());
-  }
-  if (from.type() != 0) {
-    set_type(from.type());
-  }
-}
-
-void PricingDescriptor::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:PricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void PricingDescriptor::CopyFrom(const PricingDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:PricingDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool PricingDescriptor::IsInitialized() const {
-  return true;
-}
-
-void PricingDescriptor::Swap(PricingDescriptor* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    PricingDescriptor* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void PricingDescriptor::UnsafeArenaSwap(PricingDescriptor* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void PricingDescriptor::InternalSwap(PricingDescriptor* other) {
-  using std::swap;
-  swap(unit_, other->unit_);
-  swap(weighted_, other->weighted_);
-  swap(freebie_, other->freebie_);
-  swap(type_, other->type_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata PricingDescriptor::GetMetadata() const {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// PricingDescriptor
-
-// .PricingType type = 1;
-void PricingDescriptor::clear_type() {
-  type_ = 0;
-}
-::PricingType PricingDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:PricingDescriptor.type)
-  return static_cast< ::PricingType >(type_);
-}
-void PricingDescriptor::set_type(::PricingType value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:PricingDescriptor.type)
-}
-
-// .UnitPricingDescriptor unit = 20;
-bool PricingDescriptor::has_unit() const {
-  return this != internal_default_instance() && unit_ != NULL;
-}
-void PricingDescriptor::clear_unit() {
-  if (GetArenaNoVirtual() == NULL && unit_ != NULL) delete unit_;
-  unit_ = NULL;
-}
-const ::UnitPricingDescriptor& PricingDescriptor::unit() const {
-  const ::UnitPricingDescriptor* p = unit_;
-  // @@protoc_insertion_point(field_get:PricingDescriptor.unit)
-  return p != NULL ? *p : *reinterpret_cast<const ::UnitPricingDescriptor*>(
-      &::_UnitPricingDescriptor_default_instance_);
-}
-::UnitPricingDescriptor* PricingDescriptor::mutable_unit() {
-  
-  if (unit_ == NULL) {
-    _slow_mutable_unit();
-  }
-  // @@protoc_insertion_point(field_mutable:PricingDescriptor.unit)
-  return unit_;
-}
-::UnitPricingDescriptor* PricingDescriptor::release_unit() {
-  // @@protoc_insertion_point(field_release:PricingDescriptor.unit)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_unit();
-  } else {
-    ::UnitPricingDescriptor* temp = unit_;
-    unit_ = NULL;
-    return temp;
-  }
-}
- void PricingDescriptor::set_allocated_unit(::UnitPricingDescriptor* unit) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete unit_;
-  }
-  if (unit != NULL) {
-    _slow_set_allocated_unit(message_arena, &unit);
-  }
-  unit_ = unit;
-  if (unit) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:PricingDescriptor.unit)
-}
-
-// .WeightedPricingDescriptor weighted = 21;
-bool PricingDescriptor::has_weighted() const {
-  return this != internal_default_instance() && weighted_ != NULL;
-}
-void PricingDescriptor::clear_weighted() {
-  if (GetArenaNoVirtual() == NULL && weighted_ != NULL) delete weighted_;
-  weighted_ = NULL;
-}
-const ::WeightedPricingDescriptor& PricingDescriptor::weighted() const {
-  const ::WeightedPricingDescriptor* p = weighted_;
-  // @@protoc_insertion_point(field_get:PricingDescriptor.weighted)
-  return p != NULL ? *p : *reinterpret_cast<const ::WeightedPricingDescriptor*>(
-      &::_WeightedPricingDescriptor_default_instance_);
-}
-::WeightedPricingDescriptor* PricingDescriptor::mutable_weighted() {
-  
-  if (weighted_ == NULL) {
-    _slow_mutable_weighted();
-  }
-  // @@protoc_insertion_point(field_mutable:PricingDescriptor.weighted)
-  return weighted_;
-}
-::WeightedPricingDescriptor* PricingDescriptor::release_weighted() {
-  // @@protoc_insertion_point(field_release:PricingDescriptor.weighted)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_weighted();
-  } else {
-    ::WeightedPricingDescriptor* temp = weighted_;
-    weighted_ = NULL;
-    return temp;
-  }
-}
- void PricingDescriptor::set_allocated_weighted(::WeightedPricingDescriptor* weighted) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete weighted_;
-  }
-  if (weighted != NULL) {
-    _slow_set_allocated_weighted(message_arena, &weighted);
-  }
-  weighted_ = weighted;
-  if (weighted) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:PricingDescriptor.weighted)
-}
-
-// .FreebiePricingDescriptor freebie = 22;
-bool PricingDescriptor::has_freebie() const {
-  return this != internal_default_instance() && freebie_ != NULL;
-}
-void PricingDescriptor::clear_freebie() {
-  if (GetArenaNoVirtual() == NULL && freebie_ != NULL) delete freebie_;
-  freebie_ = NULL;
-}
-const ::FreebiePricingDescriptor& PricingDescriptor::freebie() const {
-  const ::FreebiePricingDescriptor* p = freebie_;
-  // @@protoc_insertion_point(field_get:PricingDescriptor.freebie)
-  return p != NULL ? *p : *reinterpret_cast<const ::FreebiePricingDescriptor*>(
-      &::_FreebiePricingDescriptor_default_instance_);
-}
-::FreebiePricingDescriptor* PricingDescriptor::mutable_freebie() {
-  
-  if (freebie_ == NULL) {
-    _slow_mutable_freebie();
-  }
-  // @@protoc_insertion_point(field_mutable:PricingDescriptor.freebie)
-  return freebie_;
-}
-::FreebiePricingDescriptor* PricingDescriptor::release_freebie() {
-  // @@protoc_insertion_point(field_release:PricingDescriptor.freebie)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_freebie();
-  } else {
-    ::FreebiePricingDescriptor* temp = freebie_;
-    freebie_ = NULL;
-    return temp;
-  }
-}
- void PricingDescriptor::set_allocated_freebie(::FreebiePricingDescriptor* freebie) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete freebie_;
-  }
-  if (freebie != NULL) {
-    _slow_set_allocated_freebie(message_arena, &freebie);
-  }
-  freebie_ = freebie;
-  if (freebie) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:PricingDescriptor.freebie)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ProductPricing::kDiscountsFieldNumber;
-const int ProductPricing::kManifestFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-ProductPricing::ProductPricing()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:ProductPricing)
-}
-ProductPricing::ProductPricing(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena),
-  discounts_(arena),
-  manifest_(arena) {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:ProductPricing)
-}
-ProductPricing::ProductPricing(const ProductPricing& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      discounts_(from.discounts_),
-      manifest_(from.manifest_),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:ProductPricing)
-}
-
-void ProductPricing::SharedCtor() {
-  _cached_size_ = 0;
-}
-
-ProductPricing::~ProductPricing() {
-  // @@protoc_insertion_point(destructor:ProductPricing)
-  SharedDtor();
-}
-
-void ProductPricing::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void ProductPricing::ArenaDtor(void* object) {
-  ProductPricing* _this = reinterpret_cast< ProductPricing* >(object);
-  (void)_this;
-}
-void ProductPricing::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void ProductPricing::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ProductPricing::descriptor() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const ProductPricing& ProductPricing::default_instance() {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-ProductPricing* ProductPricing::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<ProductPricing>(arena);
-}
-
-void ProductPricing::Clear() {
-// @@protoc_insertion_point(message_clear_start:ProductPricing)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  discounts_.Clear();
-  manifest_.Clear();
-  _internal_metadata_.Clear();
-}
-
-bool ProductPricing::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:ProductPricing)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .SaleDescriptor discounts = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_discounts()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // repeated .PricingDescriptor manifest = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_manifest()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:ProductPricing)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:ProductPricing)
-  return false;
-#undef DO_
-}
-
-void ProductPricing::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:ProductPricing)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .SaleDescriptor discounts = 1;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->discounts_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->discounts(static_cast<int>(i)), output);
-  }
-
-  // repeated .PricingDescriptor manifest = 2;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->manifest_size()); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->manifest(static_cast<int>(i)), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:ProductPricing)
-}
-
-::google::protobuf::uint8* ProductPricing::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:ProductPricing)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .SaleDescriptor discounts = 1;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->discounts_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        1, this->discounts(static_cast<int>(i)), deterministic, target);
-  }
-
-  // repeated .PricingDescriptor manifest = 2;
-  for (unsigned int i = 0,
-      n = static_cast<unsigned int>(this->manifest_size()); i < n; i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageNoVirtualToArray(
-        2, this->manifest(static_cast<int>(i)), deterministic, target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:ProductPricing)
-  return target;
-}
-
-size_t ProductPricing::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:ProductPricing)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // repeated .SaleDescriptor discounts = 1;
-  {
-    unsigned int count = static_cast<unsigned int>(this->discounts_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->discounts(static_cast<int>(i)));
-    }
-  }
-
-  // repeated .PricingDescriptor manifest = 2;
-  {
-    unsigned int count = static_cast<unsigned int>(this->manifest_size());
-    total_size += 1UL * count;
-    for (unsigned int i = 0; i < count; i++) {
-      total_size +=
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->manifest(static_cast<int>(i)));
-    }
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ProductPricing::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:ProductPricing)
-  GOOGLE_DCHECK_NE(&from, this);
-  const ProductPricing* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const ProductPricing>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:ProductPricing)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:ProductPricing)
-    MergeFrom(*source);
-  }
-}
-
-void ProductPricing::MergeFrom(const ProductPricing& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:ProductPricing)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  discounts_.MergeFrom(from.discounts_);
-  manifest_.MergeFrom(from.manifest_);
-}
-
-void ProductPricing::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:ProductPricing)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ProductPricing::CopyFrom(const ProductPricing& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:ProductPricing)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ProductPricing::IsInitialized() const {
-  return true;
-}
-
-void ProductPricing::Swap(ProductPricing* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    ProductPricing* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void ProductPricing::UnsafeArenaSwap(ProductPricing* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void ProductPricing::InternalSwap(ProductPricing* other) {
-  using std::swap;
-  discounts_.InternalSwap(&other->discounts_);
-  manifest_.InternalSwap(&other->manifest_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata ProductPricing::GetMetadata() const {
-  protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// ProductPricing
-
-// repeated .SaleDescriptor discounts = 1;
-int ProductPricing::discounts_size() const {
-  return discounts_.size();
-}
-void ProductPricing::clear_discounts() {
-  discounts_.Clear();
-}
-const ::SaleDescriptor& ProductPricing::discounts(int index) const {
-  // @@protoc_insertion_point(field_get:ProductPricing.discounts)
-  return discounts_.Get(index);
-}
-::SaleDescriptor* ProductPricing::mutable_discounts(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductPricing.discounts)
-  return discounts_.Mutable(index);
-}
-::SaleDescriptor* ProductPricing::add_discounts() {
-  // @@protoc_insertion_point(field_add:ProductPricing.discounts)
-  return discounts_.Add();
-}
-::google::protobuf::RepeatedPtrField< ::SaleDescriptor >*
-ProductPricing::mutable_discounts() {
-  // @@protoc_insertion_point(field_mutable_list:ProductPricing.discounts)
-  return &discounts_;
-}
-const ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >&
-ProductPricing::discounts() const {
-  // @@protoc_insertion_point(field_list:ProductPricing.discounts)
-  return discounts_;
-}
-
-// repeated .PricingDescriptor manifest = 2;
-int ProductPricing::manifest_size() const {
-  return manifest_.size();
-}
-void ProductPricing::clear_manifest() {
-  manifest_.Clear();
-}
-const ::PricingDescriptor& ProductPricing::manifest(int index) const {
-  // @@protoc_insertion_point(field_get:ProductPricing.manifest)
-  return manifest_.Get(index);
-}
-::PricingDescriptor* ProductPricing::mutable_manifest(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductPricing.manifest)
-  return manifest_.Mutable(index);
-}
-::PricingDescriptor* ProductPricing::add_manifest() {
-  // @@protoc_insertion_point(field_add:ProductPricing.manifest)
-  return manifest_.Add();
-}
-::google::protobuf::RepeatedPtrField< ::PricingDescriptor >*
-ProductPricing::mutable_manifest() {
-  // @@protoc_insertion_point(field_mutable_list:ProductPricing.manifest)
-  return &manifest_;
-}
-const ::google::protobuf::RepeatedPtrField< ::PricingDescriptor >&
-ProductPricing::manifest() const {
-  // @@protoc_insertion_point(field_list:ProductPricing.manifest)
-  return manifest_;
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/structs/pricing/PricingDescriptor.pb.h b/languages/cpp/structs/pricing/PricingDescriptor.pb.h
deleted file mode 100644
index e694dc4..0000000
--- a/languages/cpp/structs/pricing/PricingDescriptor.pb.h
+++ /dev/null
@@ -1,1419 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-#ifndef PROTOBUF_structs_2fpricing_2fPricingDescriptor_2eproto__INCLUDED
-#define PROTOBUF_structs_2fpricing_2fPricingDescriptor_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-#include "structs/pricing/SaleDescriptor.pb.h"
-// @@protoc_insertion_point(includes)
-class FreebiePricingDescriptor;
-class FreebiePricingDescriptorDefaultTypeInternal;
-extern FreebiePricingDescriptorDefaultTypeInternal _FreebiePricingDescriptor_default_instance_;
-class PricingDescriptor;
-class PricingDescriptorDefaultTypeInternal;
-extern PricingDescriptorDefaultTypeInternal _PricingDescriptor_default_instance_;
-class PricingTierAvailability;
-class PricingTierAvailabilityDefaultTypeInternal;
-extern PricingTierAvailabilityDefaultTypeInternal _PricingTierAvailability_default_instance_;
-class ProductPricing;
-class ProductPricingDefaultTypeInternal;
-extern ProductPricingDefaultTypeInternal _ProductPricing_default_instance_;
-class UnitPricingDescriptor;
-class UnitPricingDescriptorDefaultTypeInternal;
-extern UnitPricingDescriptorDefaultTypeInternal _UnitPricingDescriptor_default_instance_;
-class WeightedPricingDescriptor;
-class WeightedPricingDescriptorDefaultTypeInternal;
-extern WeightedPricingDescriptorDefaultTypeInternal _WeightedPricingDescriptor_default_instance_;
-
-namespace protobuf_structs_2fpricing_2fPricingDescriptor_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_structs_2fpricing_2fPricingDescriptor_2eproto
-
-enum PricingType {
-  UNIT = 0,
-  WEIGHTED = 1,
-  FREEBIE = 2,
-  PricingType_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  PricingType_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool PricingType_IsValid(int value);
-const PricingType PricingType_MIN = UNIT;
-const PricingType PricingType_MAX = FREEBIE;
-const int PricingType_ARRAYSIZE = PricingType_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* PricingType_descriptor();
-inline const ::std::string& PricingType_Name(PricingType value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    PricingType_descriptor(), value);
-}
-inline bool PricingType_Parse(
-    const ::std::string& name, PricingType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<PricingType>(
-    PricingType_descriptor(), name, value);
-}
-enum PricingWeightTier {
-  OTHER = 0,
-  GRAM = 1,
-  HALFGRAM = 2,
-  QUARTERGRAM = 3,
-  DUB = 4,
-  EIGHTH = 5,
-  QUARTER = 6,
-  HALF = 7,
-  OUNCE = 8,
-  POUND = 9,
-  PricingWeightTier_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  PricingWeightTier_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool PricingWeightTier_IsValid(int value);
-const PricingWeightTier PricingWeightTier_MIN = OTHER;
-const PricingWeightTier PricingWeightTier_MAX = POUND;
-const int PricingWeightTier_ARRAYSIZE = PricingWeightTier_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* PricingWeightTier_descriptor();
-inline const ::std::string& PricingWeightTier_Name(PricingWeightTier value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    PricingWeightTier_descriptor(), value);
-}
-inline bool PricingWeightTier_Parse(
-    const ::std::string& name, PricingWeightTier* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<PricingWeightTier>(
-    PricingWeightTier_descriptor(), name, value);
-}
-// ===================================================================
-
-class PricingTierAvailability : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:PricingTierAvailability) */ {
- public:
-  PricingTierAvailability();
-  virtual ~PricingTierAvailability();
-
-  PricingTierAvailability(const PricingTierAvailability& from);
-
-  inline PricingTierAvailability& operator=(const PricingTierAvailability& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  PricingTierAvailability(PricingTierAvailability&& from) noexcept
-    : PricingTierAvailability() {
-    *this = ::std::move(from);
-  }
-
-  inline PricingTierAvailability& operator=(PricingTierAvailability&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const PricingTierAvailability& default_instance();
-
-  static inline const PricingTierAvailability* internal_default_instance() {
-    return reinterpret_cast<const PricingTierAvailability*>(
-               &_PricingTierAvailability_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(PricingTierAvailability* other);
-  void Swap(PricingTierAvailability* other);
-  friend void swap(PricingTierAvailability& a, PricingTierAvailability& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline PricingTierAvailability* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  PricingTierAvailability* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const PricingTierAvailability& from);
-  void MergeFrom(const PricingTierAvailability& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(PricingTierAvailability* other);
-  protected:
-  explicit PricingTierAvailability(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // bool offered = 1;
-  void clear_offered();
-  static const int kOfferedFieldNumber = 1;
-  bool offered() const;
-  void set_offered(bool value);
-
-  // bool available = 2;
-  void clear_available();
-  static const int kAvailableFieldNumber = 2;
-  bool available() const;
-  void set_available(bool value);
-
-  // @@protoc_insertion_point(class_scope:PricingTierAvailability)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  bool offered_;
-  bool available_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class UnitPricingDescriptor : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:UnitPricingDescriptor) */ {
- public:
-  UnitPricingDescriptor();
-  virtual ~UnitPricingDescriptor();
-
-  UnitPricingDescriptor(const UnitPricingDescriptor& from);
-
-  inline UnitPricingDescriptor& operator=(const UnitPricingDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  UnitPricingDescriptor(UnitPricingDescriptor&& from) noexcept
-    : UnitPricingDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline UnitPricingDescriptor& operator=(UnitPricingDescriptor&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const UnitPricingDescriptor& default_instance();
-
-  static inline const UnitPricingDescriptor* internal_default_instance() {
-    return reinterpret_cast<const UnitPricingDescriptor*>(
-               &_UnitPricingDescriptor_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    1;
-
-  void UnsafeArenaSwap(UnitPricingDescriptor* other);
-  void Swap(UnitPricingDescriptor* other);
-  friend void swap(UnitPricingDescriptor& a, UnitPricingDescriptor& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline UnitPricingDescriptor* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  UnitPricingDescriptor* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const UnitPricingDescriptor& from);
-  void MergeFrom(const UnitPricingDescriptor& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(UnitPricingDescriptor* other);
-  protected:
-  explicit UnitPricingDescriptor(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .SaleDescriptor discounts = 3;
-  int discounts_size() const;
-  void clear_discounts();
-  static const int kDiscountsFieldNumber = 3;
-  const ::SaleDescriptor& discounts(int index) const;
-  ::SaleDescriptor* mutable_discounts(int index);
-  ::SaleDescriptor* add_discounts();
-  ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >*
-      mutable_discounts();
-  const ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >&
-      discounts() const;
-
-  // .PricingTierAvailability status = 2;
-  bool has_status() const;
-  void clear_status();
-  static const int kStatusFieldNumber = 2;
-  private:
-  void _slow_mutable_status();
-  void _slow_set_allocated_status(
-      ::google::protobuf::Arena* message_arena, ::PricingTierAvailability** status);
-  ::PricingTierAvailability* _slow_release_status();
-  public:
-  const ::PricingTierAvailability& status() const;
-  ::PricingTierAvailability* mutable_status();
-  ::PricingTierAvailability* release_status();
-  void set_allocated_status(::PricingTierAvailability* status);
-  ::PricingTierAvailability* unsafe_arena_release_status();
-  void unsafe_arena_set_allocated_status(
-      ::PricingTierAvailability* status);
-
-  // float price_value = 1;
-  void clear_price_value();
-  static const int kPriceValueFieldNumber = 1;
-  float price_value() const;
-  void set_price_value(float value);
-
-  // @@protoc_insertion_point(class_scope:UnitPricingDescriptor)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::RepeatedPtrField< ::SaleDescriptor > discounts_;
-  ::PricingTierAvailability* status_;
-  float price_value_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class WeightedPricingDescriptor : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:WeightedPricingDescriptor) */ {
- public:
-  WeightedPricingDescriptor();
-  virtual ~WeightedPricingDescriptor();
-
-  WeightedPricingDescriptor(const WeightedPricingDescriptor& from);
-
-  inline WeightedPricingDescriptor& operator=(const WeightedPricingDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  WeightedPricingDescriptor(WeightedPricingDescriptor&& from) noexcept
-    : WeightedPricingDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline WeightedPricingDescriptor& operator=(WeightedPricingDescriptor&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const WeightedPricingDescriptor& default_instance();
-
-  static inline const WeightedPricingDescriptor* internal_default_instance() {
-    return reinterpret_cast<const WeightedPricingDescriptor*>(
-               &_WeightedPricingDescriptor_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    2;
-
-  void UnsafeArenaSwap(WeightedPricingDescriptor* other);
-  void Swap(WeightedPricingDescriptor* other);
-  friend void swap(WeightedPricingDescriptor& a, WeightedPricingDescriptor& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline WeightedPricingDescriptor* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  WeightedPricingDescriptor* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const WeightedPricingDescriptor& from);
-  void MergeFrom(const WeightedPricingDescriptor& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(WeightedPricingDescriptor* other);
-  protected:
-  explicit WeightedPricingDescriptor(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .UnitPricingDescriptor tier = 2;
-  bool has_tier() const;
-  void clear_tier();
-  static const int kTierFieldNumber = 2;
-  private:
-  void _slow_mutable_tier();
-  void _slow_set_allocated_tier(
-      ::google::protobuf::Arena* message_arena, ::UnitPricingDescriptor** tier);
-  ::UnitPricingDescriptor* _slow_release_tier();
-  public:
-  const ::UnitPricingDescriptor& tier() const;
-  ::UnitPricingDescriptor* mutable_tier();
-  ::UnitPricingDescriptor* release_tier();
-  void set_allocated_tier(::UnitPricingDescriptor* tier);
-  ::UnitPricingDescriptor* unsafe_arena_release_tier();
-  void unsafe_arena_set_allocated_tier(
-      ::UnitPricingDescriptor* tier);
-
-  // .PricingWeightTier weight = 1;
-  void clear_weight();
-  static const int kWeightFieldNumber = 1;
-  ::PricingWeightTier weight() const;
-  void set_weight(::PricingWeightTier value);
-
-  // float weightInGrams = 3;
-  void clear_weightingrams();
-  static const int kWeightInGramsFieldNumber = 3;
-  float weightingrams() const;
-  void set_weightingrams(float value);
-
-  // @@protoc_insertion_point(class_scope:WeightedPricingDescriptor)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::UnitPricingDescriptor* tier_;
-  int weight_;
-  float weightingrams_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class FreebiePricingDescriptor : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:FreebiePricingDescriptor) */ {
- public:
-  FreebiePricingDescriptor();
-  virtual ~FreebiePricingDescriptor();
-
-  FreebiePricingDescriptor(const FreebiePricingDescriptor& from);
-
-  inline FreebiePricingDescriptor& operator=(const FreebiePricingDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  FreebiePricingDescriptor(FreebiePricingDescriptor&& from) noexcept
-    : FreebiePricingDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FreebiePricingDescriptor& operator=(FreebiePricingDescriptor&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const FreebiePricingDescriptor& default_instance();
-
-  static inline const FreebiePricingDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FreebiePricingDescriptor*>(
-               &_FreebiePricingDescriptor_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    3;
-
-  void UnsafeArenaSwap(FreebiePricingDescriptor* other);
-  void Swap(FreebiePricingDescriptor* other);
-  friend void swap(FreebiePricingDescriptor& a, FreebiePricingDescriptor& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline FreebiePricingDescriptor* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  FreebiePricingDescriptor* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const FreebiePricingDescriptor& from);
-  void MergeFrom(const FreebiePricingDescriptor& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(FreebiePricingDescriptor* other);
-  protected:
-  explicit FreebiePricingDescriptor(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:FreebiePricingDescriptor)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class PricingDescriptor : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:PricingDescriptor) */ {
- public:
-  PricingDescriptor();
-  virtual ~PricingDescriptor();
-
-  PricingDescriptor(const PricingDescriptor& from);
-
-  inline PricingDescriptor& operator=(const PricingDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  PricingDescriptor(PricingDescriptor&& from) noexcept
-    : PricingDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline PricingDescriptor& operator=(PricingDescriptor&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const PricingDescriptor& default_instance();
-
-  static inline const PricingDescriptor* internal_default_instance() {
-    return reinterpret_cast<const PricingDescriptor*>(
-               &_PricingDescriptor_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    4;
-
-  void UnsafeArenaSwap(PricingDescriptor* other);
-  void Swap(PricingDescriptor* other);
-  friend void swap(PricingDescriptor& a, PricingDescriptor& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline PricingDescriptor* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  PricingDescriptor* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const PricingDescriptor& from);
-  void MergeFrom(const PricingDescriptor& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(PricingDescriptor* other);
-  protected:
-  explicit PricingDescriptor(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // .UnitPricingDescriptor unit = 20;
-  bool has_unit() const;
-  void clear_unit();
-  static const int kUnitFieldNumber = 20;
-  private:
-  void _slow_mutable_unit();
-  void _slow_set_allocated_unit(
-      ::google::protobuf::Arena* message_arena, ::UnitPricingDescriptor** unit);
-  ::UnitPricingDescriptor* _slow_release_unit();
-  public:
-  const ::UnitPricingDescriptor& unit() const;
-  ::UnitPricingDescriptor* mutable_unit();
-  ::UnitPricingDescriptor* release_unit();
-  void set_allocated_unit(::UnitPricingDescriptor* unit);
-  ::UnitPricingDescriptor* unsafe_arena_release_unit();
-  void unsafe_arena_set_allocated_unit(
-      ::UnitPricingDescriptor* unit);
-
-  // .WeightedPricingDescriptor weighted = 21;
-  bool has_weighted() const;
-  void clear_weighted();
-  static const int kWeightedFieldNumber = 21;
-  private:
-  void _slow_mutable_weighted();
-  void _slow_set_allocated_weighted(
-      ::google::protobuf::Arena* message_arena, ::WeightedPricingDescriptor** weighted);
-  ::WeightedPricingDescriptor* _slow_release_weighted();
-  public:
-  const ::WeightedPricingDescriptor& weighted() const;
-  ::WeightedPricingDescriptor* mutable_weighted();
-  ::WeightedPricingDescriptor* release_weighted();
-  void set_allocated_weighted(::WeightedPricingDescriptor* weighted);
-  ::WeightedPricingDescriptor* unsafe_arena_release_weighted();
-  void unsafe_arena_set_allocated_weighted(
-      ::WeightedPricingDescriptor* weighted);
-
-  // .FreebiePricingDescriptor freebie = 22;
-  bool has_freebie() const;
-  void clear_freebie();
-  static const int kFreebieFieldNumber = 22;
-  private:
-  void _slow_mutable_freebie();
-  void _slow_set_allocated_freebie(
-      ::google::protobuf::Arena* message_arena, ::FreebiePricingDescriptor** freebie);
-  ::FreebiePricingDescriptor* _slow_release_freebie();
-  public:
-  const ::FreebiePricingDescriptor& freebie() const;
-  ::FreebiePricingDescriptor* mutable_freebie();
-  ::FreebiePricingDescriptor* release_freebie();
-  void set_allocated_freebie(::FreebiePricingDescriptor* freebie);
-  ::FreebiePricingDescriptor* unsafe_arena_release_freebie();
-  void unsafe_arena_set_allocated_freebie(
-      ::FreebiePricingDescriptor* freebie);
-
-  // .PricingType type = 1;
-  void clear_type();
-  static const int kTypeFieldNumber = 1;
-  ::PricingType type() const;
-  void set_type(::PricingType value);
-
-  // @@protoc_insertion_point(class_scope:PricingDescriptor)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::UnitPricingDescriptor* unit_;
-  ::WeightedPricingDescriptor* weighted_;
-  ::FreebiePricingDescriptor* freebie_;
-  int type_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::TableStruct;
-};
-// -------------------------------------------------------------------
-
-class ProductPricing : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:ProductPricing) */ {
- public:
-  ProductPricing();
-  virtual ~ProductPricing();
-
-  ProductPricing(const ProductPricing& from);
-
-  inline ProductPricing& operator=(const ProductPricing& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  ProductPricing(ProductPricing&& from) noexcept
-    : ProductPricing() {
-    *this = ::std::move(from);
-  }
-
-  inline ProductPricing& operator=(ProductPricing&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ProductPricing& default_instance();
-
-  static inline const ProductPricing* internal_default_instance() {
-    return reinterpret_cast<const ProductPricing*>(
-               &_ProductPricing_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    5;
-
-  void UnsafeArenaSwap(ProductPricing* other);
-  void Swap(ProductPricing* other);
-  friend void swap(ProductPricing& a, ProductPricing& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline ProductPricing* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  ProductPricing* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const ProductPricing& from);
-  void MergeFrom(const ProductPricing& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(ProductPricing* other);
-  protected:
-  explicit ProductPricing(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .SaleDescriptor discounts = 1;
-  int discounts_size() const;
-  void clear_discounts();
-  static const int kDiscountsFieldNumber = 1;
-  const ::SaleDescriptor& discounts(int index) const;
-  ::SaleDescriptor* mutable_discounts(int index);
-  ::SaleDescriptor* add_discounts();
-  ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >*
-      mutable_discounts();
-  const ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >&
-      discounts() const;
-
-  // repeated .PricingDescriptor manifest = 2;
-  int manifest_size() const;
-  void clear_manifest();
-  static const int kManifestFieldNumber = 2;
-  const ::PricingDescriptor& manifest(int index) const;
-  ::PricingDescriptor* mutable_manifest(int index);
-  ::PricingDescriptor* add_manifest();
-  ::google::protobuf::RepeatedPtrField< ::PricingDescriptor >*
-      mutable_manifest();
-  const ::google::protobuf::RepeatedPtrField< ::PricingDescriptor >&
-      manifest() const;
-
-  // @@protoc_insertion_point(class_scope:ProductPricing)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::RepeatedPtrField< ::SaleDescriptor > discounts_;
-  ::google::protobuf::RepeatedPtrField< ::PricingDescriptor > manifest_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fPricingDescriptor_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// PricingTierAvailability
-
-// bool offered = 1;
-inline void PricingTierAvailability::clear_offered() {
-  offered_ = false;
-}
-inline bool PricingTierAvailability::offered() const {
-  // @@protoc_insertion_point(field_get:PricingTierAvailability.offered)
-  return offered_;
-}
-inline void PricingTierAvailability::set_offered(bool value) {
-  
-  offered_ = value;
-  // @@protoc_insertion_point(field_set:PricingTierAvailability.offered)
-}
-
-// bool available = 2;
-inline void PricingTierAvailability::clear_available() {
-  available_ = false;
-}
-inline bool PricingTierAvailability::available() const {
-  // @@protoc_insertion_point(field_get:PricingTierAvailability.available)
-  return available_;
-}
-inline void PricingTierAvailability::set_available(bool value) {
-  
-  available_ = value;
-  // @@protoc_insertion_point(field_set:PricingTierAvailability.available)
-}
-
-// -------------------------------------------------------------------
-
-// UnitPricingDescriptor
-
-// float price_value = 1;
-inline void UnitPricingDescriptor::clear_price_value() {
-  price_value_ = 0;
-}
-inline float UnitPricingDescriptor::price_value() const {
-  // @@protoc_insertion_point(field_get:UnitPricingDescriptor.price_value)
-  return price_value_;
-}
-inline void UnitPricingDescriptor::set_price_value(float value) {
-  
-  price_value_ = value;
-  // @@protoc_insertion_point(field_set:UnitPricingDescriptor.price_value)
-}
-
-// .PricingTierAvailability status = 2;
-inline bool UnitPricingDescriptor::has_status() const {
-  return this != internal_default_instance() && status_ != NULL;
-}
-inline void UnitPricingDescriptor::clear_status() {
-  if (GetArenaNoVirtual() == NULL && status_ != NULL) delete status_;
-  status_ = NULL;
-}
-inline const ::PricingTierAvailability& UnitPricingDescriptor::status() const {
-  const ::PricingTierAvailability* p = status_;
-  // @@protoc_insertion_point(field_get:UnitPricingDescriptor.status)
-  return p != NULL ? *p : *reinterpret_cast<const ::PricingTierAvailability*>(
-      &::_PricingTierAvailability_default_instance_);
-}
-inline ::PricingTierAvailability* UnitPricingDescriptor::mutable_status() {
-  
-  if (status_ == NULL) {
-    _slow_mutable_status();
-  }
-  // @@protoc_insertion_point(field_mutable:UnitPricingDescriptor.status)
-  return status_;
-}
-inline ::PricingTierAvailability* UnitPricingDescriptor::release_status() {
-  // @@protoc_insertion_point(field_release:UnitPricingDescriptor.status)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_status();
-  } else {
-    ::PricingTierAvailability* temp = status_;
-    status_ = NULL;
-    return temp;
-  }
-}
-inline  void UnitPricingDescriptor::set_allocated_status(::PricingTierAvailability* status) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete status_;
-  }
-  if (status != NULL) {
-    _slow_set_allocated_status(message_arena, &status);
-  }
-  status_ = status;
-  if (status) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:UnitPricingDescriptor.status)
-}
-
-// repeated .SaleDescriptor discounts = 3;
-inline int UnitPricingDescriptor::discounts_size() const {
-  return discounts_.size();
-}
-inline void UnitPricingDescriptor::clear_discounts() {
-  discounts_.Clear();
-}
-inline const ::SaleDescriptor& UnitPricingDescriptor::discounts(int index) const {
-  // @@protoc_insertion_point(field_get:UnitPricingDescriptor.discounts)
-  return discounts_.Get(index);
-}
-inline ::SaleDescriptor* UnitPricingDescriptor::mutable_discounts(int index) {
-  // @@protoc_insertion_point(field_mutable:UnitPricingDescriptor.discounts)
-  return discounts_.Mutable(index);
-}
-inline ::SaleDescriptor* UnitPricingDescriptor::add_discounts() {
-  // @@protoc_insertion_point(field_add:UnitPricingDescriptor.discounts)
-  return discounts_.Add();
-}
-inline ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >*
-UnitPricingDescriptor::mutable_discounts() {
-  // @@protoc_insertion_point(field_mutable_list:UnitPricingDescriptor.discounts)
-  return &discounts_;
-}
-inline const ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >&
-UnitPricingDescriptor::discounts() const {
-  // @@protoc_insertion_point(field_list:UnitPricingDescriptor.discounts)
-  return discounts_;
-}
-
-// -------------------------------------------------------------------
-
-// WeightedPricingDescriptor
-
-// .PricingWeightTier weight = 1;
-inline void WeightedPricingDescriptor::clear_weight() {
-  weight_ = 0;
-}
-inline ::PricingWeightTier WeightedPricingDescriptor::weight() const {
-  // @@protoc_insertion_point(field_get:WeightedPricingDescriptor.weight)
-  return static_cast< ::PricingWeightTier >(weight_);
-}
-inline void WeightedPricingDescriptor::set_weight(::PricingWeightTier value) {
-  
-  weight_ = value;
-  // @@protoc_insertion_point(field_set:WeightedPricingDescriptor.weight)
-}
-
-// .UnitPricingDescriptor tier = 2;
-inline bool WeightedPricingDescriptor::has_tier() const {
-  return this != internal_default_instance() && tier_ != NULL;
-}
-inline void WeightedPricingDescriptor::clear_tier() {
-  if (GetArenaNoVirtual() == NULL && tier_ != NULL) delete tier_;
-  tier_ = NULL;
-}
-inline const ::UnitPricingDescriptor& WeightedPricingDescriptor::tier() const {
-  const ::UnitPricingDescriptor* p = tier_;
-  // @@protoc_insertion_point(field_get:WeightedPricingDescriptor.tier)
-  return p != NULL ? *p : *reinterpret_cast<const ::UnitPricingDescriptor*>(
-      &::_UnitPricingDescriptor_default_instance_);
-}
-inline ::UnitPricingDescriptor* WeightedPricingDescriptor::mutable_tier() {
-  
-  if (tier_ == NULL) {
-    _slow_mutable_tier();
-  }
-  // @@protoc_insertion_point(field_mutable:WeightedPricingDescriptor.tier)
-  return tier_;
-}
-inline ::UnitPricingDescriptor* WeightedPricingDescriptor::release_tier() {
-  // @@protoc_insertion_point(field_release:WeightedPricingDescriptor.tier)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_tier();
-  } else {
-    ::UnitPricingDescriptor* temp = tier_;
-    tier_ = NULL;
-    return temp;
-  }
-}
-inline  void WeightedPricingDescriptor::set_allocated_tier(::UnitPricingDescriptor* tier) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete tier_;
-  }
-  if (tier != NULL) {
-    _slow_set_allocated_tier(message_arena, &tier);
-  }
-  tier_ = tier;
-  if (tier) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:WeightedPricingDescriptor.tier)
-}
-
-// float weightInGrams = 3;
-inline void WeightedPricingDescriptor::clear_weightingrams() {
-  weightingrams_ = 0;
-}
-inline float WeightedPricingDescriptor::weightingrams() const {
-  // @@protoc_insertion_point(field_get:WeightedPricingDescriptor.weightInGrams)
-  return weightingrams_;
-}
-inline void WeightedPricingDescriptor::set_weightingrams(float value) {
-  
-  weightingrams_ = value;
-  // @@protoc_insertion_point(field_set:WeightedPricingDescriptor.weightInGrams)
-}
-
-// -------------------------------------------------------------------
-
-// FreebiePricingDescriptor
-
-// -------------------------------------------------------------------
-
-// PricingDescriptor
-
-// .PricingType type = 1;
-inline void PricingDescriptor::clear_type() {
-  type_ = 0;
-}
-inline ::PricingType PricingDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:PricingDescriptor.type)
-  return static_cast< ::PricingType >(type_);
-}
-inline void PricingDescriptor::set_type(::PricingType value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:PricingDescriptor.type)
-}
-
-// .UnitPricingDescriptor unit = 20;
-inline bool PricingDescriptor::has_unit() const {
-  return this != internal_default_instance() && unit_ != NULL;
-}
-inline void PricingDescriptor::clear_unit() {
-  if (GetArenaNoVirtual() == NULL && unit_ != NULL) delete unit_;
-  unit_ = NULL;
-}
-inline const ::UnitPricingDescriptor& PricingDescriptor::unit() const {
-  const ::UnitPricingDescriptor* p = unit_;
-  // @@protoc_insertion_point(field_get:PricingDescriptor.unit)
-  return p != NULL ? *p : *reinterpret_cast<const ::UnitPricingDescriptor*>(
-      &::_UnitPricingDescriptor_default_instance_);
-}
-inline ::UnitPricingDescriptor* PricingDescriptor::mutable_unit() {
-  
-  if (unit_ == NULL) {
-    _slow_mutable_unit();
-  }
-  // @@protoc_insertion_point(field_mutable:PricingDescriptor.unit)
-  return unit_;
-}
-inline ::UnitPricingDescriptor* PricingDescriptor::release_unit() {
-  // @@protoc_insertion_point(field_release:PricingDescriptor.unit)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_unit();
-  } else {
-    ::UnitPricingDescriptor* temp = unit_;
-    unit_ = NULL;
-    return temp;
-  }
-}
-inline  void PricingDescriptor::set_allocated_unit(::UnitPricingDescriptor* unit) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete unit_;
-  }
-  if (unit != NULL) {
-    _slow_set_allocated_unit(message_arena, &unit);
-  }
-  unit_ = unit;
-  if (unit) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:PricingDescriptor.unit)
-}
-
-// .WeightedPricingDescriptor weighted = 21;
-inline bool PricingDescriptor::has_weighted() const {
-  return this != internal_default_instance() && weighted_ != NULL;
-}
-inline void PricingDescriptor::clear_weighted() {
-  if (GetArenaNoVirtual() == NULL && weighted_ != NULL) delete weighted_;
-  weighted_ = NULL;
-}
-inline const ::WeightedPricingDescriptor& PricingDescriptor::weighted() const {
-  const ::WeightedPricingDescriptor* p = weighted_;
-  // @@protoc_insertion_point(field_get:PricingDescriptor.weighted)
-  return p != NULL ? *p : *reinterpret_cast<const ::WeightedPricingDescriptor*>(
-      &::_WeightedPricingDescriptor_default_instance_);
-}
-inline ::WeightedPricingDescriptor* PricingDescriptor::mutable_weighted() {
-  
-  if (weighted_ == NULL) {
-    _slow_mutable_weighted();
-  }
-  // @@protoc_insertion_point(field_mutable:PricingDescriptor.weighted)
-  return weighted_;
-}
-inline ::WeightedPricingDescriptor* PricingDescriptor::release_weighted() {
-  // @@protoc_insertion_point(field_release:PricingDescriptor.weighted)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_weighted();
-  } else {
-    ::WeightedPricingDescriptor* temp = weighted_;
-    weighted_ = NULL;
-    return temp;
-  }
-}
-inline  void PricingDescriptor::set_allocated_weighted(::WeightedPricingDescriptor* weighted) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete weighted_;
-  }
-  if (weighted != NULL) {
-    _slow_set_allocated_weighted(message_arena, &weighted);
-  }
-  weighted_ = weighted;
-  if (weighted) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:PricingDescriptor.weighted)
-}
-
-// .FreebiePricingDescriptor freebie = 22;
-inline bool PricingDescriptor::has_freebie() const {
-  return this != internal_default_instance() && freebie_ != NULL;
-}
-inline void PricingDescriptor::clear_freebie() {
-  if (GetArenaNoVirtual() == NULL && freebie_ != NULL) delete freebie_;
-  freebie_ = NULL;
-}
-inline const ::FreebiePricingDescriptor& PricingDescriptor::freebie() const {
-  const ::FreebiePricingDescriptor* p = freebie_;
-  // @@protoc_insertion_point(field_get:PricingDescriptor.freebie)
-  return p != NULL ? *p : *reinterpret_cast<const ::FreebiePricingDescriptor*>(
-      &::_FreebiePricingDescriptor_default_instance_);
-}
-inline ::FreebiePricingDescriptor* PricingDescriptor::mutable_freebie() {
-  
-  if (freebie_ == NULL) {
-    _slow_mutable_freebie();
-  }
-  // @@protoc_insertion_point(field_mutable:PricingDescriptor.freebie)
-  return freebie_;
-}
-inline ::FreebiePricingDescriptor* PricingDescriptor::release_freebie() {
-  // @@protoc_insertion_point(field_release:PricingDescriptor.freebie)
-  
-  if (GetArenaNoVirtual() != NULL) {
-    return _slow_release_freebie();
-  } else {
-    ::FreebiePricingDescriptor* temp = freebie_;
-    freebie_ = NULL;
-    return temp;
-  }
-}
-inline  void PricingDescriptor::set_allocated_freebie(::FreebiePricingDescriptor* freebie) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete freebie_;
-  }
-  if (freebie != NULL) {
-    _slow_set_allocated_freebie(message_arena, &freebie);
-  }
-  freebie_ = freebie;
-  if (freebie) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_set_allocated:PricingDescriptor.freebie)
-}
-
-// -------------------------------------------------------------------
-
-// ProductPricing
-
-// repeated .SaleDescriptor discounts = 1;
-inline int ProductPricing::discounts_size() const {
-  return discounts_.size();
-}
-inline void ProductPricing::clear_discounts() {
-  discounts_.Clear();
-}
-inline const ::SaleDescriptor& ProductPricing::discounts(int index) const {
-  // @@protoc_insertion_point(field_get:ProductPricing.discounts)
-  return discounts_.Get(index);
-}
-inline ::SaleDescriptor* ProductPricing::mutable_discounts(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductPricing.discounts)
-  return discounts_.Mutable(index);
-}
-inline ::SaleDescriptor* ProductPricing::add_discounts() {
-  // @@protoc_insertion_point(field_add:ProductPricing.discounts)
-  return discounts_.Add();
-}
-inline ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >*
-ProductPricing::mutable_discounts() {
-  // @@protoc_insertion_point(field_mutable_list:ProductPricing.discounts)
-  return &discounts_;
-}
-inline const ::google::protobuf::RepeatedPtrField< ::SaleDescriptor >&
-ProductPricing::discounts() const {
-  // @@protoc_insertion_point(field_list:ProductPricing.discounts)
-  return discounts_;
-}
-
-// repeated .PricingDescriptor manifest = 2;
-inline int ProductPricing::manifest_size() const {
-  return manifest_.size();
-}
-inline void ProductPricing::clear_manifest() {
-  manifest_.Clear();
-}
-inline const ::PricingDescriptor& ProductPricing::manifest(int index) const {
-  // @@protoc_insertion_point(field_get:ProductPricing.manifest)
-  return manifest_.Get(index);
-}
-inline ::PricingDescriptor* ProductPricing::mutable_manifest(int index) {
-  // @@protoc_insertion_point(field_mutable:ProductPricing.manifest)
-  return manifest_.Mutable(index);
-}
-inline ::PricingDescriptor* ProductPricing::add_manifest() {
-  // @@protoc_insertion_point(field_add:ProductPricing.manifest)
-  return manifest_.Add();
-}
-inline ::google::protobuf::RepeatedPtrField< ::PricingDescriptor >*
-ProductPricing::mutable_manifest() {
-  // @@protoc_insertion_point(field_mutable_list:ProductPricing.manifest)
-  return &manifest_;
-}
-inline const ::google::protobuf::RepeatedPtrField< ::PricingDescriptor >&
-ProductPricing::manifest() const {
-  // @@protoc_insertion_point(field_list:ProductPricing.manifest)
-  return manifest_;
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::PricingType> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PricingType>() {
-  return ::PricingType_descriptor();
-}
-template <> struct is_proto_enum< ::PricingWeightTier> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PricingWeightTier>() {
-  return ::PricingWeightTier_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_structs_2fpricing_2fPricingDescriptor_2eproto__INCLUDED
diff --git a/languages/cpp/structs/pricing/SaleDescriptor.pb.cc b/languages/cpp/structs/pricing/SaleDescriptor.pb.cc
deleted file mode 100644
index 4aed6b7..0000000
--- a/languages/cpp/structs/pricing/SaleDescriptor.pb.cc
+++ /dev/null
@@ -1,801 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "structs/pricing/SaleDescriptor.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-class SaleDescriptorDefaultTypeInternal {
-public:
- ::google::protobuf::internal::ExplicitlyConstructed<SaleDescriptor>
-     _instance;
-} _SaleDescriptor_default_instance_;
-
-namespace protobuf_structs_2fpricing_2fSaleDescriptor_2eproto {
-
-
-namespace {
-
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-}  // namespace
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
-    const TableStruct::entries[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
-};
-
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
-    const TableStruct::aux[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ::google::protobuf::internal::AuxillaryParseTableField(),
-};
-PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
-    TableStruct::schema[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { NULL, NULL, 0, -1, -1, -1, -1, NULL, false },
-};
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, type_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, effective_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, expiration_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, percentage_amount_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, bogo_trigger_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, bogo_reward_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, loyalty_trigger_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SaleDescriptor, loyalty_reward_),
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, sizeof(SaleDescriptor)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&_SaleDescriptor_default_instance_),
-};
-
-namespace {
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  ::google::protobuf::MessageFactory* factory = NULL;
-  AssignDescriptors(
-      "structs/pricing/SaleDescriptor.proto", schemas, file_default_instances, TableStruct::offsets, factory,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-}  // namespace
-void TableStruct::InitDefaultsImpl() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::internal::InitProtobufDefaults();
-  _SaleDescriptor_default_instance_._instance.DefaultConstruct();
-  ::google::protobuf::internal::OnShutdownDestroyMessage(
-      &_SaleDescriptor_default_instance_);}
-
-void InitDefaults() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl);
-}
-namespace {
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n$structs/pricing/SaleDescriptor.proto\"\307"
-      "\001\n\016SaleDescriptor\022\027\n\004type\030\001 \001(\0162\t.SaleTy"
-      "pe\022\021\n\teffective\030\002 \001(\004\022\022\n\nexpiration\030\003 \001("
-      "\004\022\031\n\021percentage_amount\030\024 \001(\r\022\024\n\014bogo_tri"
-      "gger\030\025 \001(\r\022\023\n\013bogo_reward\030\026 \001(\r\022\027\n\017loyal"
-      "ty_trigger\030\027 \001(\r\022\026\n\016loyalty_reward\030\030 \001(\r"
-      "*1\n\010SaleType\022\016\n\nPERCENTAGE\020\000\022\010\n\004BOGO\020\001\022\013"
-      "\n\007LOYALTY\020\002B;\n!io.bloombox.schema.produc"
-      "t.structB\017ProductDiscountH\001P\001\370\001\001b\006proto3"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 360);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "structs/pricing/SaleDescriptor.proto", &protobuf_RegisterTypes);
-}
-} // anonymous namespace
-
-void AddDescriptors() {
-  static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-
-}  // namespace protobuf_structs_2fpricing_2fSaleDescriptor_2eproto
-
-const ::google::protobuf::EnumDescriptor* SaleType_descriptor() {
-  protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::file_level_enum_descriptors[0];
-}
-bool SaleType_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int SaleDescriptor::kTypeFieldNumber;
-const int SaleDescriptor::kEffectiveFieldNumber;
-const int SaleDescriptor::kExpirationFieldNumber;
-const int SaleDescriptor::kPercentageAmountFieldNumber;
-const int SaleDescriptor::kBogoTriggerFieldNumber;
-const int SaleDescriptor::kBogoRewardFieldNumber;
-const int SaleDescriptor::kLoyaltyTriggerFieldNumber;
-const int SaleDescriptor::kLoyaltyRewardFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-SaleDescriptor::SaleDescriptor()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::InitDefaults();
-  }
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:SaleDescriptor)
-}
-SaleDescriptor::SaleDescriptor(::google::protobuf::Arena* arena)
-  : ::google::protobuf::Message(),
-  _internal_metadata_(arena) {
-  protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::InitDefaults();
-  SharedCtor();
-  RegisterArenaDtor(arena);
-  // @@protoc_insertion_point(arena_constructor:SaleDescriptor)
-}
-SaleDescriptor::SaleDescriptor(const SaleDescriptor& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _cached_size_(0) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::memcpy(&effective_, &from.effective_,
-    static_cast<size_t>(reinterpret_cast<char*>(&loyalty_reward_) -
-    reinterpret_cast<char*>(&effective_)) + sizeof(loyalty_reward_));
-  // @@protoc_insertion_point(copy_constructor:SaleDescriptor)
-}
-
-void SaleDescriptor::SharedCtor() {
-  ::memset(&effective_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&loyalty_reward_) -
-      reinterpret_cast<char*>(&effective_)) + sizeof(loyalty_reward_));
-  _cached_size_ = 0;
-}
-
-SaleDescriptor::~SaleDescriptor() {
-  // @@protoc_insertion_point(destructor:SaleDescriptor)
-  SharedDtor();
-}
-
-void SaleDescriptor::SharedDtor() {
-  ::google::protobuf::Arena* arena = GetArenaNoVirtual();
-  GOOGLE_DCHECK(arena == NULL);
-  if (arena != NULL) {
-    return;
-  }
-
-}
-
-void SaleDescriptor::ArenaDtor(void* object) {
-  SaleDescriptor* _this = reinterpret_cast< SaleDescriptor* >(object);
-  (void)_this;
-}
-void SaleDescriptor::RegisterArenaDtor(::google::protobuf::Arena* arena) {
-}
-void SaleDescriptor::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* SaleDescriptor::descriptor() {
-  protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const SaleDescriptor& SaleDescriptor::default_instance() {
-  protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::InitDefaults();
-  return *internal_default_instance();
-}
-
-SaleDescriptor* SaleDescriptor::New(::google::protobuf::Arena* arena) const {
-  return ::google::protobuf::Arena::CreateMessage<SaleDescriptor>(arena);
-}
-
-void SaleDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:SaleDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&effective_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&loyalty_reward_) -
-      reinterpret_cast<char*>(&effective_)) + sizeof(loyalty_reward_));
-  _internal_metadata_.Clear();
-}
-
-bool SaleDescriptor::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:SaleDescriptor)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .SaleType type = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_type(static_cast< ::SaleType >(value));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint64 effective = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &effective_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint64 expiration = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &expiration_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint32 percentage_amount = 20;
-      case 20: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(160u /* 160 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &percentage_amount_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint32 bogo_trigger = 21;
-      case 21: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(168u /* 168 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &bogo_trigger_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint32 bogo_reward = 22;
-      case 22: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(176u /* 176 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &bogo_reward_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint32 loyalty_trigger = 23;
-      case 23: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(184u /* 184 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &loyalty_trigger_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // uint32 loyalty_reward = 24;
-      case 24: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(192u /* 192 & 0xFF */)) {
-
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &loyalty_reward_)));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:SaleDescriptor)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:SaleDescriptor)
-  return false;
-#undef DO_
-}
-
-void SaleDescriptor::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:SaleDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .SaleType type = 1;
-  if (this->type() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->type(), output);
-  }
-
-  // uint64 effective = 2;
-  if (this->effective() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->effective(), output);
-  }
-
-  // uint64 expiration = 3;
-  if (this->expiration() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->expiration(), output);
-  }
-
-  // uint32 percentage_amount = 20;
-  if (this->percentage_amount() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(20, this->percentage_amount(), output);
-  }
-
-  // uint32 bogo_trigger = 21;
-  if (this->bogo_trigger() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(21, this->bogo_trigger(), output);
-  }
-
-  // uint32 bogo_reward = 22;
-  if (this->bogo_reward() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(22, this->bogo_reward(), output);
-  }
-
-  // uint32 loyalty_trigger = 23;
-  if (this->loyalty_trigger() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(23, this->loyalty_trigger(), output);
-  }
-
-  // uint32 loyalty_reward = 24;
-  if (this->loyalty_reward() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(24, this->loyalty_reward(), output);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
-  }
-  // @@protoc_insertion_point(serialize_end:SaleDescriptor)
-}
-
-::google::protobuf::uint8* SaleDescriptor::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:SaleDescriptor)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .SaleType type = 1;
-  if (this->type() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->type(), target);
-  }
-
-  // uint64 effective = 2;
-  if (this->effective() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->effective(), target);
-  }
-
-  // uint64 expiration = 3;
-  if (this->expiration() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->expiration(), target);
-  }
-
-  // uint32 percentage_amount = 20;
-  if (this->percentage_amount() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(20, this->percentage_amount(), target);
-  }
-
-  // uint32 bogo_trigger = 21;
-  if (this->bogo_trigger() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(21, this->bogo_trigger(), target);
-  }
-
-  // uint32 bogo_reward = 22;
-  if (this->bogo_reward() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(22, this->bogo_reward(), target);
-  }
-
-  // uint32 loyalty_trigger = 23;
-  if (this->loyalty_trigger() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(23, this->loyalty_trigger(), target);
-  }
-
-  // uint32 loyalty_reward = 24;
-  if (this->loyalty_reward() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(24, this->loyalty_reward(), target);
-  }
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:SaleDescriptor)
-  return target;
-}
-
-size_t SaleDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:SaleDescriptor)
-  size_t total_size = 0;
-
-  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
-  }
-  // uint64 effective = 2;
-  if (this->effective() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::UInt64Size(
-        this->effective());
-  }
-
-  // uint64 expiration = 3;
-  if (this->expiration() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::UInt64Size(
-        this->expiration());
-  }
-
-  // .SaleType type = 1;
-  if (this->type() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-  }
-
-  // uint32 percentage_amount = 20;
-  if (this->percentage_amount() != 0) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::UInt32Size(
-        this->percentage_amount());
-  }
-
-  // uint32 bogo_trigger = 21;
-  if (this->bogo_trigger() != 0) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::UInt32Size(
-        this->bogo_trigger());
-  }
-
-  // uint32 bogo_reward = 22;
-  if (this->bogo_reward() != 0) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::UInt32Size(
-        this->bogo_reward());
-  }
-
-  // uint32 loyalty_trigger = 23;
-  if (this->loyalty_trigger() != 0) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::UInt32Size(
-        this->loyalty_trigger());
-  }
-
-  // uint32 loyalty_reward = 24;
-  if (this->loyalty_reward() != 0) {
-    total_size += 2 +
-      ::google::protobuf::internal::WireFormatLite::UInt32Size(
-        this->loyalty_reward());
-  }
-
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = cached_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void SaleDescriptor::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:SaleDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  const SaleDescriptor* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const SaleDescriptor>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:SaleDescriptor)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:SaleDescriptor)
-    MergeFrom(*source);
-  }
-}
-
-void SaleDescriptor::MergeFrom(const SaleDescriptor& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:SaleDescriptor)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from.effective() != 0) {
-    set_effective(from.effective());
-  }
-  if (from.expiration() != 0) {
-    set_expiration(from.expiration());
-  }
-  if (from.type() != 0) {
-    set_type(from.type());
-  }
-  if (from.percentage_amount() != 0) {
-    set_percentage_amount(from.percentage_amount());
-  }
-  if (from.bogo_trigger() != 0) {
-    set_bogo_trigger(from.bogo_trigger());
-  }
-  if (from.bogo_reward() != 0) {
-    set_bogo_reward(from.bogo_reward());
-  }
-  if (from.loyalty_trigger() != 0) {
-    set_loyalty_trigger(from.loyalty_trigger());
-  }
-  if (from.loyalty_reward() != 0) {
-    set_loyalty_reward(from.loyalty_reward());
-  }
-}
-
-void SaleDescriptor::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:SaleDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void SaleDescriptor::CopyFrom(const SaleDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:SaleDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool SaleDescriptor::IsInitialized() const {
-  return true;
-}
-
-void SaleDescriptor::Swap(SaleDescriptor* other) {
-  if (other == this) return;
-  if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
-    InternalSwap(other);
-  } else {
-    SaleDescriptor* temp = New(GetArenaNoVirtual());
-    temp->MergeFrom(*other);
-    other->CopyFrom(*this);
-    InternalSwap(temp);
-    if (GetArenaNoVirtual() == NULL) {
-      delete temp;
-    }
-  }
-}
-void SaleDescriptor::UnsafeArenaSwap(SaleDescriptor* other) {
-  if (other == this) return;
-  GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());
-  InternalSwap(other);
-}
-void SaleDescriptor::InternalSwap(SaleDescriptor* other) {
-  using std::swap;
-  swap(effective_, other->effective_);
-  swap(expiration_, other->expiration_);
-  swap(type_, other->type_);
-  swap(percentage_amount_, other->percentage_amount_);
-  swap(bogo_trigger_, other->bogo_trigger_);
-  swap(bogo_reward_, other->bogo_reward_);
-  swap(loyalty_trigger_, other->loyalty_trigger_);
-  swap(loyalty_reward_, other->loyalty_reward_);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(_cached_size_, other->_cached_size_);
-}
-
-::google::protobuf::Metadata SaleDescriptor::GetMetadata() const {
-  protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-#if PROTOBUF_INLINE_NOT_IN_HEADERS
-// SaleDescriptor
-
-// .SaleType type = 1;
-void SaleDescriptor::clear_type() {
-  type_ = 0;
-}
-::SaleType SaleDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.type)
-  return static_cast< ::SaleType >(type_);
-}
-void SaleDescriptor::set_type(::SaleType value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.type)
-}
-
-// uint64 effective = 2;
-void SaleDescriptor::clear_effective() {
-  effective_ = GOOGLE_ULONGLONG(0);
-}
-::google::protobuf::uint64 SaleDescriptor::effective() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.effective)
-  return effective_;
-}
-void SaleDescriptor::set_effective(::google::protobuf::uint64 value) {
-  
-  effective_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.effective)
-}
-
-// uint64 expiration = 3;
-void SaleDescriptor::clear_expiration() {
-  expiration_ = GOOGLE_ULONGLONG(0);
-}
-::google::protobuf::uint64 SaleDescriptor::expiration() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.expiration)
-  return expiration_;
-}
-void SaleDescriptor::set_expiration(::google::protobuf::uint64 value) {
-  
-  expiration_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.expiration)
-}
-
-// uint32 percentage_amount = 20;
-void SaleDescriptor::clear_percentage_amount() {
-  percentage_amount_ = 0u;
-}
-::google::protobuf::uint32 SaleDescriptor::percentage_amount() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.percentage_amount)
-  return percentage_amount_;
-}
-void SaleDescriptor::set_percentage_amount(::google::protobuf::uint32 value) {
-  
-  percentage_amount_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.percentage_amount)
-}
-
-// uint32 bogo_trigger = 21;
-void SaleDescriptor::clear_bogo_trigger() {
-  bogo_trigger_ = 0u;
-}
-::google::protobuf::uint32 SaleDescriptor::bogo_trigger() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.bogo_trigger)
-  return bogo_trigger_;
-}
-void SaleDescriptor::set_bogo_trigger(::google::protobuf::uint32 value) {
-  
-  bogo_trigger_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.bogo_trigger)
-}
-
-// uint32 bogo_reward = 22;
-void SaleDescriptor::clear_bogo_reward() {
-  bogo_reward_ = 0u;
-}
-::google::protobuf::uint32 SaleDescriptor::bogo_reward() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.bogo_reward)
-  return bogo_reward_;
-}
-void SaleDescriptor::set_bogo_reward(::google::protobuf::uint32 value) {
-  
-  bogo_reward_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.bogo_reward)
-}
-
-// uint32 loyalty_trigger = 23;
-void SaleDescriptor::clear_loyalty_trigger() {
-  loyalty_trigger_ = 0u;
-}
-::google::protobuf::uint32 SaleDescriptor::loyalty_trigger() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.loyalty_trigger)
-  return loyalty_trigger_;
-}
-void SaleDescriptor::set_loyalty_trigger(::google::protobuf::uint32 value) {
-  
-  loyalty_trigger_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.loyalty_trigger)
-}
-
-// uint32 loyalty_reward = 24;
-void SaleDescriptor::clear_loyalty_reward() {
-  loyalty_reward_ = 0u;
-}
-::google::protobuf::uint32 SaleDescriptor::loyalty_reward() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.loyalty_reward)
-  return loyalty_reward_;
-}
-void SaleDescriptor::set_loyalty_reward(::google::protobuf::uint32 value) {
-  
-  loyalty_reward_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.loyalty_reward)
-}
-
-#endif  // PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/cpp/structs/pricing/SaleDescriptor.pb.h b/languages/cpp/structs/pricing/SaleDescriptor.pb.h
deleted file mode 100644
index 135a7e4..0000000
--- a/languages/cpp/structs/pricing/SaleDescriptor.pb.h
+++ /dev/null
@@ -1,382 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-#ifndef PROTOBUF_structs_2fpricing_2fSaleDescriptor_2eproto__INCLUDED
-#define PROTOBUF_structs_2fpricing_2fSaleDescriptor_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3004000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-class SaleDescriptor;
-class SaleDescriptorDefaultTypeInternal;
-extern SaleDescriptorDefaultTypeInternal _SaleDescriptor_default_instance_;
-
-namespace protobuf_structs_2fpricing_2fSaleDescriptor_2eproto {
-// Internal implementation detail -- do not call these.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[];
-  static const ::google::protobuf::uint32 offsets[];
-  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
-  static const ::google::protobuf::internal::SerializationTable serialization_table[];
-  static void InitDefaultsImpl();
-};
-void AddDescriptors();
-void InitDefaults();
-}  // namespace protobuf_structs_2fpricing_2fSaleDescriptor_2eproto
-
-enum SaleType {
-  PERCENTAGE = 0,
-  BOGO = 1,
-  LOYALTY = 2,
-  SaleType_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
-  SaleType_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
-};
-bool SaleType_IsValid(int value);
-const SaleType SaleType_MIN = PERCENTAGE;
-const SaleType SaleType_MAX = LOYALTY;
-const int SaleType_ARRAYSIZE = SaleType_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* SaleType_descriptor();
-inline const ::std::string& SaleType_Name(SaleType value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    SaleType_descriptor(), value);
-}
-inline bool SaleType_Parse(
-    const ::std::string& name, SaleType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<SaleType>(
-    SaleType_descriptor(), name, value);
-}
-// ===================================================================
-
-class SaleDescriptor : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:SaleDescriptor) */ {
- public:
-  SaleDescriptor();
-  virtual ~SaleDescriptor();
-
-  SaleDescriptor(const SaleDescriptor& from);
-
-  inline SaleDescriptor& operator=(const SaleDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  SaleDescriptor(SaleDescriptor&& from) noexcept
-    : SaleDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline SaleDescriptor& operator=(SaleDescriptor&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
-    return GetArenaNoVirtual();
-  }
-  inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
-    return MaybeArenaPtr();
-  }
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const SaleDescriptor& default_instance();
-
-  static inline const SaleDescriptor* internal_default_instance() {
-    return reinterpret_cast<const SaleDescriptor*>(
-               &_SaleDescriptor_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    0;
-
-  void UnsafeArenaSwap(SaleDescriptor* other);
-  void Swap(SaleDescriptor* other);
-  friend void swap(SaleDescriptor& a, SaleDescriptor& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline SaleDescriptor* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  SaleDescriptor* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const SaleDescriptor& from);
-  void MergeFrom(const SaleDescriptor& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(SaleDescriptor* other);
-  protected:
-  explicit SaleDescriptor(::google::protobuf::Arena* arena);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return _internal_metadata_.arena();
-  }
-  inline void* MaybeArenaPtr() const {
-    return _internal_metadata_.raw_arena_ptr();
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // uint64 effective = 2;
-  void clear_effective();
-  static const int kEffectiveFieldNumber = 2;
-  ::google::protobuf::uint64 effective() const;
-  void set_effective(::google::protobuf::uint64 value);
-
-  // uint64 expiration = 3;
-  void clear_expiration();
-  static const int kExpirationFieldNumber = 3;
-  ::google::protobuf::uint64 expiration() const;
-  void set_expiration(::google::protobuf::uint64 value);
-
-  // .SaleType type = 1;
-  void clear_type();
-  static const int kTypeFieldNumber = 1;
-  ::SaleType type() const;
-  void set_type(::SaleType value);
-
-  // uint32 percentage_amount = 20;
-  void clear_percentage_amount();
-  static const int kPercentageAmountFieldNumber = 20;
-  ::google::protobuf::uint32 percentage_amount() const;
-  void set_percentage_amount(::google::protobuf::uint32 value);
-
-  // uint32 bogo_trigger = 21;
-  void clear_bogo_trigger();
-  static const int kBogoTriggerFieldNumber = 21;
-  ::google::protobuf::uint32 bogo_trigger() const;
-  void set_bogo_trigger(::google::protobuf::uint32 value);
-
-  // uint32 bogo_reward = 22;
-  void clear_bogo_reward();
-  static const int kBogoRewardFieldNumber = 22;
-  ::google::protobuf::uint32 bogo_reward() const;
-  void set_bogo_reward(::google::protobuf::uint32 value);
-
-  // uint32 loyalty_trigger = 23;
-  void clear_loyalty_trigger();
-  static const int kLoyaltyTriggerFieldNumber = 23;
-  ::google::protobuf::uint32 loyalty_trigger() const;
-  void set_loyalty_trigger(::google::protobuf::uint32 value);
-
-  // uint32 loyalty_reward = 24;
-  void clear_loyalty_reward();
-  static const int kLoyaltyRewardFieldNumber = 24;
-  ::google::protobuf::uint32 loyalty_reward() const;
-  void set_loyalty_reward(::google::protobuf::uint32 value);
-
-  // @@protoc_insertion_point(class_scope:SaleDescriptor)
- private:
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  template <typename T> friend class ::google::protobuf::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  ::google::protobuf::uint64 effective_;
-  ::google::protobuf::uint64 expiration_;
-  int type_;
-  ::google::protobuf::uint32 percentage_amount_;
-  ::google::protobuf::uint32 bogo_trigger_;
-  ::google::protobuf::uint32 bogo_reward_;
-  ::google::protobuf::uint32 loyalty_trigger_;
-  ::google::protobuf::uint32 loyalty_reward_;
-  mutable int _cached_size_;
-  friend struct protobuf_structs_2fpricing_2fSaleDescriptor_2eproto::TableStruct;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#if !PROTOBUF_INLINE_NOT_IN_HEADERS
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// SaleDescriptor
-
-// .SaleType type = 1;
-inline void SaleDescriptor::clear_type() {
-  type_ = 0;
-}
-inline ::SaleType SaleDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.type)
-  return static_cast< ::SaleType >(type_);
-}
-inline void SaleDescriptor::set_type(::SaleType value) {
-  
-  type_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.type)
-}
-
-// uint64 effective = 2;
-inline void SaleDescriptor::clear_effective() {
-  effective_ = GOOGLE_ULONGLONG(0);
-}
-inline ::google::protobuf::uint64 SaleDescriptor::effective() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.effective)
-  return effective_;
-}
-inline void SaleDescriptor::set_effective(::google::protobuf::uint64 value) {
-  
-  effective_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.effective)
-}
-
-// uint64 expiration = 3;
-inline void SaleDescriptor::clear_expiration() {
-  expiration_ = GOOGLE_ULONGLONG(0);
-}
-inline ::google::protobuf::uint64 SaleDescriptor::expiration() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.expiration)
-  return expiration_;
-}
-inline void SaleDescriptor::set_expiration(::google::protobuf::uint64 value) {
-  
-  expiration_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.expiration)
-}
-
-// uint32 percentage_amount = 20;
-inline void SaleDescriptor::clear_percentage_amount() {
-  percentage_amount_ = 0u;
-}
-inline ::google::protobuf::uint32 SaleDescriptor::percentage_amount() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.percentage_amount)
-  return percentage_amount_;
-}
-inline void SaleDescriptor::set_percentage_amount(::google::protobuf::uint32 value) {
-  
-  percentage_amount_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.percentage_amount)
-}
-
-// uint32 bogo_trigger = 21;
-inline void SaleDescriptor::clear_bogo_trigger() {
-  bogo_trigger_ = 0u;
-}
-inline ::google::protobuf::uint32 SaleDescriptor::bogo_trigger() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.bogo_trigger)
-  return bogo_trigger_;
-}
-inline void SaleDescriptor::set_bogo_trigger(::google::protobuf::uint32 value) {
-  
-  bogo_trigger_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.bogo_trigger)
-}
-
-// uint32 bogo_reward = 22;
-inline void SaleDescriptor::clear_bogo_reward() {
-  bogo_reward_ = 0u;
-}
-inline ::google::protobuf::uint32 SaleDescriptor::bogo_reward() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.bogo_reward)
-  return bogo_reward_;
-}
-inline void SaleDescriptor::set_bogo_reward(::google::protobuf::uint32 value) {
-  
-  bogo_reward_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.bogo_reward)
-}
-
-// uint32 loyalty_trigger = 23;
-inline void SaleDescriptor::clear_loyalty_trigger() {
-  loyalty_trigger_ = 0u;
-}
-inline ::google::protobuf::uint32 SaleDescriptor::loyalty_trigger() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.loyalty_trigger)
-  return loyalty_trigger_;
-}
-inline void SaleDescriptor::set_loyalty_trigger(::google::protobuf::uint32 value) {
-  
-  loyalty_trigger_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.loyalty_trigger)
-}
-
-// uint32 loyalty_reward = 24;
-inline void SaleDescriptor::clear_loyalty_reward() {
-  loyalty_reward_ = 0u;
-}
-inline ::google::protobuf::uint32 SaleDescriptor::loyalty_reward() const {
-  // @@protoc_insertion_point(field_get:SaleDescriptor.loyalty_reward)
-  return loyalty_reward_;
-}
-inline void SaleDescriptor::set_loyalty_reward(::google::protobuf::uint32 value) {
-  
-  loyalty_reward_ = value;
-  // @@protoc_insertion_point(field_set:SaleDescriptor.loyalty_reward)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-#endif  // !PROTOBUF_INLINE_NOT_IN_HEADERS
-
-// @@protoc_insertion_point(namespace_scope)
-
-
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::SaleType> : ::google::protobuf::internal::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::SaleType>() {
-  return ::SaleType_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_structs_2fpricing_2fSaleDescriptor_2eproto__INCLUDED
diff --git a/languages/csharp/Addressg.cs b/languages/csharp/Addressg.cs
deleted file mode 100644
index b79240a..0000000
--- a/languages/csharp/Addressg.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from geo/Address.proto</summary>
-public static partial class AddressReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for geo/Address.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static AddressReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChFnZW8vQWRkcmVzcy5wcm90byJxCgdBZGRyZXNzEhIKCmZpcnN0X2xpbmUY",
-          "ASABKAkSEwoLc2Vjb25kX2xpbmUYAiABKAkSDAoEY2l0eRgDIAEoCRINCgVz",
-          "dGF0ZRgEIAEoCRIPCgd6aXBjb2RlGAUgASgJEg8KB2NvdW50cnkYBiABKAlC",
-          "HAoWaW8uYmxvb21ib3guc2NoZW1hLmdlb0gBUAFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Address), global::Address.Parser, new[]{ "FirstLine", "SecondLine", "City", "State", "Zipcode", "Country" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Address : pb::IMessage<Address> {
-  private static readonly pb::MessageParser<Address> _parser = new pb::MessageParser<Address>(() => new Address());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Address> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::AddressReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Address() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Address(Address other) : this() {
-    firstLine_ = other.firstLine_;
-    secondLine_ = other.secondLine_;
-    city_ = other.city_;
-    state_ = other.state_;
-    zipcode_ = other.zipcode_;
-    country_ = other.country_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Address Clone() {
-    return new Address(this);
-  }
-
-  /// <summary>Field number for the "first_line" field.</summary>
-  public const int FirstLineFieldNumber = 1;
-  private string firstLine_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string FirstLine {
-    get { return firstLine_; }
-    set {
-      firstLine_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "second_line" field.</summary>
-  public const int SecondLineFieldNumber = 2;
-  private string secondLine_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string SecondLine {
-    get { return secondLine_; }
-    set {
-      secondLine_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "city" field.</summary>
-  public const int CityFieldNumber = 3;
-  private string city_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string City {
-    get { return city_; }
-    set {
-      city_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "state" field.</summary>
-  public const int StateFieldNumber = 4;
-  private string state_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string State {
-    get { return state_; }
-    set {
-      state_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "zipcode" field.</summary>
-  public const int ZipcodeFieldNumber = 5;
-  private string zipcode_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Zipcode {
-    get { return zipcode_; }
-    set {
-      zipcode_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "country" field.</summary>
-  public const int CountryFieldNumber = 6;
-  private string country_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Country {
-    get { return country_; }
-    set {
-      country_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Address);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Address other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (FirstLine != other.FirstLine) return false;
-    if (SecondLine != other.SecondLine) return false;
-    if (City != other.City) return false;
-    if (State != other.State) return false;
-    if (Zipcode != other.Zipcode) return false;
-    if (Country != other.Country) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (FirstLine.Length != 0) hash ^= FirstLine.GetHashCode();
-    if (SecondLine.Length != 0) hash ^= SecondLine.GetHashCode();
-    if (City.Length != 0) hash ^= City.GetHashCode();
-    if (State.Length != 0) hash ^= State.GetHashCode();
-    if (Zipcode.Length != 0) hash ^= Zipcode.GetHashCode();
-    if (Country.Length != 0) hash ^= Country.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (FirstLine.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(FirstLine);
-    }
-    if (SecondLine.Length != 0) {
-      output.WriteRawTag(18);
-      output.WriteString(SecondLine);
-    }
-    if (City.Length != 0) {
-      output.WriteRawTag(26);
-      output.WriteString(City);
-    }
-    if (State.Length != 0) {
-      output.WriteRawTag(34);
-      output.WriteString(State);
-    }
-    if (Zipcode.Length != 0) {
-      output.WriteRawTag(42);
-      output.WriteString(Zipcode);
-    }
-    if (Country.Length != 0) {
-      output.WriteRawTag(50);
-      output.WriteString(Country);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (FirstLine.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(FirstLine);
-    }
-    if (SecondLine.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(SecondLine);
-    }
-    if (City.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(City);
-    }
-    if (State.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(State);
-    }
-    if (Zipcode.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Zipcode);
-    }
-    if (Country.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Country);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Address other) {
-    if (other == null) {
-      return;
-    }
-    if (other.FirstLine.Length != 0) {
-      FirstLine = other.FirstLine;
-    }
-    if (other.SecondLine.Length != 0) {
-      SecondLine = other.SecondLine;
-    }
-    if (other.City.Length != 0) {
-      City = other.City;
-    }
-    if (other.State.Length != 0) {
-      State = other.State;
-    }
-    if (other.Zipcode.Length != 0) {
-      Zipcode = other.Zipcode;
-    }
-    if (other.Country.Length != 0) {
-      Country = other.Country;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          FirstLine = input.ReadString();
-          break;
-        }
-        case 18: {
-          SecondLine = input.ReadString();
-          break;
-        }
-        case 26: {
-          City = input.ReadString();
-          break;
-        }
-        case 34: {
-          State = input.ReadString();
-          break;
-        }
-        case 42: {
-          Zipcode = input.ReadString();
-          break;
-        }
-        case 50: {
-          Country = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Brand.cs b/languages/csharp/Brand.cs
deleted file mode 100644
index 6a6f093..0000000
--- a/languages/csharp/Brand.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/Brand.proto</summary>
-public static partial class BrandReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/Brand.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static BrandReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChNjb250ZW50L0JyYW5kLnByb3RvGhJjb250ZW50L05hbWUucHJvdG8aFWNv",
-          "bnRlbnQvQ29udGVudC5wcm90bxoVbWVkaWEvTWVkaWFJdGVtLnByb3RvImoK",
-          "BUJyYW5kEhMKBG5hbWUYASABKAsyBS5OYW1lEhYKBnBhcmVudBgCIAEoCzIG",
-          "LkJyYW5kEhkKB3N1bW1hcnkYAyABKAsyCC5Db250ZW50EhkKBW1lZGlhGBQg",
-          "AygLMgouTWVkaWFJdGVtQiwKGmlvLmJsb29tYm94LnNjaGVtYS5jb250ZW50",
-          "QgxCcmFuZENvbnRlbnRQAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::NameReflection.Descriptor, global::ContentReflection.Descriptor, global::MediaItemReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Brand), global::Brand.Parser, new[]{ "Name", "Parent", "Summary", "Media" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Brand : pb::IMessage<Brand> {
-  private static readonly pb::MessageParser<Brand> _parser = new pb::MessageParser<Brand>(() => new Brand());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Brand> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::BrandReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Brand() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Brand(Brand other) : this() {
-    Name = other.name_ != null ? other.Name.Clone() : null;
-    Parent = other.parent_ != null ? other.Parent.Clone() : null;
-    Summary = other.summary_ != null ? other.Summary.Clone() : null;
-    media_ = other.media_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Brand Clone() {
-    return new Brand(this);
-  }
-
-  /// <summary>Field number for the "name" field.</summary>
-  public const int NameFieldNumber = 1;
-  private global::Name name_;
-  /// <summary>
-  /// -- Basic Properties
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Name {
-    get { return name_; }
-    set {
-      name_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "parent" field.</summary>
-  public const int ParentFieldNumber = 2;
-  private global::Brand parent_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Brand Parent {
-    get { return parent_; }
-    set {
-      parent_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "summary" field.</summary>
-  public const int SummaryFieldNumber = 3;
-  private global::Content summary_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Summary {
-    get { return summary_; }
-    set {
-      summary_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "media" field.</summary>
-  public const int MediaFieldNumber = 20;
-  private static readonly pb::FieldCodec<global::MediaItem> _repeated_media_codec
-      = pb::FieldCodec.ForMessage(162, global::MediaItem.Parser);
-  private readonly pbc::RepeatedField<global::MediaItem> media_ = new pbc::RepeatedField<global::MediaItem>();
-  /// <summary>
-  /// -- Media
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::MediaItem> Media {
-    get { return media_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Brand);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Brand other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Name, other.Name)) return false;
-    if (!object.Equals(Parent, other.Parent)) return false;
-    if (!object.Equals(Summary, other.Summary)) return false;
-    if(!media_.Equals(other.media_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (name_ != null) hash ^= Name.GetHashCode();
-    if (parent_ != null) hash ^= Parent.GetHashCode();
-    if (summary_ != null) hash ^= Summary.GetHashCode();
-    hash ^= media_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (name_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Name);
-    }
-    if (parent_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Parent);
-    }
-    if (summary_ != null) {
-      output.WriteRawTag(26);
-      output.WriteMessage(Summary);
-    }
-    media_.WriteTo(output, _repeated_media_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (name_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
-    }
-    if (parent_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Parent);
-    }
-    if (summary_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Summary);
-    }
-    size += media_.CalculateSize(_repeated_media_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Brand other) {
-    if (other == null) {
-      return;
-    }
-    if (other.name_ != null) {
-      if (name_ == null) {
-        name_ = new global::Name();
-      }
-      Name.MergeFrom(other.Name);
-    }
-    if (other.parent_ != null) {
-      if (parent_ == null) {
-        parent_ = new global::Brand();
-      }
-      Parent.MergeFrom(other.Parent);
-    }
-    if (other.summary_ != null) {
-      if (summary_ == null) {
-        summary_ = new global::Content();
-      }
-      Summary.MergeFrom(other.Summary);
-    }
-    media_.Add(other.media_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (name_ == null) {
-            name_ = new global::Name();
-          }
-          input.ReadMessage(name_);
-          break;
-        }
-        case 18: {
-          if (parent_ == null) {
-            parent_ = new global::Brand();
-          }
-          input.ReadMessage(parent_);
-          break;
-        }
-        case 26: {
-          if (summary_ == null) {
-            summary_ = new global::Content();
-          }
-          input.ReadMessage(summary_);
-          break;
-        }
-        case 162: {
-          media_.AddEntriesFrom(input, _repeated_media_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Brandg.cs b/languages/csharp/Brandg.cs
deleted file mode 100644
index cb2c11a..0000000
--- a/languages/csharp/Brandg.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/Brand.proto</summary>
-public static partial class BrandReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/Brand.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static BrandReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChNjb250ZW50L0JyYW5kLnByb3RvGhJjb250ZW50L05hbWUucHJvdG8aFWNv",
-          "bnRlbnQvQ29udGVudC5wcm90bxoVbWVkaWEvTWVkaWFJdGVtLnByb3RvImoK",
-          "BUJyYW5kEhMKBG5hbWUYASABKAsyBS5OYW1lEhYKBnBhcmVudBgCIAEoCzIG",
-          "LkJyYW5kEhkKB3N1bW1hcnkYAyABKAsyCC5Db250ZW50EhkKBW1lZGlhGBQg",
-          "AygLMgouTWVkaWFJdGVtQjEKGmlvLmJsb29tYm94LnNjaGVtYS5jb250ZW50",
-          "QgxCcmFuZENvbnRlbnRIAVAB+AEBYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::NameReflection.Descriptor, global::ContentReflection.Descriptor, global::MediaItemReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Brand), global::Brand.Parser, new[]{ "Name", "Parent", "Summary", "Media" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Brand : pb::IMessage<Brand> {
-  private static readonly pb::MessageParser<Brand> _parser = new pb::MessageParser<Brand>(() => new Brand());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Brand> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::BrandReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Brand() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Brand(Brand other) : this() {
-    Name = other.name_ != null ? other.Name.Clone() : null;
-    Parent = other.parent_ != null ? other.Parent.Clone() : null;
-    Summary = other.summary_ != null ? other.Summary.Clone() : null;
-    media_ = other.media_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Brand Clone() {
-    return new Brand(this);
-  }
-
-  /// <summary>Field number for the "name" field.</summary>
-  public const int NameFieldNumber = 1;
-  private global::Name name_;
-  /// <summary>
-  /// -- Basic Properties
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Name {
-    get { return name_; }
-    set {
-      name_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "parent" field.</summary>
-  public const int ParentFieldNumber = 2;
-  private global::Brand parent_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Brand Parent {
-    get { return parent_; }
-    set {
-      parent_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "summary" field.</summary>
-  public const int SummaryFieldNumber = 3;
-  private global::Content summary_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Summary {
-    get { return summary_; }
-    set {
-      summary_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "media" field.</summary>
-  public const int MediaFieldNumber = 20;
-  private static readonly pb::FieldCodec<global::MediaItem> _repeated_media_codec
-      = pb::FieldCodec.ForMessage(162, global::MediaItem.Parser);
-  private readonly pbc::RepeatedField<global::MediaItem> media_ = new pbc::RepeatedField<global::MediaItem>();
-  /// <summary>
-  /// -- Media
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::MediaItem> Media {
-    get { return media_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Brand);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Brand other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Name, other.Name)) return false;
-    if (!object.Equals(Parent, other.Parent)) return false;
-    if (!object.Equals(Summary, other.Summary)) return false;
-    if(!media_.Equals(other.media_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (name_ != null) hash ^= Name.GetHashCode();
-    if (parent_ != null) hash ^= Parent.GetHashCode();
-    if (summary_ != null) hash ^= Summary.GetHashCode();
-    hash ^= media_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (name_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Name);
-    }
-    if (parent_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Parent);
-    }
-    if (summary_ != null) {
-      output.WriteRawTag(26);
-      output.WriteMessage(Summary);
-    }
-    media_.WriteTo(output, _repeated_media_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (name_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
-    }
-    if (parent_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Parent);
-    }
-    if (summary_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Summary);
-    }
-    size += media_.CalculateSize(_repeated_media_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Brand other) {
-    if (other == null) {
-      return;
-    }
-    if (other.name_ != null) {
-      if (name_ == null) {
-        name_ = new global::Name();
-      }
-      Name.MergeFrom(other.Name);
-    }
-    if (other.parent_ != null) {
-      if (parent_ == null) {
-        parent_ = new global::Brand();
-      }
-      Parent.MergeFrom(other.Parent);
-    }
-    if (other.summary_ != null) {
-      if (summary_ == null) {
-        summary_ = new global::Content();
-      }
-      Summary.MergeFrom(other.Summary);
-    }
-    media_.Add(other.media_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (name_ == null) {
-            name_ = new global::Name();
-          }
-          input.ReadMessage(name_);
-          break;
-        }
-        case 18: {
-          if (parent_ == null) {
-            parent_ = new global::Brand();
-          }
-          input.ReadMessage(parent_);
-          break;
-        }
-        case 26: {
-          if (summary_ == null) {
-            summary_ = new global::Content();
-          }
-          input.ReadMessage(summary_);
-          break;
-        }
-        case 162: {
-          media_.AddEntriesFrom(input, _repeated_media_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Compression.cs b/languages/csharp/Compression.cs
deleted file mode 100644
index 506987a..0000000
--- a/languages/csharp/Compression.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/Compression.proto</summary>
-public static partial class CompressionReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/Compression.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static CompressionReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZiYXNlL0NvbXByZXNzaW9uLnByb3RvIlEKC0NvbXByZXNzaW9uEg8KB2Vu",
-          "YWJsZWQYASABKAgSHwoEdHlwZRgCIAEoDjIRLkNvbXByZXNzaW9uLlR5cGUi",
-          "EAoEVHlwZRIICgRHWklQEABCLAoXaW8uYmxvb21ib3guc2NoZW1hLmJhc2VC",
-          "D0Jhc2VDb21wcmVzc2lvblABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Compression), global::Compression.Parser, new[]{ "Enabled", "Type" }, null, new[]{ typeof(global::Compression.Types.Type) }, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Compression : pb::IMessage<Compression> {
-  private static readonly pb::MessageParser<Compression> _parser = new pb::MessageParser<Compression>(() => new Compression());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Compression> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::CompressionReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Compression() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Compression(Compression other) : this() {
-    enabled_ = other.enabled_;
-    type_ = other.type_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Compression Clone() {
-    return new Compression(this);
-  }
-
-  /// <summary>Field number for the "enabled" field.</summary>
-  public const int EnabledFieldNumber = 1;
-  private bool enabled_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Enabled {
-    get { return enabled_; }
-    set {
-      enabled_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 2;
-  private global::Compression.Types.Type type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Compression.Types.Type Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Compression);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Compression other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Enabled != other.Enabled) return false;
-    if (Type != other.Type) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Enabled != false) hash ^= Enabled.GetHashCode();
-    if (Type != 0) hash ^= Type.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Enabled != false) {
-      output.WriteRawTag(8);
-      output.WriteBool(Enabled);
-    }
-    if (Type != 0) {
-      output.WriteRawTag(16);
-      output.WriteEnum((int) Type);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Enabled != false) {
-      size += 1 + 1;
-    }
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Compression other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Enabled != false) {
-      Enabled = other.Enabled;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          Enabled = input.ReadBool();
-          break;
-        }
-        case 16: {
-          type_ = (global::Compression.Types.Type) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the Compression message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum Type {
-      [pbr::OriginalName("GZIP")] Gzip = 0,
-    }
-
-  }
-  #endregion
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Compressiong.cs b/languages/csharp/Compressiong.cs
deleted file mode 100644
index b06bb2e..0000000
--- a/languages/csharp/Compressiong.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/Compression.proto</summary>
-public static partial class CompressionReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/Compression.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static CompressionReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZiYXNlL0NvbXByZXNzaW9uLnByb3RvIlEKC0NvbXByZXNzaW9uEg8KB2Vu",
-          "YWJsZWQYASABKAgSHwoEdHlwZRgCIAEoDjIRLkNvbXByZXNzaW9uLlR5cGUi",
-          "EAoEVHlwZRIICgRHWklQEABCMQoXaW8uYmxvb21ib3guc2NoZW1hLmJhc2VC",
-          "D0Jhc2VDb21wcmVzc2lvbkgBUAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Compression), global::Compression.Parser, new[]{ "Enabled", "Type" }, null, new[]{ typeof(global::Compression.Types.Type) }, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Compression : pb::IMessage<Compression> {
-  private static readonly pb::MessageParser<Compression> _parser = new pb::MessageParser<Compression>(() => new Compression());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Compression> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::CompressionReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Compression() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Compression(Compression other) : this() {
-    enabled_ = other.enabled_;
-    type_ = other.type_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Compression Clone() {
-    return new Compression(this);
-  }
-
-  /// <summary>Field number for the "enabled" field.</summary>
-  public const int EnabledFieldNumber = 1;
-  private bool enabled_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Enabled {
-    get { return enabled_; }
-    set {
-      enabled_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 2;
-  private global::Compression.Types.Type type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Compression.Types.Type Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Compression);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Compression other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Enabled != other.Enabled) return false;
-    if (Type != other.Type) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Enabled != false) hash ^= Enabled.GetHashCode();
-    if (Type != 0) hash ^= Type.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Enabled != false) {
-      output.WriteRawTag(8);
-      output.WriteBool(Enabled);
-    }
-    if (Type != 0) {
-      output.WriteRawTag(16);
-      output.WriteEnum((int) Type);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Enabled != false) {
-      size += 1 + 1;
-    }
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Compression other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Enabled != false) {
-      Enabled = other.Enabled;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          Enabled = input.ReadBool();
-          break;
-        }
-        case 16: {
-          type_ = (global::Compression.Types.Type) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the Compression message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum Type {
-      [pbr::OriginalName("GZIP")] Gzip = 0,
-    }
-
-  }
-  #endregion
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Content.cs b/languages/csharp/Content.cs
deleted file mode 100644
index 2dc0ba6..0000000
--- a/languages/csharp/Content.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/Content.proto</summary>
-public static partial class ContentReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/Content.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ContentReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVjb250ZW50L0NvbnRlbnQucHJvdG8aE2Jhc2UvTGFuZ3VhZ2UucHJvdG8a",
-          "FmJhc2UvQ29tcHJlc3Npb24ucHJvdG8i3AEKB0NvbnRlbnQSGwoEdHlwZRgB",
-          "IAEoDjINLkNvbnRlbnQuVHlwZRIjCghlbmNvZGluZxgCIAEoDjIRLkNvbnRl",
-          "bnQuRW5jb2RpbmcSDwoHY29udGVudBgDIAEoDBIbCghsYW5ndWFnZRgEIAEo",
-          "DjIJLkxhbmd1YWdlEiEKC2NvbXByZXNzaW9uGAUgASgLMgwuQ29tcHJlc3Np",
-          "b24iKAoEVHlwZRIICgRURVhUEAASDAoITUFSS0RPV04QARIICgRIVE1MEAIi",
-          "FAoIRW5jb2RpbmcSCAoEVVRGOBAAQi4KGmlvLmJsb29tYm94LnNjaGVtYS5j",
-          "b250ZW50Qg5HZW5lcmljQ29udGVudFABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::LanguageReflection.Descriptor, global::CompressionReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Content), global::Content.Parser, new[]{ "Type", "Encoding", "Content_", "Language", "Compression" }, null, new[]{ typeof(global::Content.Types.Type), typeof(global::Content.Types.Encoding) }, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Content : pb::IMessage<Content> {
-  private static readonly pb::MessageParser<Content> _parser = new pb::MessageParser<Content>(() => new Content());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Content> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ContentReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Content() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Content(Content other) : this() {
-    type_ = other.type_;
-    encoding_ = other.encoding_;
-    content_ = other.content_;
-    language_ = other.language_;
-    Compression = other.compression_ != null ? other.Compression.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Content Clone() {
-    return new Content(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::Content.Types.Type type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content.Types.Type Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "encoding" field.</summary>
-  public const int EncodingFieldNumber = 2;
-  private global::Content.Types.Encoding encoding_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content.Types.Encoding Encoding {
-    get { return encoding_; }
-    set {
-      encoding_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "content" field.</summary>
-  public const int Content_FieldNumber = 3;
-  private pb::ByteString content_ = pb::ByteString.Empty;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pb::ByteString Content_ {
-    get { return content_; }
-    set {
-      content_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "language" field.</summary>
-  public const int LanguageFieldNumber = 4;
-  private global::Language language_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Language Language {
-    get { return language_; }
-    set {
-      language_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "compression" field.</summary>
-  public const int CompressionFieldNumber = 5;
-  private global::Compression compression_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Compression Compression {
-    get { return compression_; }
-    set {
-      compression_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Content);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Content other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (Encoding != other.Encoding) return false;
-    if (Content_ != other.Content_) return false;
-    if (Language != other.Language) return false;
-    if (!object.Equals(Compression, other.Compression)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (Encoding != 0) hash ^= Encoding.GetHashCode();
-    if (Content_.Length != 0) hash ^= Content_.GetHashCode();
-    if (Language != 0) hash ^= Language.GetHashCode();
-    if (compression_ != null) hash ^= Compression.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (Encoding != 0) {
-      output.WriteRawTag(16);
-      output.WriteEnum((int) Encoding);
-    }
-    if (Content_.Length != 0) {
-      output.WriteRawTag(26);
-      output.WriteBytes(Content_);
-    }
-    if (Language != 0) {
-      output.WriteRawTag(32);
-      output.WriteEnum((int) Language);
-    }
-    if (compression_ != null) {
-      output.WriteRawTag(42);
-      output.WriteMessage(Compression);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (Encoding != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Encoding);
-    }
-    if (Content_.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeBytesSize(Content_);
-    }
-    if (Language != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Language);
-    }
-    if (compression_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Compression);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Content other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.Encoding != 0) {
-      Encoding = other.Encoding;
-    }
-    if (other.Content_.Length != 0) {
-      Content_ = other.Content_;
-    }
-    if (other.Language != 0) {
-      Language = other.Language;
-    }
-    if (other.compression_ != null) {
-      if (compression_ == null) {
-        compression_ = new global::Compression();
-      }
-      Compression.MergeFrom(other.Compression);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::Content.Types.Type) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          encoding_ = (global::Content.Types.Encoding) input.ReadEnum();
-          break;
-        }
-        case 26: {
-          Content_ = input.ReadBytes();
-          break;
-        }
-        case 32: {
-          language_ = (global::Language) input.ReadEnum();
-          break;
-        }
-        case 42: {
-          if (compression_ == null) {
-            compression_ = new global::Compression();
-          }
-          input.ReadMessage(compression_);
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the Content message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum Type {
-      [pbr::OriginalName("TEXT")] Text = 0,
-      [pbr::OriginalName("MARKDOWN")] Markdown = 1,
-      [pbr::OriginalName("HTML")] Html = 2,
-    }
-
-    public enum Encoding {
-      [pbr::OriginalName("UTF8")] Utf8 = 0,
-    }
-
-  }
-  #endregion
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Contentg.cs b/languages/csharp/Contentg.cs
deleted file mode 100644
index 5db4b11..0000000
--- a/languages/csharp/Contentg.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/Content.proto</summary>
-public static partial class ContentReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/Content.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ContentReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVjb250ZW50L0NvbnRlbnQucHJvdG8aE2Jhc2UvTGFuZ3VhZ2UucHJvdG8a",
-          "FmJhc2UvQ29tcHJlc3Npb24ucHJvdG8i3AEKB0NvbnRlbnQSGwoEdHlwZRgB",
-          "IAEoDjINLkNvbnRlbnQuVHlwZRIjCghlbmNvZGluZxgCIAEoDjIRLkNvbnRl",
-          "bnQuRW5jb2RpbmcSDwoHY29udGVudBgDIAEoDBIbCghsYW5ndWFnZRgEIAEo",
-          "DjIJLkxhbmd1YWdlEiEKC2NvbXByZXNzaW9uGAUgASgLMgwuQ29tcHJlc3Np",
-          "b24iKAoEVHlwZRIICgRURVhUEAASDAoITUFSS0RPV04QARIICgRIVE1MEAIi",
-          "FAoIRW5jb2RpbmcSCAoEVVRGOBAAQjMKGmlvLmJsb29tYm94LnNjaGVtYS5j",
-          "b250ZW50Qg5HZW5lcmljQ29udGVudEgBUAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::LanguageReflection.Descriptor, global::CompressionReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Content), global::Content.Parser, new[]{ "Type", "Encoding", "Content_", "Language", "Compression" }, null, new[]{ typeof(global::Content.Types.Type), typeof(global::Content.Types.Encoding) }, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Content : pb::IMessage<Content> {
-  private static readonly pb::MessageParser<Content> _parser = new pb::MessageParser<Content>(() => new Content());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Content> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ContentReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Content() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Content(Content other) : this() {
-    type_ = other.type_;
-    encoding_ = other.encoding_;
-    content_ = other.content_;
-    language_ = other.language_;
-    Compression = other.compression_ != null ? other.Compression.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Content Clone() {
-    return new Content(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::Content.Types.Type type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content.Types.Type Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "encoding" field.</summary>
-  public const int EncodingFieldNumber = 2;
-  private global::Content.Types.Encoding encoding_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content.Types.Encoding Encoding {
-    get { return encoding_; }
-    set {
-      encoding_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "content" field.</summary>
-  public const int Content_FieldNumber = 3;
-  private pb::ByteString content_ = pb::ByteString.Empty;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pb::ByteString Content_ {
-    get { return content_; }
-    set {
-      content_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "language" field.</summary>
-  public const int LanguageFieldNumber = 4;
-  private global::Language language_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Language Language {
-    get { return language_; }
-    set {
-      language_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "compression" field.</summary>
-  public const int CompressionFieldNumber = 5;
-  private global::Compression compression_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Compression Compression {
-    get { return compression_; }
-    set {
-      compression_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Content);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Content other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (Encoding != other.Encoding) return false;
-    if (Content_ != other.Content_) return false;
-    if (Language != other.Language) return false;
-    if (!object.Equals(Compression, other.Compression)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (Encoding != 0) hash ^= Encoding.GetHashCode();
-    if (Content_.Length != 0) hash ^= Content_.GetHashCode();
-    if (Language != 0) hash ^= Language.GetHashCode();
-    if (compression_ != null) hash ^= Compression.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (Encoding != 0) {
-      output.WriteRawTag(16);
-      output.WriteEnum((int) Encoding);
-    }
-    if (Content_.Length != 0) {
-      output.WriteRawTag(26);
-      output.WriteBytes(Content_);
-    }
-    if (Language != 0) {
-      output.WriteRawTag(32);
-      output.WriteEnum((int) Language);
-    }
-    if (compression_ != null) {
-      output.WriteRawTag(42);
-      output.WriteMessage(Compression);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (Encoding != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Encoding);
-    }
-    if (Content_.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeBytesSize(Content_);
-    }
-    if (Language != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Language);
-    }
-    if (compression_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Compression);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Content other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.Encoding != 0) {
-      Encoding = other.Encoding;
-    }
-    if (other.Content_.Length != 0) {
-      Content_ = other.Content_;
-    }
-    if (other.Language != 0) {
-      Language = other.Language;
-    }
-    if (other.compression_ != null) {
-      if (compression_ == null) {
-        compression_ = new global::Compression();
-      }
-      Compression.MergeFrom(other.Compression);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::Content.Types.Type) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          encoding_ = (global::Content.Types.Encoding) input.ReadEnum();
-          break;
-        }
-        case 26: {
-          Content_ = input.ReadBytes();
-          break;
-        }
-        case 32: {
-          language_ = (global::Language) input.ReadEnum();
-          break;
-        }
-        case 42: {
-          if (compression_ == null) {
-            compression_ = new global::Compression();
-          }
-          input.ReadMessage(compression_);
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the Content message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum Type {
-      [pbr::OriginalName("TEXT")] Text = 0,
-      [pbr::OriginalName("MARKDOWN")] Markdown = 1,
-      [pbr::OriginalName("HTML")] Html = 2,
-    }
-
-    public enum Encoding {
-      [pbr::OriginalName("UTF8")] Utf8 = 0,
-    }
-
-  }
-  #endregion
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/FlagsDescriptor.cs b/languages/csharp/FlagsDescriptor.cs
deleted file mode 100644
index e2ffd21..0000000
--- a/languages/csharp/FlagsDescriptor.cs
+++ /dev/null
@@ -1,541 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/FlagsDescriptor.proto</summary>
-public static partial class FlagsDescriptorReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/FlagsDescriptor.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static FlagsDescriptorReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Ch1zdHJ1Y3RzL0ZsYWdzRGVzY3JpcHRvci5wcm90byI9ChBQcm9kdWN0Rmxh",
-          "Z1ZhbHVlEhoKBHR5cGUYASABKA4yDC5Qcm9kdWN0RmxhZxINCgV2YWx1ZRgC",
-          "IAEoCCIyCg5Qcm9kdWN0RmxhZ3NldBIgCgVmbGFncxgBIAMoCzIRLlByb2R1",
-          "Y3RGbGFnVmFsdWUiagoPRmxhZ3NEZXNjcmlwdG9yEg8KB3Zpc2libGUYASAB",
-          "KAgSDwoHcHJlbWl1bRgCIAEoCBIQCghmZWF0dXJlZBgDIAEoCBISCgpsYXN0",
-          "Y2hhbmNlGAQgASgIEg8KB2luaG91c2UYBSABKAgqUgoLUHJvZHVjdEZsYWcS",
-          "CwoHVklTSUJMRRAAEgsKB1BSRU1JVU0QARIMCghGRUFUVVJFRBACEg4KCkxB",
-          "U1RDSEFOQ0UQAxILCgdJTkhPVVNFEARCMgohaW8uYmxvb21ib3guc2NoZW1h",
-          "LnByb2R1Y3Quc3RydWN0QgtCYXNlU3RydWN0c1ABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProductFlag), }, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductFlagValue), global::ProductFlagValue.Parser, new[]{ "Type", "Value" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductFlagset), global::ProductFlagset.Parser, new[]{ "Flags" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::FlagsDescriptor), global::FlagsDescriptor.Parser, new[]{ "Visible", "Premium", "Featured", "Lastchance", "Inhouse" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Enums
-public enum ProductFlag {
-  [pbr::OriginalName("VISIBLE")] Visible = 0,
-  [pbr::OriginalName("PREMIUM")] Premium = 1,
-  [pbr::OriginalName("FEATURED")] Featured = 2,
-  [pbr::OriginalName("LASTCHANCE")] Lastchance = 3,
-  [pbr::OriginalName("INHOUSE")] Inhouse = 4,
-}
-
-#endregion
-
-#region Messages
-public sealed partial class ProductFlagValue : pb::IMessage<ProductFlagValue> {
-  private static readonly pb::MessageParser<ProductFlagValue> _parser = new pb::MessageParser<ProductFlagValue>(() => new ProductFlagValue());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductFlagValue> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlagsDescriptorReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagValue() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagValue(ProductFlagValue other) : this() {
-    type_ = other.type_;
-    value_ = other.value_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagValue Clone() {
-    return new ProductFlagValue(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::ProductFlag type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductFlag Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "value" field.</summary>
-  public const int ValueFieldNumber = 2;
-  private bool value_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Value {
-    get { return value_; }
-    set {
-      value_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductFlagValue);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductFlagValue other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (Value != other.Value) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (Value != false) hash ^= Value.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (Value != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Value);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (Value != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductFlagValue other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.Value != false) {
-      Value = other.Value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::ProductFlag) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          Value = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class ProductFlagset : pb::IMessage<ProductFlagset> {
-  private static readonly pb::MessageParser<ProductFlagset> _parser = new pb::MessageParser<ProductFlagset>(() => new ProductFlagset());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductFlagset> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlagsDescriptorReflection.Descriptor.MessageTypes[1]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagset() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagset(ProductFlagset other) : this() {
-    flags_ = other.flags_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagset Clone() {
-    return new ProductFlagset(this);
-  }
-
-  /// <summary>Field number for the "flags" field.</summary>
-  public const int FlagsFieldNumber = 1;
-  private static readonly pb::FieldCodec<global::ProductFlagValue> _repeated_flags_codec
-      = pb::FieldCodec.ForMessage(10, global::ProductFlagValue.Parser);
-  private readonly pbc::RepeatedField<global::ProductFlagValue> flags_ = new pbc::RepeatedField<global::ProductFlagValue>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::ProductFlagValue> Flags {
-    get { return flags_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductFlagset);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductFlagset other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if(!flags_.Equals(other.flags_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    hash ^= flags_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    flags_.WriteTo(output, _repeated_flags_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    size += flags_.CalculateSize(_repeated_flags_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductFlagset other) {
-    if (other == null) {
-      return;
-    }
-    flags_.Add(other.flags_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          flags_.AddEntriesFrom(input, _repeated_flags_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class FlagsDescriptor : pb::IMessage<FlagsDescriptor> {
-  private static readonly pb::MessageParser<FlagsDescriptor> _parser = new pb::MessageParser<FlagsDescriptor>(() => new FlagsDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<FlagsDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlagsDescriptorReflection.Descriptor.MessageTypes[2]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FlagsDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FlagsDescriptor(FlagsDescriptor other) : this() {
-    visible_ = other.visible_;
-    premium_ = other.premium_;
-    featured_ = other.featured_;
-    lastchance_ = other.lastchance_;
-    inhouse_ = other.inhouse_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FlagsDescriptor Clone() {
-    return new FlagsDescriptor(this);
-  }
-
-  /// <summary>Field number for the "visible" field.</summary>
-  public const int VisibleFieldNumber = 1;
-  private bool visible_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Visible {
-    get { return visible_; }
-    set {
-      visible_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "premium" field.</summary>
-  public const int PremiumFieldNumber = 2;
-  private bool premium_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Premium {
-    get { return premium_; }
-    set {
-      premium_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "featured" field.</summary>
-  public const int FeaturedFieldNumber = 3;
-  private bool featured_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Featured {
-    get { return featured_; }
-    set {
-      featured_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "lastchance" field.</summary>
-  public const int LastchanceFieldNumber = 4;
-  private bool lastchance_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Lastchance {
-    get { return lastchance_; }
-    set {
-      lastchance_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "inhouse" field.</summary>
-  public const int InhouseFieldNumber = 5;
-  private bool inhouse_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Inhouse {
-    get { return inhouse_; }
-    set {
-      inhouse_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as FlagsDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(FlagsDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Visible != other.Visible) return false;
-    if (Premium != other.Premium) return false;
-    if (Featured != other.Featured) return false;
-    if (Lastchance != other.Lastchance) return false;
-    if (Inhouse != other.Inhouse) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Visible != false) hash ^= Visible.GetHashCode();
-    if (Premium != false) hash ^= Premium.GetHashCode();
-    if (Featured != false) hash ^= Featured.GetHashCode();
-    if (Lastchance != false) hash ^= Lastchance.GetHashCode();
-    if (Inhouse != false) hash ^= Inhouse.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Visible != false) {
-      output.WriteRawTag(8);
-      output.WriteBool(Visible);
-    }
-    if (Premium != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Premium);
-    }
-    if (Featured != false) {
-      output.WriteRawTag(24);
-      output.WriteBool(Featured);
-    }
-    if (Lastchance != false) {
-      output.WriteRawTag(32);
-      output.WriteBool(Lastchance);
-    }
-    if (Inhouse != false) {
-      output.WriteRawTag(40);
-      output.WriteBool(Inhouse);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Visible != false) {
-      size += 1 + 1;
-    }
-    if (Premium != false) {
-      size += 1 + 1;
-    }
-    if (Featured != false) {
-      size += 1 + 1;
-    }
-    if (Lastchance != false) {
-      size += 1 + 1;
-    }
-    if (Inhouse != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(FlagsDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Visible != false) {
-      Visible = other.Visible;
-    }
-    if (other.Premium != false) {
-      Premium = other.Premium;
-    }
-    if (other.Featured != false) {
-      Featured = other.Featured;
-    }
-    if (other.Lastchance != false) {
-      Lastchance = other.Lastchance;
-    }
-    if (other.Inhouse != false) {
-      Inhouse = other.Inhouse;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          Visible = input.ReadBool();
-          break;
-        }
-        case 16: {
-          Premium = input.ReadBool();
-          break;
-        }
-        case 24: {
-          Featured = input.ReadBool();
-          break;
-        }
-        case 32: {
-          Lastchance = input.ReadBool();
-          break;
-        }
-        case 40: {
-          Inhouse = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/FlagsDescriptorg.cs b/languages/csharp/FlagsDescriptorg.cs
deleted file mode 100644
index 764eae1..0000000
--- a/languages/csharp/FlagsDescriptorg.cs
+++ /dev/null
@@ -1,541 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/FlagsDescriptor.proto</summary>
-public static partial class FlagsDescriptorReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/FlagsDescriptor.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static FlagsDescriptorReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Ch1zdHJ1Y3RzL0ZsYWdzRGVzY3JpcHRvci5wcm90byI9ChBQcm9kdWN0Rmxh",
-          "Z1ZhbHVlEhoKBHR5cGUYASABKA4yDC5Qcm9kdWN0RmxhZxINCgV2YWx1ZRgC",
-          "IAEoCCIyCg5Qcm9kdWN0RmxhZ3NldBIgCgVmbGFncxgBIAMoCzIRLlByb2R1",
-          "Y3RGbGFnVmFsdWUiagoPRmxhZ3NEZXNjcmlwdG9yEg8KB3Zpc2libGUYASAB",
-          "KAgSDwoHcHJlbWl1bRgCIAEoCBIQCghmZWF0dXJlZBgDIAEoCBISCgpsYXN0",
-          "Y2hhbmNlGAQgASgIEg8KB2luaG91c2UYBSABKAgqUgoLUHJvZHVjdEZsYWcS",
-          "CwoHVklTSUJMRRAAEgsKB1BSRU1JVU0QARIMCghGRUFUVVJFRBACEg4KCkxB",
-          "U1RDSEFOQ0UQAxILCgdJTkhPVVNFEARCNwohaW8uYmxvb21ib3guc2NoZW1h",
-          "LnByb2R1Y3Quc3RydWN0QgtCYXNlU3RydWN0c0gBUAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProductFlag), }, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductFlagValue), global::ProductFlagValue.Parser, new[]{ "Type", "Value" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductFlagset), global::ProductFlagset.Parser, new[]{ "Flags" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::FlagsDescriptor), global::FlagsDescriptor.Parser, new[]{ "Visible", "Premium", "Featured", "Lastchance", "Inhouse" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Enums
-public enum ProductFlag {
-  [pbr::OriginalName("VISIBLE")] Visible = 0,
-  [pbr::OriginalName("PREMIUM")] Premium = 1,
-  [pbr::OriginalName("FEATURED")] Featured = 2,
-  [pbr::OriginalName("LASTCHANCE")] Lastchance = 3,
-  [pbr::OriginalName("INHOUSE")] Inhouse = 4,
-}
-
-#endregion
-
-#region Messages
-public sealed partial class ProductFlagValue : pb::IMessage<ProductFlagValue> {
-  private static readonly pb::MessageParser<ProductFlagValue> _parser = new pb::MessageParser<ProductFlagValue>(() => new ProductFlagValue());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductFlagValue> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlagsDescriptorReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagValue() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagValue(ProductFlagValue other) : this() {
-    type_ = other.type_;
-    value_ = other.value_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagValue Clone() {
-    return new ProductFlagValue(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::ProductFlag type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductFlag Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "value" field.</summary>
-  public const int ValueFieldNumber = 2;
-  private bool value_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Value {
-    get { return value_; }
-    set {
-      value_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductFlagValue);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductFlagValue other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (Value != other.Value) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (Value != false) hash ^= Value.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (Value != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Value);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (Value != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductFlagValue other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.Value != false) {
-      Value = other.Value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::ProductFlag) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          Value = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class ProductFlagset : pb::IMessage<ProductFlagset> {
-  private static readonly pb::MessageParser<ProductFlagset> _parser = new pb::MessageParser<ProductFlagset>(() => new ProductFlagset());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductFlagset> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlagsDescriptorReflection.Descriptor.MessageTypes[1]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagset() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagset(ProductFlagset other) : this() {
-    flags_ = other.flags_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductFlagset Clone() {
-    return new ProductFlagset(this);
-  }
-
-  /// <summary>Field number for the "flags" field.</summary>
-  public const int FlagsFieldNumber = 1;
-  private static readonly pb::FieldCodec<global::ProductFlagValue> _repeated_flags_codec
-      = pb::FieldCodec.ForMessage(10, global::ProductFlagValue.Parser);
-  private readonly pbc::RepeatedField<global::ProductFlagValue> flags_ = new pbc::RepeatedField<global::ProductFlagValue>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::ProductFlagValue> Flags {
-    get { return flags_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductFlagset);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductFlagset other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if(!flags_.Equals(other.flags_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    hash ^= flags_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    flags_.WriteTo(output, _repeated_flags_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    size += flags_.CalculateSize(_repeated_flags_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductFlagset other) {
-    if (other == null) {
-      return;
-    }
-    flags_.Add(other.flags_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          flags_.AddEntriesFrom(input, _repeated_flags_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class FlagsDescriptor : pb::IMessage<FlagsDescriptor> {
-  private static readonly pb::MessageParser<FlagsDescriptor> _parser = new pb::MessageParser<FlagsDescriptor>(() => new FlagsDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<FlagsDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlagsDescriptorReflection.Descriptor.MessageTypes[2]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FlagsDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FlagsDescriptor(FlagsDescriptor other) : this() {
-    visible_ = other.visible_;
-    premium_ = other.premium_;
-    featured_ = other.featured_;
-    lastchance_ = other.lastchance_;
-    inhouse_ = other.inhouse_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FlagsDescriptor Clone() {
-    return new FlagsDescriptor(this);
-  }
-
-  /// <summary>Field number for the "visible" field.</summary>
-  public const int VisibleFieldNumber = 1;
-  private bool visible_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Visible {
-    get { return visible_; }
-    set {
-      visible_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "premium" field.</summary>
-  public const int PremiumFieldNumber = 2;
-  private bool premium_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Premium {
-    get { return premium_; }
-    set {
-      premium_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "featured" field.</summary>
-  public const int FeaturedFieldNumber = 3;
-  private bool featured_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Featured {
-    get { return featured_; }
-    set {
-      featured_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "lastchance" field.</summary>
-  public const int LastchanceFieldNumber = 4;
-  private bool lastchance_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Lastchance {
-    get { return lastchance_; }
-    set {
-      lastchance_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "inhouse" field.</summary>
-  public const int InhouseFieldNumber = 5;
-  private bool inhouse_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Inhouse {
-    get { return inhouse_; }
-    set {
-      inhouse_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as FlagsDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(FlagsDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Visible != other.Visible) return false;
-    if (Premium != other.Premium) return false;
-    if (Featured != other.Featured) return false;
-    if (Lastchance != other.Lastchance) return false;
-    if (Inhouse != other.Inhouse) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Visible != false) hash ^= Visible.GetHashCode();
-    if (Premium != false) hash ^= Premium.GetHashCode();
-    if (Featured != false) hash ^= Featured.GetHashCode();
-    if (Lastchance != false) hash ^= Lastchance.GetHashCode();
-    if (Inhouse != false) hash ^= Inhouse.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Visible != false) {
-      output.WriteRawTag(8);
-      output.WriteBool(Visible);
-    }
-    if (Premium != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Premium);
-    }
-    if (Featured != false) {
-      output.WriteRawTag(24);
-      output.WriteBool(Featured);
-    }
-    if (Lastchance != false) {
-      output.WriteRawTag(32);
-      output.WriteBool(Lastchance);
-    }
-    if (Inhouse != false) {
-      output.WriteRawTag(40);
-      output.WriteBool(Inhouse);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Visible != false) {
-      size += 1 + 1;
-    }
-    if (Premium != false) {
-      size += 1 + 1;
-    }
-    if (Featured != false) {
-      size += 1 + 1;
-    }
-    if (Lastchance != false) {
-      size += 1 + 1;
-    }
-    if (Inhouse != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(FlagsDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Visible != false) {
-      Visible = other.Visible;
-    }
-    if (other.Premium != false) {
-      Premium = other.Premium;
-    }
-    if (other.Featured != false) {
-      Featured = other.Featured;
-    }
-    if (other.Lastchance != false) {
-      Lastchance = other.Lastchance;
-    }
-    if (other.Inhouse != false) {
-      Inhouse = other.Inhouse;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          Visible = input.ReadBool();
-          break;
-        }
-        case 16: {
-          Premium = input.ReadBool();
-          break;
-        }
-        case 24: {
-          Featured = input.ReadBool();
-          break;
-        }
-        case 32: {
-          Lastchance = input.ReadBool();
-          break;
-        }
-        case 40: {
-          Inhouse = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Flower.cs b/languages/csharp/Flower.cs
deleted file mode 100644
index 885babb..0000000
--- a/languages/csharp/Flower.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from products/Flower.proto</summary>
-public static partial class FlowerReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for products/Flower.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static FlowerReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVwcm9kdWN0cy9GbG93ZXIucHJvdG8aFWJhc2UvUHJvZHVjdEtleS5wcm90",
-          "bxobY29udGVudC9NYXRlcmlhbHNEYXRhLnByb3RvGhxjb250ZW50L1Byb2R1",
-          "Y3RDb250ZW50LnByb3RvGh1zdHJ1Y3RzL0ZsYWdzRGVzY3JpcHRvci5wcm90",
-          "bxonc3RydWN0cy9wcmljaW5nL1ByaWNpbmdEZXNjcmlwdG9yLnByb3RvIrMB",
-          "CgZGbG93ZXISGAoDa2V5GAEgASgLMgsuUHJvZHVjdEtleRIlCgxwcm9kdWN0",
-          "X2RhdGEYFCABKAsyDy5Qcm9kdWN0Q29udGVudBIlCg1tYXRlcmlhbF9kYXRh",
-          "GBUgASgLMg4uTWF0ZXJpYWxzRGF0YRIfCgVmbGFncxgWIAEoCzIQLkZsYWdz",
-          "RGVzY3JpcHRvchIgCgdwcmljaW5nGBcgASgLMg8uUHJvZHVjdFByaWNpbmdC",
-          "LQoaaW8uYmxvb21ib3guc2NoZW1hLnByb2R1Y3RCDUZsb3dlclByb2R1Y3RQ",
-          "AGIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::ProductKeyReflection.Descriptor, global::MaterialsDataReflection.Descriptor, global::ProductContentReflection.Descriptor, global::FlagsDescriptorReflection.Descriptor, global::PricingDescriptorReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Flower), global::Flower.Parser, new[]{ "Key", "ProductData", "MaterialData", "Flags", "Pricing" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Flower : pb::IMessage<Flower> {
-  private static readonly pb::MessageParser<Flower> _parser = new pb::MessageParser<Flower>(() => new Flower());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Flower> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlowerReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Flower() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Flower(Flower other) : this() {
-    Key = other.key_ != null ? other.Key.Clone() : null;
-    ProductData = other.productData_ != null ? other.ProductData.Clone() : null;
-    MaterialData = other.materialData_ != null ? other.MaterialData.Clone() : null;
-    Flags = other.flags_ != null ? other.Flags.Clone() : null;
-    Pricing = other.pricing_ != null ? other.Pricing.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Flower Clone() {
-    return new Flower(this);
-  }
-
-  /// <summary>Field number for the "key" field.</summary>
-  public const int KeyFieldNumber = 1;
-  private global::ProductKey key_;
-  /// <summary>
-  /// -- Object Key
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductKey Key {
-    get { return key_; }
-    set {
-      key_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "product_data" field.</summary>
-  public const int ProductDataFieldNumber = 20;
-  private global::ProductContent productData_;
-  /// <summary>
-  /// -- Basic Product &amp; Materials Data
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductContent ProductData {
-    get { return productData_; }
-    set {
-      productData_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "material_data" field.</summary>
-  public const int MaterialDataFieldNumber = 21;
-  private global::MaterialsData materialData_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MaterialsData MaterialData {
-    get { return materialData_; }
-    set {
-      materialData_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "flags" field.</summary>
-  public const int FlagsFieldNumber = 22;
-  private global::FlagsDescriptor flags_;
-  /// <summary>
-  /// -- Flags and Pricing
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::FlagsDescriptor Flags {
-    get { return flags_; }
-    set {
-      flags_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "pricing" field.</summary>
-  public const int PricingFieldNumber = 23;
-  private global::ProductPricing pricing_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductPricing Pricing {
-    get { return pricing_; }
-    set {
-      pricing_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Flower);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Flower other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Key, other.Key)) return false;
-    if (!object.Equals(ProductData, other.ProductData)) return false;
-    if (!object.Equals(MaterialData, other.MaterialData)) return false;
-    if (!object.Equals(Flags, other.Flags)) return false;
-    if (!object.Equals(Pricing, other.Pricing)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (key_ != null) hash ^= Key.GetHashCode();
-    if (productData_ != null) hash ^= ProductData.GetHashCode();
-    if (materialData_ != null) hash ^= MaterialData.GetHashCode();
-    if (flags_ != null) hash ^= Flags.GetHashCode();
-    if (pricing_ != null) hash ^= Pricing.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (key_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Key);
-    }
-    if (productData_ != null) {
-      output.WriteRawTag(162, 1);
-      output.WriteMessage(ProductData);
-    }
-    if (materialData_ != null) {
-      output.WriteRawTag(170, 1);
-      output.WriteMessage(MaterialData);
-    }
-    if (flags_ != null) {
-      output.WriteRawTag(178, 1);
-      output.WriteMessage(Flags);
-    }
-    if (pricing_ != null) {
-      output.WriteRawTag(186, 1);
-      output.WriteMessage(Pricing);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (key_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Key);
-    }
-    if (productData_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(ProductData);
-    }
-    if (materialData_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(MaterialData);
-    }
-    if (flags_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Flags);
-    }
-    if (pricing_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Pricing);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Flower other) {
-    if (other == null) {
-      return;
-    }
-    if (other.key_ != null) {
-      if (key_ == null) {
-        key_ = new global::ProductKey();
-      }
-      Key.MergeFrom(other.Key);
-    }
-    if (other.productData_ != null) {
-      if (productData_ == null) {
-        productData_ = new global::ProductContent();
-      }
-      ProductData.MergeFrom(other.ProductData);
-    }
-    if (other.materialData_ != null) {
-      if (materialData_ == null) {
-        materialData_ = new global::MaterialsData();
-      }
-      MaterialData.MergeFrom(other.MaterialData);
-    }
-    if (other.flags_ != null) {
-      if (flags_ == null) {
-        flags_ = new global::FlagsDescriptor();
-      }
-      Flags.MergeFrom(other.Flags);
-    }
-    if (other.pricing_ != null) {
-      if (pricing_ == null) {
-        pricing_ = new global::ProductPricing();
-      }
-      Pricing.MergeFrom(other.Pricing);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (key_ == null) {
-            key_ = new global::ProductKey();
-          }
-          input.ReadMessage(key_);
-          break;
-        }
-        case 162: {
-          if (productData_ == null) {
-            productData_ = new global::ProductContent();
-          }
-          input.ReadMessage(productData_);
-          break;
-        }
-        case 170: {
-          if (materialData_ == null) {
-            materialData_ = new global::MaterialsData();
-          }
-          input.ReadMessage(materialData_);
-          break;
-        }
-        case 178: {
-          if (flags_ == null) {
-            flags_ = new global::FlagsDescriptor();
-          }
-          input.ReadMessage(flags_);
-          break;
-        }
-        case 186: {
-          if (pricing_ == null) {
-            pricing_ = new global::ProductPricing();
-          }
-          input.ReadMessage(pricing_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Flowerg.cs b/languages/csharp/Flowerg.cs
deleted file mode 100644
index 804d05b..0000000
--- a/languages/csharp/Flowerg.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from products/Flower.proto</summary>
-public static partial class FlowerReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for products/Flower.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static FlowerReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVwcm9kdWN0cy9GbG93ZXIucHJvdG8aFWJhc2UvUHJvZHVjdEtleS5wcm90",
-          "bxobY29udGVudC9NYXRlcmlhbHNEYXRhLnByb3RvGhxjb250ZW50L1Byb2R1",
-          "Y3RDb250ZW50LnByb3RvGh1zdHJ1Y3RzL0ZsYWdzRGVzY3JpcHRvci5wcm90",
-          "bxonc3RydWN0cy9wcmljaW5nL1ByaWNpbmdEZXNjcmlwdG9yLnByb3RvIrMB",
-          "CgZGbG93ZXISGAoDa2V5GAEgASgLMgsuUHJvZHVjdEtleRIlCgxwcm9kdWN0",
-          "X2RhdGEYFCABKAsyDy5Qcm9kdWN0Q29udGVudBIlCg1tYXRlcmlhbF9kYXRh",
-          "GBUgASgLMg4uTWF0ZXJpYWxzRGF0YRIfCgVmbGFncxgWIAEoCzIQLkZsYWdz",
-          "RGVzY3JpcHRvchIgCgdwcmljaW5nGBcgASgLMg8uUHJvZHVjdFByaWNpbmdC",
-          "MgoaaW8uYmxvb21ib3guc2NoZW1hLnByb2R1Y3RCDUZsb3dlclByb2R1Y3RI",
-          "AVAA+AEBYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::ProductKeyReflection.Descriptor, global::MaterialsDataReflection.Descriptor, global::ProductContentReflection.Descriptor, global::FlagsDescriptorReflection.Descriptor, global::PricingDescriptorReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Flower), global::Flower.Parser, new[]{ "Key", "ProductData", "MaterialData", "Flags", "Pricing" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Flower : pb::IMessage<Flower> {
-  private static readonly pb::MessageParser<Flower> _parser = new pb::MessageParser<Flower>(() => new Flower());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Flower> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::FlowerReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Flower() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Flower(Flower other) : this() {
-    Key = other.key_ != null ? other.Key.Clone() : null;
-    ProductData = other.productData_ != null ? other.ProductData.Clone() : null;
-    MaterialData = other.materialData_ != null ? other.MaterialData.Clone() : null;
-    Flags = other.flags_ != null ? other.Flags.Clone() : null;
-    Pricing = other.pricing_ != null ? other.Pricing.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Flower Clone() {
-    return new Flower(this);
-  }
-
-  /// <summary>Field number for the "key" field.</summary>
-  public const int KeyFieldNumber = 1;
-  private global::ProductKey key_;
-  /// <summary>
-  /// -- Object Key
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductKey Key {
-    get { return key_; }
-    set {
-      key_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "product_data" field.</summary>
-  public const int ProductDataFieldNumber = 20;
-  private global::ProductContent productData_;
-  /// <summary>
-  /// -- Basic Product &amp; Materials Data
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductContent ProductData {
-    get { return productData_; }
-    set {
-      productData_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "material_data" field.</summary>
-  public const int MaterialDataFieldNumber = 21;
-  private global::MaterialsData materialData_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MaterialsData MaterialData {
-    get { return materialData_; }
-    set {
-      materialData_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "flags" field.</summary>
-  public const int FlagsFieldNumber = 22;
-  private global::FlagsDescriptor flags_;
-  /// <summary>
-  /// -- Flags and Pricing
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::FlagsDescriptor Flags {
-    get { return flags_; }
-    set {
-      flags_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "pricing" field.</summary>
-  public const int PricingFieldNumber = 23;
-  private global::ProductPricing pricing_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductPricing Pricing {
-    get { return pricing_; }
-    set {
-      pricing_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Flower);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Flower other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Key, other.Key)) return false;
-    if (!object.Equals(ProductData, other.ProductData)) return false;
-    if (!object.Equals(MaterialData, other.MaterialData)) return false;
-    if (!object.Equals(Flags, other.Flags)) return false;
-    if (!object.Equals(Pricing, other.Pricing)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (key_ != null) hash ^= Key.GetHashCode();
-    if (productData_ != null) hash ^= ProductData.GetHashCode();
-    if (materialData_ != null) hash ^= MaterialData.GetHashCode();
-    if (flags_ != null) hash ^= Flags.GetHashCode();
-    if (pricing_ != null) hash ^= Pricing.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (key_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Key);
-    }
-    if (productData_ != null) {
-      output.WriteRawTag(162, 1);
-      output.WriteMessage(ProductData);
-    }
-    if (materialData_ != null) {
-      output.WriteRawTag(170, 1);
-      output.WriteMessage(MaterialData);
-    }
-    if (flags_ != null) {
-      output.WriteRawTag(178, 1);
-      output.WriteMessage(Flags);
-    }
-    if (pricing_ != null) {
-      output.WriteRawTag(186, 1);
-      output.WriteMessage(Pricing);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (key_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Key);
-    }
-    if (productData_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(ProductData);
-    }
-    if (materialData_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(MaterialData);
-    }
-    if (flags_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Flags);
-    }
-    if (pricing_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Pricing);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Flower other) {
-    if (other == null) {
-      return;
-    }
-    if (other.key_ != null) {
-      if (key_ == null) {
-        key_ = new global::ProductKey();
-      }
-      Key.MergeFrom(other.Key);
-    }
-    if (other.productData_ != null) {
-      if (productData_ == null) {
-        productData_ = new global::ProductContent();
-      }
-      ProductData.MergeFrom(other.ProductData);
-    }
-    if (other.materialData_ != null) {
-      if (materialData_ == null) {
-        materialData_ = new global::MaterialsData();
-      }
-      MaterialData.MergeFrom(other.MaterialData);
-    }
-    if (other.flags_ != null) {
-      if (flags_ == null) {
-        flags_ = new global::FlagsDescriptor();
-      }
-      Flags.MergeFrom(other.Flags);
-    }
-    if (other.pricing_ != null) {
-      if (pricing_ == null) {
-        pricing_ = new global::ProductPricing();
-      }
-      Pricing.MergeFrom(other.Pricing);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (key_ == null) {
-            key_ = new global::ProductKey();
-          }
-          input.ReadMessage(key_);
-          break;
-        }
-        case 162: {
-          if (productData_ == null) {
-            productData_ = new global::ProductContent();
-          }
-          input.ReadMessage(productData_);
-          break;
-        }
-        case 170: {
-          if (materialData_ == null) {
-            materialData_ = new global::MaterialsData();
-          }
-          input.ReadMessage(materialData_);
-          break;
-        }
-        case 178: {
-          if (flags_ == null) {
-            flags_ = new global::FlagsDescriptor();
-          }
-          input.ReadMessage(flags_);
-          break;
-        }
-        case 186: {
-          if (pricing_ == null) {
-            pricing_ = new global::ProductPricing();
-          }
-          input.ReadMessage(pricing_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Genetics.cs b/languages/csharp/Genetics.cs
deleted file mode 100644
index 08d906b..0000000
--- a/languages/csharp/Genetics.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/Genetics.proto</summary>
-public static partial class GeneticsReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/Genetics.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static GeneticsReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZzdHJ1Y3RzL0dlbmV0aWNzLnByb3RvGhJjb250ZW50L05hbWUucHJvdG8i",
-          "NgoIR2VuZXRpY3MSEwoEbWFsZRgBIAEoCzIFLk5hbWUSFQoGZmVtYWxlGAIg",
-          "ASgLMgUuTmFtZUI2CiFpby5ibG9vbWJveC5zY2hlbWEucHJvZHVjdC5zdHJ1",
-          "Y3RCD0dlbmV0aWNzU3RydWN0c1ABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::NameReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Genetics), global::Genetics.Parser, new[]{ "Male", "Female" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Genetics : pb::IMessage<Genetics> {
-  private static readonly pb::MessageParser<Genetics> _parser = new pb::MessageParser<Genetics>(() => new Genetics());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Genetics> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::GeneticsReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Genetics() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Genetics(Genetics other) : this() {
-    Male = other.male_ != null ? other.Male.Clone() : null;
-    Female = other.female_ != null ? other.Female.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Genetics Clone() {
-    return new Genetics(this);
-  }
-
-  /// <summary>Field number for the "male" field.</summary>
-  public const int MaleFieldNumber = 1;
-  private global::Name male_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Male {
-    get { return male_; }
-    set {
-      male_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "female" field.</summary>
-  public const int FemaleFieldNumber = 2;
-  private global::Name female_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Female {
-    get { return female_; }
-    set {
-      female_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Genetics);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Genetics other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Male, other.Male)) return false;
-    if (!object.Equals(Female, other.Female)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (male_ != null) hash ^= Male.GetHashCode();
-    if (female_ != null) hash ^= Female.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (male_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Male);
-    }
-    if (female_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Female);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (male_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Male);
-    }
-    if (female_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Female);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Genetics other) {
-    if (other == null) {
-      return;
-    }
-    if (other.male_ != null) {
-      if (male_ == null) {
-        male_ = new global::Name();
-      }
-      Male.MergeFrom(other.Male);
-    }
-    if (other.female_ != null) {
-      if (female_ == null) {
-        female_ = new global::Name();
-      }
-      Female.MergeFrom(other.Female);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (male_ == null) {
-            male_ = new global::Name();
-          }
-          input.ReadMessage(male_);
-          break;
-        }
-        case 18: {
-          if (female_ == null) {
-            female_ = new global::Name();
-          }
-          input.ReadMessage(female_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Geneticsg.cs b/languages/csharp/Geneticsg.cs
deleted file mode 100644
index dd546d0..0000000
--- a/languages/csharp/Geneticsg.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/Genetics.proto</summary>
-public static partial class GeneticsReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/Genetics.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static GeneticsReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZzdHJ1Y3RzL0dlbmV0aWNzLnByb3RvGhJjb250ZW50L05hbWUucHJvdG8i",
-          "NgoIR2VuZXRpY3MSEwoEbWFsZRgBIAEoCzIFLk5hbWUSFQoGZmVtYWxlGAIg",
-          "ASgLMgUuTmFtZUI7CiFpby5ibG9vbWJveC5zY2hlbWEucHJvZHVjdC5zdHJ1",
-          "Y3RCD0dlbmV0aWNzU3RydWN0c0gBUAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::NameReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Genetics), global::Genetics.Parser, new[]{ "Male", "Female" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Genetics : pb::IMessage<Genetics> {
-  private static readonly pb::MessageParser<Genetics> _parser = new pb::MessageParser<Genetics>(() => new Genetics());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Genetics> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::GeneticsReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Genetics() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Genetics(Genetics other) : this() {
-    Male = other.male_ != null ? other.Male.Clone() : null;
-    Female = other.female_ != null ? other.Female.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Genetics Clone() {
-    return new Genetics(this);
-  }
-
-  /// <summary>Field number for the "male" field.</summary>
-  public const int MaleFieldNumber = 1;
-  private global::Name male_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Male {
-    get { return male_; }
-    set {
-      male_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "female" field.</summary>
-  public const int FemaleFieldNumber = 2;
-  private global::Name female_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Female {
-    get { return female_; }
-    set {
-      female_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Genetics);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Genetics other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Male, other.Male)) return false;
-    if (!object.Equals(Female, other.Female)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (male_ != null) hash ^= Male.GetHashCode();
-    if (female_ != null) hash ^= Female.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (male_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Male);
-    }
-    if (female_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Female);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (male_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Male);
-    }
-    if (female_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Female);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Genetics other) {
-    if (other == null) {
-      return;
-    }
-    if (other.male_ != null) {
-      if (male_ == null) {
-        male_ = new global::Name();
-      }
-      Male.MergeFrom(other.Male);
-    }
-    if (other.female_ != null) {
-      if (female_ == null) {
-        female_ = new global::Name();
-      }
-      Female.MergeFrom(other.Female);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (male_ == null) {
-            male_ = new global::Name();
-          }
-          input.ReadMessage(male_);
-          break;
-        }
-        case 18: {
-          if (female_ == null) {
-            female_ = new global::Name();
-          }
-          input.ReadMessage(female_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Grow.cs b/languages/csharp/Grow.cs
deleted file mode 100644
index 075baf3..0000000
--- a/languages/csharp/Grow.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/Grow.proto</summary>
-public static partial class GrowReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/Grow.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static GrowReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChJzdHJ1Y3RzL0dyb3cucHJvdG8qPAoER3JvdxILCgdHRU5FUklDEAASCgoG",
-          "SU5ET09SEAESDgoKR1JFRU5IT1VTRRACEgsKB09VVERPT1IQA0IzCiFpby5i",
-          "bG9vbWJveC5zY2hlbWEucHJvZHVjdC5zdHJ1Y3RCDE1hdGVyaWFsR3Jvd1AB",
-          "YgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Grow), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum Grow {
-  [pbr::OriginalName("GENERIC")] Generic = 0,
-  [pbr::OriginalName("INDOOR")] Indoor = 1,
-  [pbr::OriginalName("GREENHOUSE")] Greenhouse = 2,
-  [pbr::OriginalName("OUTDOOR")] Outdoor = 3,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Growg.cs b/languages/csharp/Growg.cs
deleted file mode 100644
index b1864a9..0000000
--- a/languages/csharp/Growg.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/Grow.proto</summary>
-public static partial class GrowReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/Grow.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static GrowReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChJzdHJ1Y3RzL0dyb3cucHJvdG8qPAoER3JvdxILCgdHRU5FUklDEAASCgoG",
-          "SU5ET09SEAESDgoKR1JFRU5IT1VTRRACEgsKB09VVERPT1IQA0I4CiFpby5i",
-          "bG9vbWJveC5zY2hlbWEucHJvZHVjdC5zdHJ1Y3RCDE1hdGVyaWFsR3Jvd0gB",
-          "UAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Grow), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum Grow {
-  [pbr::OriginalName("GENERIC")] Generic = 0,
-  [pbr::OriginalName("INDOOR")] Indoor = 1,
-  [pbr::OriginalName("GREENHOUSE")] Greenhouse = 2,
-  [pbr::OriginalName("OUTDOOR")] Outdoor = 3,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Language.cs b/languages/csharp/Language.cs
deleted file mode 100644
index 5a58058..0000000
--- a/languages/csharp/Language.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/Language.proto</summary>
-public static partial class LanguageReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/Language.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static LanguageReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChNiYXNlL0xhbmd1YWdlLnByb3RvKjAKCExhbmd1YWdlEgsKB0VOR0xJU0gQ",
-          "ABILCgdTUEFOSVNIEAESCgoGRlJFTkNIEAJCKQoXaW8uYmxvb21ib3guc2No",
-          "ZW1hLmJhc2VCDEJhc2VMYW5ndWFnZVABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Language), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum Language {
-  [pbr::OriginalName("ENGLISH")] English = 0,
-  [pbr::OriginalName("SPANISH")] Spanish = 1,
-  [pbr::OriginalName("FRENCH")] French = 2,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Languageg.cs b/languages/csharp/Languageg.cs
deleted file mode 100644
index 2ac1bcb..0000000
--- a/languages/csharp/Languageg.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/Language.proto</summary>
-public static partial class LanguageReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/Language.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static LanguageReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChNiYXNlL0xhbmd1YWdlLnByb3RvKjAKCExhbmd1YWdlEgsKB0VOR0xJU0gQ",
-          "ABILCgdTUEFOSVNIEAESCgoGRlJFTkNIEAJCLgoXaW8uYmxvb21ib3guc2No",
-          "ZW1hLmJhc2VCDEJhc2VMYW5ndWFnZUgBUAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Language), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum Language {
-  [pbr::OriginalName("ENGLISH")] English = 0,
-  [pbr::OriginalName("SPANISH")] Spanish = 1,
-  [pbr::OriginalName("FRENCH")] French = 2,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MaterialsData.cs b/languages/csharp/MaterialsData.cs
deleted file mode 100644
index 650a70b..0000000
--- a/languages/csharp/MaterialsData.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/MaterialsData.proto</summary>
-public static partial class MaterialsDataReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/MaterialsData.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MaterialsDataReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Chtjb250ZW50L01hdGVyaWFsc0RhdGEucHJvdG8aEnN0cnVjdHMvR3Jvdy5w",
-          "cm90bxoVc3RydWN0cy9TcGVjaWVzLnByb3RvGhZzdHJ1Y3RzL0dlbmV0aWNz",
-          "LnByb3RvInEKDU1hdGVyaWFsc0RhdGESEwoLaW5ncmVkaWVudHMYASADKAkS",
-          "EwoEZ3JvdxgCIAEoDjIFLkdyb3cSGQoHc3BlY2llcxgDIAEoDjIILlNwZWNp",
-          "ZXMSGwoIZ2VuZXRpY3MYBCABKAsyCS5HZW5ldGljc0IwChppby5ibG9vbWJv",
-          "eC5zY2hlbWEuY29udGVudEIQTWF0ZXJpYWxzQ29udGVudFABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::GrowReflection.Descriptor, global::SpeciesReflection.Descriptor, global::GeneticsReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MaterialsData), global::MaterialsData.Parser, new[]{ "Ingredients", "Grow", "Species", "Genetics" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class MaterialsData : pb::IMessage<MaterialsData> {
-  private static readonly pb::MessageParser<MaterialsData> _parser = new pb::MessageParser<MaterialsData>(() => new MaterialsData());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MaterialsData> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MaterialsDataReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MaterialsData() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MaterialsData(MaterialsData other) : this() {
-    ingredients_ = other.ingredients_.Clone();
-    grow_ = other.grow_;
-    species_ = other.species_;
-    Genetics = other.genetics_ != null ? other.Genetics.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MaterialsData Clone() {
-    return new MaterialsData(this);
-  }
-
-  /// <summary>Field number for the "ingredients" field.</summary>
-  public const int IngredientsFieldNumber = 1;
-  private static readonly pb::FieldCodec<string> _repeated_ingredients_codec
-      = pb::FieldCodec.ForString(10);
-  private readonly pbc::RepeatedField<string> ingredients_ = new pbc::RepeatedField<string>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<string> Ingredients {
-    get { return ingredients_; }
-  }
-
-  /// <summary>Field number for the "grow" field.</summary>
-  public const int GrowFieldNumber = 2;
-  private global::Grow grow_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Grow Grow {
-    get { return grow_; }
-    set {
-      grow_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "species" field.</summary>
-  public const int SpeciesFieldNumber = 3;
-  private global::Species species_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Species Species {
-    get { return species_; }
-    set {
-      species_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "genetics" field.</summary>
-  public const int GeneticsFieldNumber = 4;
-  private global::Genetics genetics_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Genetics Genetics {
-    get { return genetics_; }
-    set {
-      genetics_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MaterialsData);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MaterialsData other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if(!ingredients_.Equals(other.ingredients_)) return false;
-    if (Grow != other.Grow) return false;
-    if (Species != other.Species) return false;
-    if (!object.Equals(Genetics, other.Genetics)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    hash ^= ingredients_.GetHashCode();
-    if (Grow != 0) hash ^= Grow.GetHashCode();
-    if (Species != 0) hash ^= Species.GetHashCode();
-    if (genetics_ != null) hash ^= Genetics.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    ingredients_.WriteTo(output, _repeated_ingredients_codec);
-    if (Grow != 0) {
-      output.WriteRawTag(16);
-      output.WriteEnum((int) Grow);
-    }
-    if (Species != 0) {
-      output.WriteRawTag(24);
-      output.WriteEnum((int) Species);
-    }
-    if (genetics_ != null) {
-      output.WriteRawTag(34);
-      output.WriteMessage(Genetics);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    size += ingredients_.CalculateSize(_repeated_ingredients_codec);
-    if (Grow != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Grow);
-    }
-    if (Species != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Species);
-    }
-    if (genetics_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Genetics);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MaterialsData other) {
-    if (other == null) {
-      return;
-    }
-    ingredients_.Add(other.ingredients_);
-    if (other.Grow != 0) {
-      Grow = other.Grow;
-    }
-    if (other.Species != 0) {
-      Species = other.Species;
-    }
-    if (other.genetics_ != null) {
-      if (genetics_ == null) {
-        genetics_ = new global::Genetics();
-      }
-      Genetics.MergeFrom(other.Genetics);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          ingredients_.AddEntriesFrom(input, _repeated_ingredients_codec);
-          break;
-        }
-        case 16: {
-          grow_ = (global::Grow) input.ReadEnum();
-          break;
-        }
-        case 24: {
-          species_ = (global::Species) input.ReadEnum();
-          break;
-        }
-        case 34: {
-          if (genetics_ == null) {
-            genetics_ = new global::Genetics();
-          }
-          input.ReadMessage(genetics_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MaterialsDatag.cs b/languages/csharp/MaterialsDatag.cs
deleted file mode 100644
index 6548dac..0000000
--- a/languages/csharp/MaterialsDatag.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/MaterialsData.proto</summary>
-public static partial class MaterialsDataReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/MaterialsData.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MaterialsDataReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Chtjb250ZW50L01hdGVyaWFsc0RhdGEucHJvdG8aEnN0cnVjdHMvR3Jvdy5w",
-          "cm90bxoVc3RydWN0cy9TcGVjaWVzLnByb3RvGhZzdHJ1Y3RzL0dlbmV0aWNz",
-          "LnByb3RvInEKDU1hdGVyaWFsc0RhdGESEwoLaW5ncmVkaWVudHMYASADKAkS",
-          "EwoEZ3JvdxgCIAEoDjIFLkdyb3cSGQoHc3BlY2llcxgDIAEoDjIILlNwZWNp",
-          "ZXMSGwoIZ2VuZXRpY3MYBCABKAsyCS5HZW5ldGljc0I1Chppby5ibG9vbWJv",
-          "eC5zY2hlbWEuY29udGVudEIQTWF0ZXJpYWxzQ29udGVudEgBUAH4AQFiBnBy",
-          "b3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::GrowReflection.Descriptor, global::SpeciesReflection.Descriptor, global::GeneticsReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MaterialsData), global::MaterialsData.Parser, new[]{ "Ingredients", "Grow", "Species", "Genetics" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class MaterialsData : pb::IMessage<MaterialsData> {
-  private static readonly pb::MessageParser<MaterialsData> _parser = new pb::MessageParser<MaterialsData>(() => new MaterialsData());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MaterialsData> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MaterialsDataReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MaterialsData() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MaterialsData(MaterialsData other) : this() {
-    ingredients_ = other.ingredients_.Clone();
-    grow_ = other.grow_;
-    species_ = other.species_;
-    Genetics = other.genetics_ != null ? other.Genetics.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MaterialsData Clone() {
-    return new MaterialsData(this);
-  }
-
-  /// <summary>Field number for the "ingredients" field.</summary>
-  public const int IngredientsFieldNumber = 1;
-  private static readonly pb::FieldCodec<string> _repeated_ingredients_codec
-      = pb::FieldCodec.ForString(10);
-  private readonly pbc::RepeatedField<string> ingredients_ = new pbc::RepeatedField<string>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<string> Ingredients {
-    get { return ingredients_; }
-  }
-
-  /// <summary>Field number for the "grow" field.</summary>
-  public const int GrowFieldNumber = 2;
-  private global::Grow grow_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Grow Grow {
-    get { return grow_; }
-    set {
-      grow_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "species" field.</summary>
-  public const int SpeciesFieldNumber = 3;
-  private global::Species species_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Species Species {
-    get { return species_; }
-    set {
-      species_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "genetics" field.</summary>
-  public const int GeneticsFieldNumber = 4;
-  private global::Genetics genetics_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Genetics Genetics {
-    get { return genetics_; }
-    set {
-      genetics_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MaterialsData);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MaterialsData other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if(!ingredients_.Equals(other.ingredients_)) return false;
-    if (Grow != other.Grow) return false;
-    if (Species != other.Species) return false;
-    if (!object.Equals(Genetics, other.Genetics)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    hash ^= ingredients_.GetHashCode();
-    if (Grow != 0) hash ^= Grow.GetHashCode();
-    if (Species != 0) hash ^= Species.GetHashCode();
-    if (genetics_ != null) hash ^= Genetics.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    ingredients_.WriteTo(output, _repeated_ingredients_codec);
-    if (Grow != 0) {
-      output.WriteRawTag(16);
-      output.WriteEnum((int) Grow);
-    }
-    if (Species != 0) {
-      output.WriteRawTag(24);
-      output.WriteEnum((int) Species);
-    }
-    if (genetics_ != null) {
-      output.WriteRawTag(34);
-      output.WriteMessage(Genetics);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    size += ingredients_.CalculateSize(_repeated_ingredients_codec);
-    if (Grow != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Grow);
-    }
-    if (Species != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Species);
-    }
-    if (genetics_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Genetics);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MaterialsData other) {
-    if (other == null) {
-      return;
-    }
-    ingredients_.Add(other.ingredients_);
-    if (other.Grow != 0) {
-      Grow = other.Grow;
-    }
-    if (other.Species != 0) {
-      Species = other.Species;
-    }
-    if (other.genetics_ != null) {
-      if (genetics_ == null) {
-        genetics_ = new global::Genetics();
-      }
-      Genetics.MergeFrom(other.Genetics);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          ingredients_.AddEntriesFrom(input, _repeated_ingredients_codec);
-          break;
-        }
-        case 16: {
-          grow_ = (global::Grow) input.ReadEnum();
-          break;
-        }
-        case 24: {
-          species_ = (global::Species) input.ReadEnum();
-          break;
-        }
-        case 34: {
-          if (genetics_ == null) {
-            genetics_ = new global::Genetics();
-          }
-          input.ReadMessage(genetics_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MediaItem.cs b/languages/csharp/MediaItem.cs
deleted file mode 100644
index 81230fe..0000000
--- a/languages/csharp/MediaItem.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from media/MediaItem.proto</summary>
-public static partial class MediaItemReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for media/MediaItem.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MediaItemReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVtZWRpYS9NZWRpYUl0ZW0ucHJvdG8aFG1lZGlhL01lZGlhS2V5LnByb3Rv",
-          "GhVtZWRpYS9NZWRpYVR5cGUucHJvdG8iSwoJTWVkaWFJdGVtEhYKA2tleRgB",
-          "IAEoCzIJLk1lZGlhS2V5EhgKBHR5cGUYAiABKAsyCi5NZWRpYVR5cGUSDAoE",
-          "bmFtZRgDIAEoCUIrChhpby5ibG9vbWJveC5zY2hlbWEubWVkaWFCDUF0dGFj",
-          "aGVkTWVkaWFQAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::MediaKeyReflection.Descriptor, global::MediaTypeReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MediaItem), global::MediaItem.Parser, new[]{ "Key", "Type", "Name" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class MediaItem : pb::IMessage<MediaItem> {
-  private static readonly pb::MessageParser<MediaItem> _parser = new pb::MessageParser<MediaItem>(() => new MediaItem());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MediaItem> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaItemReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaItem() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaItem(MediaItem other) : this() {
-    Key = other.key_ != null ? other.Key.Clone() : null;
-    Type = other.type_ != null ? other.Type.Clone() : null;
-    name_ = other.name_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaItem Clone() {
-    return new MediaItem(this);
-  }
-
-  /// <summary>Field number for the "key" field.</summary>
-  public const int KeyFieldNumber = 1;
-  private global::MediaKey key_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MediaKey Key {
-    get { return key_; }
-    set {
-      key_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 2;
-  private global::MediaType type_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MediaType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "name" field.</summary>
-  public const int NameFieldNumber = 3;
-  private string name_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Name {
-    get { return name_; }
-    set {
-      name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MediaItem);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MediaItem other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Key, other.Key)) return false;
-    if (!object.Equals(Type, other.Type)) return false;
-    if (Name != other.Name) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (key_ != null) hash ^= Key.GetHashCode();
-    if (type_ != null) hash ^= Type.GetHashCode();
-    if (Name.Length != 0) hash ^= Name.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (key_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Key);
-    }
-    if (type_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Type);
-    }
-    if (Name.Length != 0) {
-      output.WriteRawTag(26);
-      output.WriteString(Name);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (key_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Key);
-    }
-    if (type_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Type);
-    }
-    if (Name.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MediaItem other) {
-    if (other == null) {
-      return;
-    }
-    if (other.key_ != null) {
-      if (key_ == null) {
-        key_ = new global::MediaKey();
-      }
-      Key.MergeFrom(other.Key);
-    }
-    if (other.type_ != null) {
-      if (type_ == null) {
-        type_ = new global::MediaType();
-      }
-      Type.MergeFrom(other.Type);
-    }
-    if (other.Name.Length != 0) {
-      Name = other.Name;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (key_ == null) {
-            key_ = new global::MediaKey();
-          }
-          input.ReadMessage(key_);
-          break;
-        }
-        case 18: {
-          if (type_ == null) {
-            type_ = new global::MediaType();
-          }
-          input.ReadMessage(type_);
-          break;
-        }
-        case 26: {
-          Name = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MediaItemg.cs b/languages/csharp/MediaItemg.cs
deleted file mode 100644
index 51a8cf4..0000000
--- a/languages/csharp/MediaItemg.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from media/MediaItem.proto</summary>
-public static partial class MediaItemReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for media/MediaItem.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MediaItemReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVtZWRpYS9NZWRpYUl0ZW0ucHJvdG8aFG1lZGlhL01lZGlhS2V5LnByb3Rv",
-          "GhVtZWRpYS9NZWRpYVR5cGUucHJvdG8iSwoJTWVkaWFJdGVtEhYKA2tleRgB",
-          "IAEoCzIJLk1lZGlhS2V5EhgKBHR5cGUYAiABKAsyCi5NZWRpYVR5cGUSDAoE",
-          "bmFtZRgDIAEoCUIwChhpby5ibG9vbWJveC5zY2hlbWEubWVkaWFCDUF0dGFj",
-          "aGVkTWVkaWFIAVAB+AEBYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::MediaKeyReflection.Descriptor, global::MediaTypeReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MediaItem), global::MediaItem.Parser, new[]{ "Key", "Type", "Name" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class MediaItem : pb::IMessage<MediaItem> {
-  private static readonly pb::MessageParser<MediaItem> _parser = new pb::MessageParser<MediaItem>(() => new MediaItem());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MediaItem> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaItemReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaItem() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaItem(MediaItem other) : this() {
-    Key = other.key_ != null ? other.Key.Clone() : null;
-    Type = other.type_ != null ? other.Type.Clone() : null;
-    name_ = other.name_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaItem Clone() {
-    return new MediaItem(this);
-  }
-
-  /// <summary>Field number for the "key" field.</summary>
-  public const int KeyFieldNumber = 1;
-  private global::MediaKey key_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MediaKey Key {
-    get { return key_; }
-    set {
-      key_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 2;
-  private global::MediaType type_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MediaType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "name" field.</summary>
-  public const int NameFieldNumber = 3;
-  private string name_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Name {
-    get { return name_; }
-    set {
-      name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MediaItem);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MediaItem other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Key, other.Key)) return false;
-    if (!object.Equals(Type, other.Type)) return false;
-    if (Name != other.Name) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (key_ != null) hash ^= Key.GetHashCode();
-    if (type_ != null) hash ^= Type.GetHashCode();
-    if (Name.Length != 0) hash ^= Name.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (key_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Key);
-    }
-    if (type_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Type);
-    }
-    if (Name.Length != 0) {
-      output.WriteRawTag(26);
-      output.WriteString(Name);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (key_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Key);
-    }
-    if (type_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Type);
-    }
-    if (Name.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MediaItem other) {
-    if (other == null) {
-      return;
-    }
-    if (other.key_ != null) {
-      if (key_ == null) {
-        key_ = new global::MediaKey();
-      }
-      Key.MergeFrom(other.Key);
-    }
-    if (other.type_ != null) {
-      if (type_ == null) {
-        type_ = new global::MediaType();
-      }
-      Type.MergeFrom(other.Type);
-    }
-    if (other.Name.Length != 0) {
-      Name = other.Name;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (key_ == null) {
-            key_ = new global::MediaKey();
-          }
-          input.ReadMessage(key_);
-          break;
-        }
-        case 18: {
-          if (type_ == null) {
-            type_ = new global::MediaType();
-          }
-          input.ReadMessage(type_);
-          break;
-        }
-        case 26: {
-          Name = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MediaKey.cs b/languages/csharp/MediaKey.cs
deleted file mode 100644
index 517b644..0000000
--- a/languages/csharp/MediaKey.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from media/MediaKey.proto</summary>
-public static partial class MediaKeyReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for media/MediaKey.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MediaKeyReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChRtZWRpYS9NZWRpYUtleS5wcm90byIWCghNZWRpYUtleRIKCgJpZBgBIAEo",
-          "CUIqChhpby5ibG9vbWJveC5zY2hlbWEubWVkaWFCDE1lZGlhSXRlbUtleVAB",
-          "YgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MediaKey), global::MediaKey.Parser, new[]{ "Id" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class MediaKey : pb::IMessage<MediaKey> {
-  private static readonly pb::MessageParser<MediaKey> _parser = new pb::MessageParser<MediaKey>(() => new MediaKey());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MediaKey> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaKeyReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaKey() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaKey(MediaKey other) : this() {
-    id_ = other.id_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaKey Clone() {
-    return new MediaKey(this);
-  }
-
-  /// <summary>Field number for the "id" field.</summary>
-  public const int IdFieldNumber = 1;
-  private string id_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Id {
-    get { return id_; }
-    set {
-      id_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MediaKey);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MediaKey other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Id != other.Id) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Id.Length != 0) hash ^= Id.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Id.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(Id);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Id.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MediaKey other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Id.Length != 0) {
-      Id = other.Id;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          Id = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MediaKeyg.cs b/languages/csharp/MediaKeyg.cs
deleted file mode 100644
index 253bfc4..0000000
--- a/languages/csharp/MediaKeyg.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from media/MediaKey.proto</summary>
-public static partial class MediaKeyReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for media/MediaKey.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MediaKeyReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChRtZWRpYS9NZWRpYUtleS5wcm90byIWCghNZWRpYUtleRIKCgJpZBgBIAEo",
-          "CUIvChhpby5ibG9vbWJveC5zY2hlbWEubWVkaWFCDE1lZGlhSXRlbUtleUgB",
-          "UAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MediaKey), global::MediaKey.Parser, new[]{ "Id" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class MediaKey : pb::IMessage<MediaKey> {
-  private static readonly pb::MessageParser<MediaKey> _parser = new pb::MessageParser<MediaKey>(() => new MediaKey());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MediaKey> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaKeyReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaKey() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaKey(MediaKey other) : this() {
-    id_ = other.id_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaKey Clone() {
-    return new MediaKey(this);
-  }
-
-  /// <summary>Field number for the "id" field.</summary>
-  public const int IdFieldNumber = 1;
-  private string id_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Id {
-    get { return id_; }
-    set {
-      id_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MediaKey);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MediaKey other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Id != other.Id) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Id.Length != 0) hash ^= Id.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Id.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(Id);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Id.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MediaKey other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Id.Length != 0) {
-      Id = other.Id;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          Id = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MediaType.cs b/languages/csharp/MediaType.cs
deleted file mode 100644
index b5735cf..0000000
--- a/languages/csharp/MediaType.cs
+++ /dev/null
@@ -1,719 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from media/MediaType.proto</summary>
-public static partial class MediaTypeReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for media/MediaType.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MediaTypeReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVtZWRpYS9NZWRpYVR5cGUucHJvdG8iyAEKCU1lZGlhVHlwZRIdCgRraW5k",
-          "GAEgASgOMg8uTWVkaWFUeXBlLktpbmQSHgoKaW1hZ2VfdHlwZRhlIAEoCzIK",
-          "LkltYWdlVHlwZRIlCg1kb2N1bWVudF90eXBlGMkBIAEoCzINLkRvY3VtZW50",
-          "VHlwZRIfCgp2aWRlb190eXBlGK0CIAEoCzIKLlZpZGVvVHlwZSI0CgRLaW5k",
-          "EggKBExJTksQABIJCgVJTUFHRRABEgwKCERPQ1VNRU5UEAISCQoFVklERU8Q",
-          "AyJqCglJbWFnZVR5cGUSIgoEa2luZBgBIAEoDjIULkltYWdlVHlwZS5JbWFn",
-          "ZUtpbmQiOQoJSW1hZ2VLaW5kEgcKA1BORxAAEgcKA0pQRxABEgcKA0dJRhAC",
-          "EgcKA1NWRxADEggKBFdFQlAQBCKGAQoMRG9jdW1lbnRUeXBlEigKBGtpbmQY",
-          "ASABKA4yGi5Eb2N1bWVudFR5cGUuRG9jdW1lbnRLaW5kEhIKCmNvbXByZXNz",
-          "ZWQYAiABKAgiOAoMRG9jdW1lbnRLaW5kEgcKA1RYVBAAEggKBEhUTUwQARIH",
-          "CgNQREYQAhIMCghNQVJLRE9XThADIlcKCVZpZGVvVHlwZRIiCgRraW5kGAEg",
-          "ASgOMhQuVmlkZW9UeXBlLlZpZGVvS2luZCImCglWaWRlb0tpbmQSBwoDTVA0",
-          "EAASBwoDRkxWEAESBwoDSExTEAJCKwoYaW8uYmxvb21ib3guc2NoZW1hLm1l",
-          "ZGlhQg1NZWRpYUl0ZW1UeXBlUAFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MediaType), global::MediaType.Parser, new[]{ "Kind", "ImageType", "DocumentType", "VideoType" }, null, new[]{ typeof(global::MediaType.Types.Kind) }, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ImageType), global::ImageType.Parser, new[]{ "Kind" }, null, new[]{ typeof(global::ImageType.Types.ImageKind) }, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::DocumentType), global::DocumentType.Parser, new[]{ "Kind", "Compressed" }, null, new[]{ typeof(global::DocumentType.Types.DocumentKind) }, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::VideoType), global::VideoType.Parser, new[]{ "Kind" }, null, new[]{ typeof(global::VideoType.Types.VideoKind) }, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-/// <summary>
-/// -- Media Type: Top-level -- //
-/// </summary>
-public sealed partial class MediaType : pb::IMessage<MediaType> {
-  private static readonly pb::MessageParser<MediaType> _parser = new pb::MessageParser<MediaType>(() => new MediaType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MediaType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaType(MediaType other) : this() {
-    kind_ = other.kind_;
-    ImageType = other.imageType_ != null ? other.ImageType.Clone() : null;
-    DocumentType = other.documentType_ != null ? other.DocumentType.Clone() : null;
-    VideoType = other.videoType_ != null ? other.VideoType.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaType Clone() {
-    return new MediaType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::MediaType.Types.Kind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MediaType.Types.Kind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "image_type" field.</summary>
-  public const int ImageTypeFieldNumber = 101;
-  private global::ImageType imageType_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ImageType ImageType {
-    get { return imageType_; }
-    set {
-      imageType_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "document_type" field.</summary>
-  public const int DocumentTypeFieldNumber = 201;
-  private global::DocumentType documentType_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::DocumentType DocumentType {
-    get { return documentType_; }
-    set {
-      documentType_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "video_type" field.</summary>
-  public const int VideoTypeFieldNumber = 301;
-  private global::VideoType videoType_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::VideoType VideoType {
-    get { return videoType_; }
-    set {
-      videoType_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MediaType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MediaType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    if (!object.Equals(ImageType, other.ImageType)) return false;
-    if (!object.Equals(DocumentType, other.DocumentType)) return false;
-    if (!object.Equals(VideoType, other.VideoType)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    if (imageType_ != null) hash ^= ImageType.GetHashCode();
-    if (documentType_ != null) hash ^= DocumentType.GetHashCode();
-    if (videoType_ != null) hash ^= VideoType.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-    if (imageType_ != null) {
-      output.WriteRawTag(170, 6);
-      output.WriteMessage(ImageType);
-    }
-    if (documentType_ != null) {
-      output.WriteRawTag(202, 12);
-      output.WriteMessage(DocumentType);
-    }
-    if (videoType_ != null) {
-      output.WriteRawTag(234, 18);
-      output.WriteMessage(VideoType);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    if (imageType_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(ImageType);
-    }
-    if (documentType_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(DocumentType);
-    }
-    if (videoType_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(VideoType);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MediaType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-    if (other.imageType_ != null) {
-      if (imageType_ == null) {
-        imageType_ = new global::ImageType();
-      }
-      ImageType.MergeFrom(other.ImageType);
-    }
-    if (other.documentType_ != null) {
-      if (documentType_ == null) {
-        documentType_ = new global::DocumentType();
-      }
-      DocumentType.MergeFrom(other.DocumentType);
-    }
-    if (other.videoType_ != null) {
-      if (videoType_ == null) {
-        videoType_ = new global::VideoType();
-      }
-      VideoType.MergeFrom(other.VideoType);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::MediaType.Types.Kind) input.ReadEnum();
-          break;
-        }
-        case 810: {
-          if (imageType_ == null) {
-            imageType_ = new global::ImageType();
-          }
-          input.ReadMessage(imageType_);
-          break;
-        }
-        case 1610: {
-          if (documentType_ == null) {
-            documentType_ = new global::DocumentType();
-          }
-          input.ReadMessage(documentType_);
-          break;
-        }
-        case 2410: {
-          if (videoType_ == null) {
-            videoType_ = new global::VideoType();
-          }
-          input.ReadMessage(videoType_);
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the MediaType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum Kind {
-      [pbr::OriginalName("LINK")] Link = 0,
-      [pbr::OriginalName("IMAGE")] Image = 1,
-      [pbr::OriginalName("DOCUMENT")] Document = 2,
-      [pbr::OriginalName("VIDEO")] Video = 3,
-    }
-
-  }
-  #endregion
-
-}
-
-/// <summary>
-/// -- Media Type: Images -- //
-/// </summary>
-public sealed partial class ImageType : pb::IMessage<ImageType> {
-  private static readonly pb::MessageParser<ImageType> _parser = new pb::MessageParser<ImageType>(() => new ImageType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ImageType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[1]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ImageType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ImageType(ImageType other) : this() {
-    kind_ = other.kind_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ImageType Clone() {
-    return new ImageType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::ImageType.Types.ImageKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ImageType.Types.ImageKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ImageType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ImageType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ImageType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::ImageType.Types.ImageKind) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the ImageType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum ImageKind {
-      [pbr::OriginalName("PNG")] Png = 0,
-      [pbr::OriginalName("JPG")] Jpg = 1,
-      [pbr::OriginalName("GIF")] Gif = 2,
-      [pbr::OriginalName("SVG")] Svg = 3,
-      [pbr::OriginalName("WEBP")] Webp = 4,
-    }
-
-  }
-  #endregion
-
-}
-
-/// <summary>
-/// -- Media Type: Document -- //
-/// </summary>
-public sealed partial class DocumentType : pb::IMessage<DocumentType> {
-  private static readonly pb::MessageParser<DocumentType> _parser = new pb::MessageParser<DocumentType>(() => new DocumentType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<DocumentType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[2]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public DocumentType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public DocumentType(DocumentType other) : this() {
-    kind_ = other.kind_;
-    compressed_ = other.compressed_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public DocumentType Clone() {
-    return new DocumentType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::DocumentType.Types.DocumentKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::DocumentType.Types.DocumentKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "compressed" field.</summary>
-  public const int CompressedFieldNumber = 2;
-  private bool compressed_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Compressed {
-    get { return compressed_; }
-    set {
-      compressed_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as DocumentType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(DocumentType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    if (Compressed != other.Compressed) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    if (Compressed != false) hash ^= Compressed.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-    if (Compressed != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Compressed);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    if (Compressed != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(DocumentType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-    if (other.Compressed != false) {
-      Compressed = other.Compressed;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::DocumentType.Types.DocumentKind) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          Compressed = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the DocumentType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum DocumentKind {
-      [pbr::OriginalName("TXT")] Txt = 0,
-      [pbr::OriginalName("HTML")] Html = 1,
-      [pbr::OriginalName("PDF")] Pdf = 2,
-      [pbr::OriginalName("MARKDOWN")] Markdown = 3,
-    }
-
-  }
-  #endregion
-
-}
-
-/// <summary>
-/// -- Media Type: Video -- //
-/// </summary>
-public sealed partial class VideoType : pb::IMessage<VideoType> {
-  private static readonly pb::MessageParser<VideoType> _parser = new pb::MessageParser<VideoType>(() => new VideoType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<VideoType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[3]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public VideoType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public VideoType(VideoType other) : this() {
-    kind_ = other.kind_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public VideoType Clone() {
-    return new VideoType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::VideoType.Types.VideoKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::VideoType.Types.VideoKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as VideoType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(VideoType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(VideoType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::VideoType.Types.VideoKind) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the VideoType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum VideoKind {
-      [pbr::OriginalName("MP4")] Mp4 = 0,
-      [pbr::OriginalName("FLV")] Flv = 1,
-      [pbr::OriginalName("HLS")] Hls = 2,
-    }
-
-  }
-  #endregion
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/MediaTypeg.cs b/languages/csharp/MediaTypeg.cs
deleted file mode 100644
index 10ff79c..0000000
--- a/languages/csharp/MediaTypeg.cs
+++ /dev/null
@@ -1,719 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from media/MediaType.proto</summary>
-public static partial class MediaTypeReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for media/MediaType.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static MediaTypeReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVtZWRpYS9NZWRpYVR5cGUucHJvdG8iyAEKCU1lZGlhVHlwZRIdCgRraW5k",
-          "GAEgASgOMg8uTWVkaWFUeXBlLktpbmQSHgoKaW1hZ2VfdHlwZRhlIAEoCzIK",
-          "LkltYWdlVHlwZRIlCg1kb2N1bWVudF90eXBlGMkBIAEoCzINLkRvY3VtZW50",
-          "VHlwZRIfCgp2aWRlb190eXBlGK0CIAEoCzIKLlZpZGVvVHlwZSI0CgRLaW5k",
-          "EggKBExJTksQABIJCgVJTUFHRRABEgwKCERPQ1VNRU5UEAISCQoFVklERU8Q",
-          "AyJqCglJbWFnZVR5cGUSIgoEa2luZBgBIAEoDjIULkltYWdlVHlwZS5JbWFn",
-          "ZUtpbmQiOQoJSW1hZ2VLaW5kEgcKA1BORxAAEgcKA0pQRxABEgcKA0dJRhAC",
-          "EgcKA1NWRxADEggKBFdFQlAQBCKGAQoMRG9jdW1lbnRUeXBlEigKBGtpbmQY",
-          "ASABKA4yGi5Eb2N1bWVudFR5cGUuRG9jdW1lbnRLaW5kEhIKCmNvbXByZXNz",
-          "ZWQYAiABKAgiOAoMRG9jdW1lbnRLaW5kEgcKA1RYVBAAEggKBEhUTUwQARIH",
-          "CgNQREYQAhIMCghNQVJLRE9XThADIlcKCVZpZGVvVHlwZRIiCgRraW5kGAEg",
-          "ASgOMhQuVmlkZW9UeXBlLlZpZGVvS2luZCImCglWaWRlb0tpbmQSBwoDTVA0",
-          "EAASBwoDRkxWEAESBwoDSExTEAJCMAoYaW8uYmxvb21ib3guc2NoZW1hLm1l",
-          "ZGlhQg1NZWRpYUl0ZW1UeXBlSAFQAfgBAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::MediaType), global::MediaType.Parser, new[]{ "Kind", "ImageType", "DocumentType", "VideoType" }, null, new[]{ typeof(global::MediaType.Types.Kind) }, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ImageType), global::ImageType.Parser, new[]{ "Kind" }, null, new[]{ typeof(global::ImageType.Types.ImageKind) }, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::DocumentType), global::DocumentType.Parser, new[]{ "Kind", "Compressed" }, null, new[]{ typeof(global::DocumentType.Types.DocumentKind) }, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::VideoType), global::VideoType.Parser, new[]{ "Kind" }, null, new[]{ typeof(global::VideoType.Types.VideoKind) }, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-/// <summary>
-/// -- Media Type: Top-level -- //
-/// </summary>
-public sealed partial class MediaType : pb::IMessage<MediaType> {
-  private static readonly pb::MessageParser<MediaType> _parser = new pb::MessageParser<MediaType>(() => new MediaType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<MediaType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaType(MediaType other) : this() {
-    kind_ = other.kind_;
-    ImageType = other.imageType_ != null ? other.ImageType.Clone() : null;
-    DocumentType = other.documentType_ != null ? other.DocumentType.Clone() : null;
-    VideoType = other.videoType_ != null ? other.VideoType.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public MediaType Clone() {
-    return new MediaType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::MediaType.Types.Kind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::MediaType.Types.Kind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "image_type" field.</summary>
-  public const int ImageTypeFieldNumber = 101;
-  private global::ImageType imageType_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ImageType ImageType {
-    get { return imageType_; }
-    set {
-      imageType_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "document_type" field.</summary>
-  public const int DocumentTypeFieldNumber = 201;
-  private global::DocumentType documentType_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::DocumentType DocumentType {
-    get { return documentType_; }
-    set {
-      documentType_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "video_type" field.</summary>
-  public const int VideoTypeFieldNumber = 301;
-  private global::VideoType videoType_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::VideoType VideoType {
-    get { return videoType_; }
-    set {
-      videoType_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as MediaType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(MediaType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    if (!object.Equals(ImageType, other.ImageType)) return false;
-    if (!object.Equals(DocumentType, other.DocumentType)) return false;
-    if (!object.Equals(VideoType, other.VideoType)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    if (imageType_ != null) hash ^= ImageType.GetHashCode();
-    if (documentType_ != null) hash ^= DocumentType.GetHashCode();
-    if (videoType_ != null) hash ^= VideoType.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-    if (imageType_ != null) {
-      output.WriteRawTag(170, 6);
-      output.WriteMessage(ImageType);
-    }
-    if (documentType_ != null) {
-      output.WriteRawTag(202, 12);
-      output.WriteMessage(DocumentType);
-    }
-    if (videoType_ != null) {
-      output.WriteRawTag(234, 18);
-      output.WriteMessage(VideoType);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    if (imageType_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(ImageType);
-    }
-    if (documentType_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(DocumentType);
-    }
-    if (videoType_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(VideoType);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(MediaType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-    if (other.imageType_ != null) {
-      if (imageType_ == null) {
-        imageType_ = new global::ImageType();
-      }
-      ImageType.MergeFrom(other.ImageType);
-    }
-    if (other.documentType_ != null) {
-      if (documentType_ == null) {
-        documentType_ = new global::DocumentType();
-      }
-      DocumentType.MergeFrom(other.DocumentType);
-    }
-    if (other.videoType_ != null) {
-      if (videoType_ == null) {
-        videoType_ = new global::VideoType();
-      }
-      VideoType.MergeFrom(other.VideoType);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::MediaType.Types.Kind) input.ReadEnum();
-          break;
-        }
-        case 810: {
-          if (imageType_ == null) {
-            imageType_ = new global::ImageType();
-          }
-          input.ReadMessage(imageType_);
-          break;
-        }
-        case 1610: {
-          if (documentType_ == null) {
-            documentType_ = new global::DocumentType();
-          }
-          input.ReadMessage(documentType_);
-          break;
-        }
-        case 2410: {
-          if (videoType_ == null) {
-            videoType_ = new global::VideoType();
-          }
-          input.ReadMessage(videoType_);
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the MediaType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum Kind {
-      [pbr::OriginalName("LINK")] Link = 0,
-      [pbr::OriginalName("IMAGE")] Image = 1,
-      [pbr::OriginalName("DOCUMENT")] Document = 2,
-      [pbr::OriginalName("VIDEO")] Video = 3,
-    }
-
-  }
-  #endregion
-
-}
-
-/// <summary>
-/// -- Media Type: Images -- //
-/// </summary>
-public sealed partial class ImageType : pb::IMessage<ImageType> {
-  private static readonly pb::MessageParser<ImageType> _parser = new pb::MessageParser<ImageType>(() => new ImageType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ImageType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[1]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ImageType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ImageType(ImageType other) : this() {
-    kind_ = other.kind_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ImageType Clone() {
-    return new ImageType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::ImageType.Types.ImageKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ImageType.Types.ImageKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ImageType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ImageType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ImageType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::ImageType.Types.ImageKind) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the ImageType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum ImageKind {
-      [pbr::OriginalName("PNG")] Png = 0,
-      [pbr::OriginalName("JPG")] Jpg = 1,
-      [pbr::OriginalName("GIF")] Gif = 2,
-      [pbr::OriginalName("SVG")] Svg = 3,
-      [pbr::OriginalName("WEBP")] Webp = 4,
-    }
-
-  }
-  #endregion
-
-}
-
-/// <summary>
-/// -- Media Type: Document -- //
-/// </summary>
-public sealed partial class DocumentType : pb::IMessage<DocumentType> {
-  private static readonly pb::MessageParser<DocumentType> _parser = new pb::MessageParser<DocumentType>(() => new DocumentType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<DocumentType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[2]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public DocumentType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public DocumentType(DocumentType other) : this() {
-    kind_ = other.kind_;
-    compressed_ = other.compressed_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public DocumentType Clone() {
-    return new DocumentType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::DocumentType.Types.DocumentKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::DocumentType.Types.DocumentKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "compressed" field.</summary>
-  public const int CompressedFieldNumber = 2;
-  private bool compressed_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Compressed {
-    get { return compressed_; }
-    set {
-      compressed_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as DocumentType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(DocumentType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    if (Compressed != other.Compressed) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    if (Compressed != false) hash ^= Compressed.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-    if (Compressed != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Compressed);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    if (Compressed != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(DocumentType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-    if (other.Compressed != false) {
-      Compressed = other.Compressed;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::DocumentType.Types.DocumentKind) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          Compressed = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the DocumentType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum DocumentKind {
-      [pbr::OriginalName("TXT")] Txt = 0,
-      [pbr::OriginalName("HTML")] Html = 1,
-      [pbr::OriginalName("PDF")] Pdf = 2,
-      [pbr::OriginalName("MARKDOWN")] Markdown = 3,
-    }
-
-  }
-  #endregion
-
-}
-
-/// <summary>
-/// -- Media Type: Video -- //
-/// </summary>
-public sealed partial class VideoType : pb::IMessage<VideoType> {
-  private static readonly pb::MessageParser<VideoType> _parser = new pb::MessageParser<VideoType>(() => new VideoType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<VideoType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::MediaTypeReflection.Descriptor.MessageTypes[3]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public VideoType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public VideoType(VideoType other) : this() {
-    kind_ = other.kind_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public VideoType Clone() {
-    return new VideoType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::VideoType.Types.VideoKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::VideoType.Types.VideoKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as VideoType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(VideoType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(VideoType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::VideoType.Types.VideoKind) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-  #region Nested types
-  /// <summary>Container for nested types declared in the VideoType message type.</summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static partial class Types {
-    public enum VideoKind {
-      [pbr::OriginalName("MP4")] Mp4 = 0,
-      [pbr::OriginalName("FLV")] Flv = 1,
-      [pbr::OriginalName("HLS")] Hls = 2,
-    }
-
-  }
-  #endregion
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Name.cs b/languages/csharp/Name.cs
deleted file mode 100644
index c4b1744..0000000
--- a/languages/csharp/Name.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/Name.proto</summary>
-public static partial class NameReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/Name.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static NameReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChJjb250ZW50L05hbWUucHJvdG8iKAoETmFtZRIPCgdwcmltYXJ5GAEgASgJ",
-          "Eg8KB2Rpc3BsYXkYAiABKAlCKwoaaW8uYmxvb21ib3guc2NoZW1hLmNvbnRl",
-          "bnRCC05hbWVDb250ZW50UAFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Name), global::Name.Parser, new[]{ "Primary", "Display" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Name : pb::IMessage<Name> {
-  private static readonly pb::MessageParser<Name> _parser = new pb::MessageParser<Name>(() => new Name());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Name> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::NameReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Name() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Name(Name other) : this() {
-    primary_ = other.primary_;
-    display_ = other.display_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Name Clone() {
-    return new Name(this);
-  }
-
-  /// <summary>Field number for the "primary" field.</summary>
-  public const int PrimaryFieldNumber = 1;
-  private string primary_ = "";
-  /// <summary>
-  /// basic name
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Primary {
-    get { return primary_; }
-    set {
-      primary_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "display" field.</summary>
-  public const int DisplayFieldNumber = 2;
-  private string display_ = "";
-  /// <summary>
-  /// display name
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Display {
-    get { return display_; }
-    set {
-      display_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Name);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Name other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Primary != other.Primary) return false;
-    if (Display != other.Display) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Primary.Length != 0) hash ^= Primary.GetHashCode();
-    if (Display.Length != 0) hash ^= Display.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Primary.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(Primary);
-    }
-    if (Display.Length != 0) {
-      output.WriteRawTag(18);
-      output.WriteString(Display);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Primary.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Primary);
-    }
-    if (Display.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Display);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Name other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Primary.Length != 0) {
-      Primary = other.Primary;
-    }
-    if (other.Display.Length != 0) {
-      Display = other.Display;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          Primary = input.ReadString();
-          break;
-        }
-        case 18: {
-          Display = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Nameg.cs b/languages/csharp/Nameg.cs
deleted file mode 100644
index 21c0393..0000000
--- a/languages/csharp/Nameg.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/Name.proto</summary>
-public static partial class NameReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/Name.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static NameReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChJjb250ZW50L05hbWUucHJvdG8iKAoETmFtZRIPCgdwcmltYXJ5GAEgASgJ",
-          "Eg8KB2Rpc3BsYXkYAiABKAlCMAoaaW8uYmxvb21ib3guc2NoZW1hLmNvbnRl",
-          "bnRCC05hbWVDb250ZW50SAFQAfgBAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Name), global::Name.Parser, new[]{ "Primary", "Display" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class Name : pb::IMessage<Name> {
-  private static readonly pb::MessageParser<Name> _parser = new pb::MessageParser<Name>(() => new Name());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Name> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::NameReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Name() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Name(Name other) : this() {
-    primary_ = other.primary_;
-    display_ = other.display_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Name Clone() {
-    return new Name(this);
-  }
-
-  /// <summary>Field number for the "primary" field.</summary>
-  public const int PrimaryFieldNumber = 1;
-  private string primary_ = "";
-  /// <summary>
-  /// basic name
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Primary {
-    get { return primary_; }
-    set {
-      primary_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "display" field.</summary>
-  public const int DisplayFieldNumber = 2;
-  private string display_ = "";
-  /// <summary>
-  /// display name
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Display {
-    get { return display_; }
-    set {
-      display_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Name);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Name other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Primary != other.Primary) return false;
-    if (Display != other.Display) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Primary.Length != 0) hash ^= Primary.GetHashCode();
-    if (Display.Length != 0) hash ^= Display.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Primary.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(Primary);
-    }
-    if (Display.Length != 0) {
-      output.WriteRawTag(18);
-      output.WriteString(Display);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Primary.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Primary);
-    }
-    if (Display.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Display);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Name other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Primary.Length != 0) {
-      Primary = other.Primary;
-    }
-    if (other.Display.Length != 0) {
-      Display = other.Display;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          Primary = input.ReadString();
-          break;
-        }
-        case 18: {
-          Display = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/PricingDescriptor.cs b/languages/csharp/PricingDescriptor.cs
deleted file mode 100644
index a1340fc..0000000
--- a/languages/csharp/PricingDescriptor.cs
+++ /dev/null
@@ -1,1032 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/pricing/PricingDescriptor.proto</summary>
-public static partial class PricingDescriptorReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/pricing/PricingDescriptor.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static PricingDescriptorReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "CidzdHJ1Y3RzL3ByaWNpbmcvUHJpY2luZ0Rlc2NyaXB0b3IucHJvdG8aJHN0",
-          "cnVjdHMvcHJpY2luZy9TYWxlRGVzY3JpcHRvci5wcm90byI9ChdQcmljaW5n",
-          "VGllckF2YWlsYWJpbGl0eRIPCgdvZmZlcmVkGAEgASgIEhEKCWF2YWlsYWJs",
-          "ZRgCIAEoCCJ6ChVVbml0UHJpY2luZ0Rlc2NyaXB0b3ISEwoLcHJpY2VfdmFs",
-          "dWUYASABKAISKAoGc3RhdHVzGAIgASgLMhguUHJpY2luZ1RpZXJBdmFpbGFi",
-          "aWxpdHkSIgoJZGlzY291bnRzGAMgAygLMg8uU2FsZURlc2NyaXB0b3IifAoZ",
-          "V2VpZ2h0ZWRQcmljaW5nRGVzY3JpcHRvchIiCgZ3ZWlnaHQYASABKA4yEi5Q",
-          "cmljaW5nV2VpZ2h0VGllchIkCgR0aWVyGAIgASgLMhYuVW5pdFByaWNpbmdE",
-          "ZXNjcmlwdG9yEhUKDXdlaWdodEluR3JhbXMYAyABKAIiGgoYRnJlZWJpZVBy",
-          "aWNpbmdEZXNjcmlwdG9yIq8BChFQcmljaW5nRGVzY3JpcHRvchIaCgR0eXBl",
-          "GAEgASgOMgwuUHJpY2luZ1R5cGUSJAoEdW5pdBgUIAEoCzIWLlVuaXRQcmlj",
-          "aW5nRGVzY3JpcHRvchIsCgh3ZWlnaHRlZBgVIAEoCzIaLldlaWdodGVkUHJp",
-          "Y2luZ0Rlc2NyaXB0b3ISKgoHZnJlZWJpZRgWIAEoCzIZLkZyZWViaWVQcmlj",
-          "aW5nRGVzY3JpcHRvciJaCg5Qcm9kdWN0UHJpY2luZxIiCglkaXNjb3VudHMY",
-          "ASADKAsyDy5TYWxlRGVzY3JpcHRvchIkCghtYW5pZmVzdBgCIAMoCzISLlBy",
-          "aWNpbmdEZXNjcmlwdG9yKjIKC1ByaWNpbmdUeXBlEggKBFVOSVQQABIMCghX",
-          "RUlHSFRFRBABEgsKB0ZSRUVCSUUQAiqJAQoRUHJpY2luZ1dlaWdodFRpZXIS",
-          "CQoFT1RIRVIQABIICgRHUkFNEAESDAoISEFMRkdSQU0QAhIPCgtRVUFSVEVS",
-          "R1JBTRADEgcKA0RVQhAEEgoKBkVJR0hUSBAFEgsKB1FVQVJURVIQBhIICgRI",
-          "QUxGEAcSCQoFT1VOQ0UQCBIJCgVQT1VORBAJQjkKIWlvLmJsb29tYm94LnNj",
-          "aGVtYS5wcm9kdWN0LnN0cnVjdEISUHJvZHVjdFByaWNpbmdTcGVjUAFiBnBy",
-          "b3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::SaleDescriptorReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::PricingType), typeof(global::PricingWeightTier), }, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::PricingTierAvailability), global::PricingTierAvailability.Parser, new[]{ "Offered", "Available" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::UnitPricingDescriptor), global::UnitPricingDescriptor.Parser, new[]{ "PriceValue", "Status", "Discounts" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::WeightedPricingDescriptor), global::WeightedPricingDescriptor.Parser, new[]{ "Weight", "Tier", "WeightInGrams" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::FreebiePricingDescriptor), global::FreebiePricingDescriptor.Parser, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::PricingDescriptor), global::PricingDescriptor.Parser, new[]{ "Type", "Unit", "Weighted", "Freebie" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductPricing), global::ProductPricing.Parser, new[]{ "Discounts", "Manifest" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Enums
-/// <summary>
-/// -- Pricing: Objects
-/// </summary>
-public enum PricingType {
-  [pbr::OriginalName("UNIT")] Unit = 0,
-  [pbr::OriginalName("WEIGHTED")] Weighted = 1,
-  [pbr::OriginalName("FREEBIE")] Freebie = 2,
-}
-
-public enum PricingWeightTier {
-  [pbr::OriginalName("OTHER")] Other = 0,
-  [pbr::OriginalName("GRAM")] Gram = 1,
-  [pbr::OriginalName("HALFGRAM")] Halfgram = 2,
-  [pbr::OriginalName("QUARTERGRAM")] Quartergram = 3,
-  [pbr::OriginalName("DUB")] Dub = 4,
-  [pbr::OriginalName("EIGHTH")] Eighth = 5,
-  [pbr::OriginalName("QUARTER")] Quarter = 6,
-  [pbr::OriginalName("HALF")] Half = 7,
-  [pbr::OriginalName("OUNCE")] Ounce = 8,
-  [pbr::OriginalName("POUND")] Pound = 9,
-}
-
-#endregion
-
-#region Messages
-public sealed partial class PricingTierAvailability : pb::IMessage<PricingTierAvailability> {
-  private static readonly pb::MessageParser<PricingTierAvailability> _parser = new pb::MessageParser<PricingTierAvailability>(() => new PricingTierAvailability());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<PricingTierAvailability> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingTierAvailability() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingTierAvailability(PricingTierAvailability other) : this() {
-    offered_ = other.offered_;
-    available_ = other.available_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingTierAvailability Clone() {
-    return new PricingTierAvailability(this);
-  }
-
-  /// <summary>Field number for the "offered" field.</summary>
-  public const int OfferedFieldNumber = 1;
-  private bool offered_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Offered {
-    get { return offered_; }
-    set {
-      offered_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "available" field.</summary>
-  public const int AvailableFieldNumber = 2;
-  private bool available_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Available {
-    get { return available_; }
-    set {
-      available_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as PricingTierAvailability);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(PricingTierAvailability other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Offered != other.Offered) return false;
-    if (Available != other.Available) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Offered != false) hash ^= Offered.GetHashCode();
-    if (Available != false) hash ^= Available.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Offered != false) {
-      output.WriteRawTag(8);
-      output.WriteBool(Offered);
-    }
-    if (Available != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Available);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Offered != false) {
-      size += 1 + 1;
-    }
-    if (Available != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(PricingTierAvailability other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Offered != false) {
-      Offered = other.Offered;
-    }
-    if (other.Available != false) {
-      Available = other.Available;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          Offered = input.ReadBool();
-          break;
-        }
-        case 16: {
-          Available = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-/// <summary>
-/// -- Pricing: Typed Descriptors
-/// </summary>
-public sealed partial class UnitPricingDescriptor : pb::IMessage<UnitPricingDescriptor> {
-  private static readonly pb::MessageParser<UnitPricingDescriptor> _parser = new pb::MessageParser<UnitPricingDescriptor>(() => new UnitPricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<UnitPricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[1]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public UnitPricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public UnitPricingDescriptor(UnitPricingDescriptor other) : this() {
-    priceValue_ = other.priceValue_;
-    Status = other.status_ != null ? other.Status.Clone() : null;
-    discounts_ = other.discounts_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public UnitPricingDescriptor Clone() {
-    return new UnitPricingDescriptor(this);
-  }
-
-  /// <summary>Field number for the "price_value" field.</summary>
-  public const int PriceValueFieldNumber = 1;
-  private float priceValue_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public float PriceValue {
-    get { return priceValue_; }
-    set {
-      priceValue_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "status" field.</summary>
-  public const int StatusFieldNumber = 2;
-  private global::PricingTierAvailability status_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::PricingTierAvailability Status {
-    get { return status_; }
-    set {
-      status_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "discounts" field.</summary>
-  public const int DiscountsFieldNumber = 3;
-  private static readonly pb::FieldCodec<global::SaleDescriptor> _repeated_discounts_codec
-      = pb::FieldCodec.ForMessage(26, global::SaleDescriptor.Parser);
-  private readonly pbc::RepeatedField<global::SaleDescriptor> discounts_ = new pbc::RepeatedField<global::SaleDescriptor>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::SaleDescriptor> Discounts {
-    get { return discounts_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as UnitPricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(UnitPricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (PriceValue != other.PriceValue) return false;
-    if (!object.Equals(Status, other.Status)) return false;
-    if(!discounts_.Equals(other.discounts_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (PriceValue != 0F) hash ^= PriceValue.GetHashCode();
-    if (status_ != null) hash ^= Status.GetHashCode();
-    hash ^= discounts_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (PriceValue != 0F) {
-      output.WriteRawTag(13);
-      output.WriteFloat(PriceValue);
-    }
-    if (status_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Status);
-    }
-    discounts_.WriteTo(output, _repeated_discounts_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (PriceValue != 0F) {
-      size += 1 + 4;
-    }
-    if (status_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Status);
-    }
-    size += discounts_.CalculateSize(_repeated_discounts_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(UnitPricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.PriceValue != 0F) {
-      PriceValue = other.PriceValue;
-    }
-    if (other.status_ != null) {
-      if (status_ == null) {
-        status_ = new global::PricingTierAvailability();
-      }
-      Status.MergeFrom(other.Status);
-    }
-    discounts_.Add(other.discounts_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 13: {
-          PriceValue = input.ReadFloat();
-          break;
-        }
-        case 18: {
-          if (status_ == null) {
-            status_ = new global::PricingTierAvailability();
-          }
-          input.ReadMessage(status_);
-          break;
-        }
-        case 26: {
-          discounts_.AddEntriesFrom(input, _repeated_discounts_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class WeightedPricingDescriptor : pb::IMessage<WeightedPricingDescriptor> {
-  private static readonly pb::MessageParser<WeightedPricingDescriptor> _parser = new pb::MessageParser<WeightedPricingDescriptor>(() => new WeightedPricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<WeightedPricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[2]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public WeightedPricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public WeightedPricingDescriptor(WeightedPricingDescriptor other) : this() {
-    weight_ = other.weight_;
-    Tier = other.tier_ != null ? other.Tier.Clone() : null;
-    weightInGrams_ = other.weightInGrams_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public WeightedPricingDescriptor Clone() {
-    return new WeightedPricingDescriptor(this);
-  }
-
-  /// <summary>Field number for the "weight" field.</summary>
-  public const int WeightFieldNumber = 1;
-  private global::PricingWeightTier weight_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::PricingWeightTier Weight {
-    get { return weight_; }
-    set {
-      weight_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "tier" field.</summary>
-  public const int TierFieldNumber = 2;
-  private global::UnitPricingDescriptor tier_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::UnitPricingDescriptor Tier {
-    get { return tier_; }
-    set {
-      tier_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "weightInGrams" field.</summary>
-  public const int WeightInGramsFieldNumber = 3;
-  private float weightInGrams_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public float WeightInGrams {
-    get { return weightInGrams_; }
-    set {
-      weightInGrams_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as WeightedPricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(WeightedPricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Weight != other.Weight) return false;
-    if (!object.Equals(Tier, other.Tier)) return false;
-    if (WeightInGrams != other.WeightInGrams) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Weight != 0) hash ^= Weight.GetHashCode();
-    if (tier_ != null) hash ^= Tier.GetHashCode();
-    if (WeightInGrams != 0F) hash ^= WeightInGrams.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Weight != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Weight);
-    }
-    if (tier_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Tier);
-    }
-    if (WeightInGrams != 0F) {
-      output.WriteRawTag(29);
-      output.WriteFloat(WeightInGrams);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Weight != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Weight);
-    }
-    if (tier_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Tier);
-    }
-    if (WeightInGrams != 0F) {
-      size += 1 + 4;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(WeightedPricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Weight != 0) {
-      Weight = other.Weight;
-    }
-    if (other.tier_ != null) {
-      if (tier_ == null) {
-        tier_ = new global::UnitPricingDescriptor();
-      }
-      Tier.MergeFrom(other.Tier);
-    }
-    if (other.WeightInGrams != 0F) {
-      WeightInGrams = other.WeightInGrams;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          weight_ = (global::PricingWeightTier) input.ReadEnum();
-          break;
-        }
-        case 18: {
-          if (tier_ == null) {
-            tier_ = new global::UnitPricingDescriptor();
-          }
-          input.ReadMessage(tier_);
-          break;
-        }
-        case 29: {
-          WeightInGrams = input.ReadFloat();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class FreebiePricingDescriptor : pb::IMessage<FreebiePricingDescriptor> {
-  private static readonly pb::MessageParser<FreebiePricingDescriptor> _parser = new pb::MessageParser<FreebiePricingDescriptor>(() => new FreebiePricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<FreebiePricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[3]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FreebiePricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FreebiePricingDescriptor(FreebiePricingDescriptor other) : this() {
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FreebiePricingDescriptor Clone() {
-    return new FreebiePricingDescriptor(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as FreebiePricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(FreebiePricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(FreebiePricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-      }
-    }
-  }
-
-}
-
-/// <summary>
-/// -- Pricing: Main Descriptor
-/// </summary>
-public sealed partial class PricingDescriptor : pb::IMessage<PricingDescriptor> {
-  private static readonly pb::MessageParser<PricingDescriptor> _parser = new pb::MessageParser<PricingDescriptor>(() => new PricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<PricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[4]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingDescriptor(PricingDescriptor other) : this() {
-    type_ = other.type_;
-    Unit = other.unit_ != null ? other.Unit.Clone() : null;
-    Weighted = other.weighted_ != null ? other.Weighted.Clone() : null;
-    Freebie = other.freebie_ != null ? other.Freebie.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingDescriptor Clone() {
-    return new PricingDescriptor(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::PricingType type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::PricingType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "unit" field.</summary>
-  public const int UnitFieldNumber = 20;
-  private global::UnitPricingDescriptor unit_;
-  /// <summary>
-  /// -- descriptors
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::UnitPricingDescriptor Unit {
-    get { return unit_; }
-    set {
-      unit_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "weighted" field.</summary>
-  public const int WeightedFieldNumber = 21;
-  private global::WeightedPricingDescriptor weighted_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::WeightedPricingDescriptor Weighted {
-    get { return weighted_; }
-    set {
-      weighted_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "freebie" field.</summary>
-  public const int FreebieFieldNumber = 22;
-  private global::FreebiePricingDescriptor freebie_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::FreebiePricingDescriptor Freebie {
-    get { return freebie_; }
-    set {
-      freebie_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as PricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(PricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (!object.Equals(Unit, other.Unit)) return false;
-    if (!object.Equals(Weighted, other.Weighted)) return false;
-    if (!object.Equals(Freebie, other.Freebie)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (unit_ != null) hash ^= Unit.GetHashCode();
-    if (weighted_ != null) hash ^= Weighted.GetHashCode();
-    if (freebie_ != null) hash ^= Freebie.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (unit_ != null) {
-      output.WriteRawTag(162, 1);
-      output.WriteMessage(Unit);
-    }
-    if (weighted_ != null) {
-      output.WriteRawTag(170, 1);
-      output.WriteMessage(Weighted);
-    }
-    if (freebie_ != null) {
-      output.WriteRawTag(178, 1);
-      output.WriteMessage(Freebie);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (unit_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Unit);
-    }
-    if (weighted_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Weighted);
-    }
-    if (freebie_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Freebie);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(PricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.unit_ != null) {
-      if (unit_ == null) {
-        unit_ = new global::UnitPricingDescriptor();
-      }
-      Unit.MergeFrom(other.Unit);
-    }
-    if (other.weighted_ != null) {
-      if (weighted_ == null) {
-        weighted_ = new global::WeightedPricingDescriptor();
-      }
-      Weighted.MergeFrom(other.Weighted);
-    }
-    if (other.freebie_ != null) {
-      if (freebie_ == null) {
-        freebie_ = new global::FreebiePricingDescriptor();
-      }
-      Freebie.MergeFrom(other.Freebie);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::PricingType) input.ReadEnum();
-          break;
-        }
-        case 162: {
-          if (unit_ == null) {
-            unit_ = new global::UnitPricingDescriptor();
-          }
-          input.ReadMessage(unit_);
-          break;
-        }
-        case 170: {
-          if (weighted_ == null) {
-            weighted_ = new global::WeightedPricingDescriptor();
-          }
-          input.ReadMessage(weighted_);
-          break;
-        }
-        case 178: {
-          if (freebie_ == null) {
-            freebie_ = new global::FreebiePricingDescriptor();
-          }
-          input.ReadMessage(freebie_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-/// <summary>
-/// -- Pricing: Product-level Object
-/// </summary>
-public sealed partial class ProductPricing : pb::IMessage<ProductPricing> {
-  private static readonly pb::MessageParser<ProductPricing> _parser = new pb::MessageParser<ProductPricing>(() => new ProductPricing());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductPricing> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[5]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductPricing() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductPricing(ProductPricing other) : this() {
-    discounts_ = other.discounts_.Clone();
-    manifest_ = other.manifest_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductPricing Clone() {
-    return new ProductPricing(this);
-  }
-
-  /// <summary>Field number for the "discounts" field.</summary>
-  public const int DiscountsFieldNumber = 1;
-  private static readonly pb::FieldCodec<global::SaleDescriptor> _repeated_discounts_codec
-      = pb::FieldCodec.ForMessage(10, global::SaleDescriptor.Parser);
-  private readonly pbc::RepeatedField<global::SaleDescriptor> discounts_ = new pbc::RepeatedField<global::SaleDescriptor>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::SaleDescriptor> Discounts {
-    get { return discounts_; }
-  }
-
-  /// <summary>Field number for the "manifest" field.</summary>
-  public const int ManifestFieldNumber = 2;
-  private static readonly pb::FieldCodec<global::PricingDescriptor> _repeated_manifest_codec
-      = pb::FieldCodec.ForMessage(18, global::PricingDescriptor.Parser);
-  private readonly pbc::RepeatedField<global::PricingDescriptor> manifest_ = new pbc::RepeatedField<global::PricingDescriptor>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::PricingDescriptor> Manifest {
-    get { return manifest_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductPricing);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductPricing other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if(!discounts_.Equals(other.discounts_)) return false;
-    if(!manifest_.Equals(other.manifest_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    hash ^= discounts_.GetHashCode();
-    hash ^= manifest_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    discounts_.WriteTo(output, _repeated_discounts_codec);
-    manifest_.WriteTo(output, _repeated_manifest_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    size += discounts_.CalculateSize(_repeated_discounts_codec);
-    size += manifest_.CalculateSize(_repeated_manifest_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductPricing other) {
-    if (other == null) {
-      return;
-    }
-    discounts_.Add(other.discounts_);
-    manifest_.Add(other.manifest_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          discounts_.AddEntriesFrom(input, _repeated_discounts_codec);
-          break;
-        }
-        case 18: {
-          manifest_.AddEntriesFrom(input, _repeated_manifest_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/PricingDescriptorg.cs b/languages/csharp/PricingDescriptorg.cs
deleted file mode 100644
index 20d8643..0000000
--- a/languages/csharp/PricingDescriptorg.cs
+++ /dev/null
@@ -1,1032 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/pricing/PricingDescriptor.proto</summary>
-public static partial class PricingDescriptorReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/pricing/PricingDescriptor.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static PricingDescriptorReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "CidzdHJ1Y3RzL3ByaWNpbmcvUHJpY2luZ0Rlc2NyaXB0b3IucHJvdG8aJHN0",
-          "cnVjdHMvcHJpY2luZy9TYWxlRGVzY3JpcHRvci5wcm90byI9ChdQcmljaW5n",
-          "VGllckF2YWlsYWJpbGl0eRIPCgdvZmZlcmVkGAEgASgIEhEKCWF2YWlsYWJs",
-          "ZRgCIAEoCCJ6ChVVbml0UHJpY2luZ0Rlc2NyaXB0b3ISEwoLcHJpY2VfdmFs",
-          "dWUYASABKAISKAoGc3RhdHVzGAIgASgLMhguUHJpY2luZ1RpZXJBdmFpbGFi",
-          "aWxpdHkSIgoJZGlzY291bnRzGAMgAygLMg8uU2FsZURlc2NyaXB0b3IifAoZ",
-          "V2VpZ2h0ZWRQcmljaW5nRGVzY3JpcHRvchIiCgZ3ZWlnaHQYASABKA4yEi5Q",
-          "cmljaW5nV2VpZ2h0VGllchIkCgR0aWVyGAIgASgLMhYuVW5pdFByaWNpbmdE",
-          "ZXNjcmlwdG9yEhUKDXdlaWdodEluR3JhbXMYAyABKAIiGgoYRnJlZWJpZVBy",
-          "aWNpbmdEZXNjcmlwdG9yIq8BChFQcmljaW5nRGVzY3JpcHRvchIaCgR0eXBl",
-          "GAEgASgOMgwuUHJpY2luZ1R5cGUSJAoEdW5pdBgUIAEoCzIWLlVuaXRQcmlj",
-          "aW5nRGVzY3JpcHRvchIsCgh3ZWlnaHRlZBgVIAEoCzIaLldlaWdodGVkUHJp",
-          "Y2luZ0Rlc2NyaXB0b3ISKgoHZnJlZWJpZRgWIAEoCzIZLkZyZWViaWVQcmlj",
-          "aW5nRGVzY3JpcHRvciJaCg5Qcm9kdWN0UHJpY2luZxIiCglkaXNjb3VudHMY",
-          "ASADKAsyDy5TYWxlRGVzY3JpcHRvchIkCghtYW5pZmVzdBgCIAMoCzISLlBy",
-          "aWNpbmdEZXNjcmlwdG9yKjIKC1ByaWNpbmdUeXBlEggKBFVOSVQQABIMCghX",
-          "RUlHSFRFRBABEgsKB0ZSRUVCSUUQAiqJAQoRUHJpY2luZ1dlaWdodFRpZXIS",
-          "CQoFT1RIRVIQABIICgRHUkFNEAESDAoISEFMRkdSQU0QAhIPCgtRVUFSVEVS",
-          "R1JBTRADEgcKA0RVQhAEEgoKBkVJR0hUSBAFEgsKB1FVQVJURVIQBhIICgRI",
-          "QUxGEAcSCQoFT1VOQ0UQCBIJCgVQT1VORBAJQj4KIWlvLmJsb29tYm94LnNj",
-          "aGVtYS5wcm9kdWN0LnN0cnVjdEISUHJvZHVjdFByaWNpbmdTcGVjSAFQAfgB",
-          "AWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::SaleDescriptorReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::PricingType), typeof(global::PricingWeightTier), }, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::PricingTierAvailability), global::PricingTierAvailability.Parser, new[]{ "Offered", "Available" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::UnitPricingDescriptor), global::UnitPricingDescriptor.Parser, new[]{ "PriceValue", "Status", "Discounts" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::WeightedPricingDescriptor), global::WeightedPricingDescriptor.Parser, new[]{ "Weight", "Tier", "WeightInGrams" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::FreebiePricingDescriptor), global::FreebiePricingDescriptor.Parser, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::PricingDescriptor), global::PricingDescriptor.Parser, new[]{ "Type", "Unit", "Weighted", "Freebie" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductPricing), global::ProductPricing.Parser, new[]{ "Discounts", "Manifest" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Enums
-/// <summary>
-/// -- Pricing: Objects
-/// </summary>
-public enum PricingType {
-  [pbr::OriginalName("UNIT")] Unit = 0,
-  [pbr::OriginalName("WEIGHTED")] Weighted = 1,
-  [pbr::OriginalName("FREEBIE")] Freebie = 2,
-}
-
-public enum PricingWeightTier {
-  [pbr::OriginalName("OTHER")] Other = 0,
-  [pbr::OriginalName("GRAM")] Gram = 1,
-  [pbr::OriginalName("HALFGRAM")] Halfgram = 2,
-  [pbr::OriginalName("QUARTERGRAM")] Quartergram = 3,
-  [pbr::OriginalName("DUB")] Dub = 4,
-  [pbr::OriginalName("EIGHTH")] Eighth = 5,
-  [pbr::OriginalName("QUARTER")] Quarter = 6,
-  [pbr::OriginalName("HALF")] Half = 7,
-  [pbr::OriginalName("OUNCE")] Ounce = 8,
-  [pbr::OriginalName("POUND")] Pound = 9,
-}
-
-#endregion
-
-#region Messages
-public sealed partial class PricingTierAvailability : pb::IMessage<PricingTierAvailability> {
-  private static readonly pb::MessageParser<PricingTierAvailability> _parser = new pb::MessageParser<PricingTierAvailability>(() => new PricingTierAvailability());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<PricingTierAvailability> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingTierAvailability() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingTierAvailability(PricingTierAvailability other) : this() {
-    offered_ = other.offered_;
-    available_ = other.available_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingTierAvailability Clone() {
-    return new PricingTierAvailability(this);
-  }
-
-  /// <summary>Field number for the "offered" field.</summary>
-  public const int OfferedFieldNumber = 1;
-  private bool offered_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Offered {
-    get { return offered_; }
-    set {
-      offered_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "available" field.</summary>
-  public const int AvailableFieldNumber = 2;
-  private bool available_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Available {
-    get { return available_; }
-    set {
-      available_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as PricingTierAvailability);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(PricingTierAvailability other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Offered != other.Offered) return false;
-    if (Available != other.Available) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Offered != false) hash ^= Offered.GetHashCode();
-    if (Available != false) hash ^= Available.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Offered != false) {
-      output.WriteRawTag(8);
-      output.WriteBool(Offered);
-    }
-    if (Available != false) {
-      output.WriteRawTag(16);
-      output.WriteBool(Available);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Offered != false) {
-      size += 1 + 1;
-    }
-    if (Available != false) {
-      size += 1 + 1;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(PricingTierAvailability other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Offered != false) {
-      Offered = other.Offered;
-    }
-    if (other.Available != false) {
-      Available = other.Available;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          Offered = input.ReadBool();
-          break;
-        }
-        case 16: {
-          Available = input.ReadBool();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-/// <summary>
-/// -- Pricing: Typed Descriptors
-/// </summary>
-public sealed partial class UnitPricingDescriptor : pb::IMessage<UnitPricingDescriptor> {
-  private static readonly pb::MessageParser<UnitPricingDescriptor> _parser = new pb::MessageParser<UnitPricingDescriptor>(() => new UnitPricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<UnitPricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[1]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public UnitPricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public UnitPricingDescriptor(UnitPricingDescriptor other) : this() {
-    priceValue_ = other.priceValue_;
-    Status = other.status_ != null ? other.Status.Clone() : null;
-    discounts_ = other.discounts_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public UnitPricingDescriptor Clone() {
-    return new UnitPricingDescriptor(this);
-  }
-
-  /// <summary>Field number for the "price_value" field.</summary>
-  public const int PriceValueFieldNumber = 1;
-  private float priceValue_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public float PriceValue {
-    get { return priceValue_; }
-    set {
-      priceValue_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "status" field.</summary>
-  public const int StatusFieldNumber = 2;
-  private global::PricingTierAvailability status_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::PricingTierAvailability Status {
-    get { return status_; }
-    set {
-      status_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "discounts" field.</summary>
-  public const int DiscountsFieldNumber = 3;
-  private static readonly pb::FieldCodec<global::SaleDescriptor> _repeated_discounts_codec
-      = pb::FieldCodec.ForMessage(26, global::SaleDescriptor.Parser);
-  private readonly pbc::RepeatedField<global::SaleDescriptor> discounts_ = new pbc::RepeatedField<global::SaleDescriptor>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::SaleDescriptor> Discounts {
-    get { return discounts_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as UnitPricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(UnitPricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (PriceValue != other.PriceValue) return false;
-    if (!object.Equals(Status, other.Status)) return false;
-    if(!discounts_.Equals(other.discounts_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (PriceValue != 0F) hash ^= PriceValue.GetHashCode();
-    if (status_ != null) hash ^= Status.GetHashCode();
-    hash ^= discounts_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (PriceValue != 0F) {
-      output.WriteRawTag(13);
-      output.WriteFloat(PriceValue);
-    }
-    if (status_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Status);
-    }
-    discounts_.WriteTo(output, _repeated_discounts_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (PriceValue != 0F) {
-      size += 1 + 4;
-    }
-    if (status_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Status);
-    }
-    size += discounts_.CalculateSize(_repeated_discounts_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(UnitPricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.PriceValue != 0F) {
-      PriceValue = other.PriceValue;
-    }
-    if (other.status_ != null) {
-      if (status_ == null) {
-        status_ = new global::PricingTierAvailability();
-      }
-      Status.MergeFrom(other.Status);
-    }
-    discounts_.Add(other.discounts_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 13: {
-          PriceValue = input.ReadFloat();
-          break;
-        }
-        case 18: {
-          if (status_ == null) {
-            status_ = new global::PricingTierAvailability();
-          }
-          input.ReadMessage(status_);
-          break;
-        }
-        case 26: {
-          discounts_.AddEntriesFrom(input, _repeated_discounts_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class WeightedPricingDescriptor : pb::IMessage<WeightedPricingDescriptor> {
-  private static readonly pb::MessageParser<WeightedPricingDescriptor> _parser = new pb::MessageParser<WeightedPricingDescriptor>(() => new WeightedPricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<WeightedPricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[2]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public WeightedPricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public WeightedPricingDescriptor(WeightedPricingDescriptor other) : this() {
-    weight_ = other.weight_;
-    Tier = other.tier_ != null ? other.Tier.Clone() : null;
-    weightInGrams_ = other.weightInGrams_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public WeightedPricingDescriptor Clone() {
-    return new WeightedPricingDescriptor(this);
-  }
-
-  /// <summary>Field number for the "weight" field.</summary>
-  public const int WeightFieldNumber = 1;
-  private global::PricingWeightTier weight_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::PricingWeightTier Weight {
-    get { return weight_; }
-    set {
-      weight_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "tier" field.</summary>
-  public const int TierFieldNumber = 2;
-  private global::UnitPricingDescriptor tier_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::UnitPricingDescriptor Tier {
-    get { return tier_; }
-    set {
-      tier_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "weightInGrams" field.</summary>
-  public const int WeightInGramsFieldNumber = 3;
-  private float weightInGrams_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public float WeightInGrams {
-    get { return weightInGrams_; }
-    set {
-      weightInGrams_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as WeightedPricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(WeightedPricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Weight != other.Weight) return false;
-    if (!object.Equals(Tier, other.Tier)) return false;
-    if (WeightInGrams != other.WeightInGrams) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Weight != 0) hash ^= Weight.GetHashCode();
-    if (tier_ != null) hash ^= Tier.GetHashCode();
-    if (WeightInGrams != 0F) hash ^= WeightInGrams.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Weight != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Weight);
-    }
-    if (tier_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Tier);
-    }
-    if (WeightInGrams != 0F) {
-      output.WriteRawTag(29);
-      output.WriteFloat(WeightInGrams);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Weight != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Weight);
-    }
-    if (tier_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Tier);
-    }
-    if (WeightInGrams != 0F) {
-      size += 1 + 4;
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(WeightedPricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Weight != 0) {
-      Weight = other.Weight;
-    }
-    if (other.tier_ != null) {
-      if (tier_ == null) {
-        tier_ = new global::UnitPricingDescriptor();
-      }
-      Tier.MergeFrom(other.Tier);
-    }
-    if (other.WeightInGrams != 0F) {
-      WeightInGrams = other.WeightInGrams;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          weight_ = (global::PricingWeightTier) input.ReadEnum();
-          break;
-        }
-        case 18: {
-          if (tier_ == null) {
-            tier_ = new global::UnitPricingDescriptor();
-          }
-          input.ReadMessage(tier_);
-          break;
-        }
-        case 29: {
-          WeightInGrams = input.ReadFloat();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-public sealed partial class FreebiePricingDescriptor : pb::IMessage<FreebiePricingDescriptor> {
-  private static readonly pb::MessageParser<FreebiePricingDescriptor> _parser = new pb::MessageParser<FreebiePricingDescriptor>(() => new FreebiePricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<FreebiePricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[3]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FreebiePricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FreebiePricingDescriptor(FreebiePricingDescriptor other) : this() {
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public FreebiePricingDescriptor Clone() {
-    return new FreebiePricingDescriptor(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as FreebiePricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(FreebiePricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(FreebiePricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-      }
-    }
-  }
-
-}
-
-/// <summary>
-/// -- Pricing: Main Descriptor
-/// </summary>
-public sealed partial class PricingDescriptor : pb::IMessage<PricingDescriptor> {
-  private static readonly pb::MessageParser<PricingDescriptor> _parser = new pb::MessageParser<PricingDescriptor>(() => new PricingDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<PricingDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[4]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingDescriptor(PricingDescriptor other) : this() {
-    type_ = other.type_;
-    Unit = other.unit_ != null ? other.Unit.Clone() : null;
-    Weighted = other.weighted_ != null ? other.Weighted.Clone() : null;
-    Freebie = other.freebie_ != null ? other.Freebie.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public PricingDescriptor Clone() {
-    return new PricingDescriptor(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::PricingType type_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::PricingType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "unit" field.</summary>
-  public const int UnitFieldNumber = 20;
-  private global::UnitPricingDescriptor unit_;
-  /// <summary>
-  /// -- descriptors
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::UnitPricingDescriptor Unit {
-    get { return unit_; }
-    set {
-      unit_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "weighted" field.</summary>
-  public const int WeightedFieldNumber = 21;
-  private global::WeightedPricingDescriptor weighted_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::WeightedPricingDescriptor Weighted {
-    get { return weighted_; }
-    set {
-      weighted_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "freebie" field.</summary>
-  public const int FreebieFieldNumber = 22;
-  private global::FreebiePricingDescriptor freebie_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::FreebiePricingDescriptor Freebie {
-    get { return freebie_; }
-    set {
-      freebie_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as PricingDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(PricingDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (!object.Equals(Unit, other.Unit)) return false;
-    if (!object.Equals(Weighted, other.Weighted)) return false;
-    if (!object.Equals(Freebie, other.Freebie)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (unit_ != null) hash ^= Unit.GetHashCode();
-    if (weighted_ != null) hash ^= Weighted.GetHashCode();
-    if (freebie_ != null) hash ^= Freebie.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (unit_ != null) {
-      output.WriteRawTag(162, 1);
-      output.WriteMessage(Unit);
-    }
-    if (weighted_ != null) {
-      output.WriteRawTag(170, 1);
-      output.WriteMessage(Weighted);
-    }
-    if (freebie_ != null) {
-      output.WriteRawTag(178, 1);
-      output.WriteMessage(Freebie);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (unit_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Unit);
-    }
-    if (weighted_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Weighted);
-    }
-    if (freebie_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Freebie);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(PricingDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.unit_ != null) {
-      if (unit_ == null) {
-        unit_ = new global::UnitPricingDescriptor();
-      }
-      Unit.MergeFrom(other.Unit);
-    }
-    if (other.weighted_ != null) {
-      if (weighted_ == null) {
-        weighted_ = new global::WeightedPricingDescriptor();
-      }
-      Weighted.MergeFrom(other.Weighted);
-    }
-    if (other.freebie_ != null) {
-      if (freebie_ == null) {
-        freebie_ = new global::FreebiePricingDescriptor();
-      }
-      Freebie.MergeFrom(other.Freebie);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::PricingType) input.ReadEnum();
-          break;
-        }
-        case 162: {
-          if (unit_ == null) {
-            unit_ = new global::UnitPricingDescriptor();
-          }
-          input.ReadMessage(unit_);
-          break;
-        }
-        case 170: {
-          if (weighted_ == null) {
-            weighted_ = new global::WeightedPricingDescriptor();
-          }
-          input.ReadMessage(weighted_);
-          break;
-        }
-        case 178: {
-          if (freebie_ == null) {
-            freebie_ = new global::FreebiePricingDescriptor();
-          }
-          input.ReadMessage(freebie_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-/// <summary>
-/// -- Pricing: Product-level Object
-/// </summary>
-public sealed partial class ProductPricing : pb::IMessage<ProductPricing> {
-  private static readonly pb::MessageParser<ProductPricing> _parser = new pb::MessageParser<ProductPricing>(() => new ProductPricing());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductPricing> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::PricingDescriptorReflection.Descriptor.MessageTypes[5]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductPricing() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductPricing(ProductPricing other) : this() {
-    discounts_ = other.discounts_.Clone();
-    manifest_ = other.manifest_.Clone();
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductPricing Clone() {
-    return new ProductPricing(this);
-  }
-
-  /// <summary>Field number for the "discounts" field.</summary>
-  public const int DiscountsFieldNumber = 1;
-  private static readonly pb::FieldCodec<global::SaleDescriptor> _repeated_discounts_codec
-      = pb::FieldCodec.ForMessage(10, global::SaleDescriptor.Parser);
-  private readonly pbc::RepeatedField<global::SaleDescriptor> discounts_ = new pbc::RepeatedField<global::SaleDescriptor>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::SaleDescriptor> Discounts {
-    get { return discounts_; }
-  }
-
-  /// <summary>Field number for the "manifest" field.</summary>
-  public const int ManifestFieldNumber = 2;
-  private static readonly pb::FieldCodec<global::PricingDescriptor> _repeated_manifest_codec
-      = pb::FieldCodec.ForMessage(18, global::PricingDescriptor.Parser);
-  private readonly pbc::RepeatedField<global::PricingDescriptor> manifest_ = new pbc::RepeatedField<global::PricingDescriptor>();
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::PricingDescriptor> Manifest {
-    get { return manifest_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductPricing);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductPricing other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if(!discounts_.Equals(other.discounts_)) return false;
-    if(!manifest_.Equals(other.manifest_)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    hash ^= discounts_.GetHashCode();
-    hash ^= manifest_.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    discounts_.WriteTo(output, _repeated_discounts_codec);
-    manifest_.WriteTo(output, _repeated_manifest_codec);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    size += discounts_.CalculateSize(_repeated_discounts_codec);
-    size += manifest_.CalculateSize(_repeated_manifest_codec);
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductPricing other) {
-    if (other == null) {
-      return;
-    }
-    discounts_.Add(other.discounts_);
-    manifest_.Add(other.manifest_);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          discounts_.AddEntriesFrom(input, _repeated_discounts_codec);
-          break;
-        }
-        case 18: {
-          manifest_.AddEntriesFrom(input, _repeated_manifest_codec);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Product.cs b/languages/csharp/Product.cs
deleted file mode 100644
index 9cc3c2d..0000000
--- a/languages/csharp/Product.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from Product.proto</summary>
-public static partial class ProductReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for Product.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Cg1Qcm9kdWN0LnByb3RvGhViYXNlL1Byb2R1Y3RLZXkucHJvdG8aFmJhc2Uv",
-          "UHJvZHVjdFR5cGUucHJvdG8aGWdvb2dsZS9wcm90b2J1Zi9hbnkucHJvdG8i",
-          "YwoHUHJvZHVjdBIYCgNrZXkYASABKAsyCy5Qcm9kdWN0S2V5EhoKBHR5cGUY",
-          "AiABKAsyDC5Qcm9kdWN0VHlwZRIiCgRkYXRhGAMgASgLMhQuZ29vZ2xlLnBy",
-          "b3RvYnVmLkFueUIoChdpby5ibG9vbWJveC5zY2hlbWEuYmFzZUILQmFzZVBy",
-          "b2R1Y3RQAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::ProductKeyReflection.Descriptor, global::ProductTypeReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Product), global::Product.Parser, new[]{ "Key", "Type", "Data" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-/// <summary>
-/// -- Product Type: Top-level -- //
-/// </summary>
-public sealed partial class Product : pb::IMessage<Product> {
-  private static readonly pb::MessageParser<Product> _parser = new pb::MessageParser<Product>(() => new Product());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Product> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Product() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Product(Product other) : this() {
-    Key = other.key_ != null ? other.Key.Clone() : null;
-    Type = other.type_ != null ? other.Type.Clone() : null;
-    Data = other.data_ != null ? other.Data.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Product Clone() {
-    return new Product(this);
-  }
-
-  /// <summary>Field number for the "key" field.</summary>
-  public const int KeyFieldNumber = 1;
-  private global::ProductKey key_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductKey Key {
-    get { return key_; }
-    set {
-      key_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 2;
-  private global::ProductType type_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "data" field.</summary>
-  public const int DataFieldNumber = 3;
-  private global::Google.Protobuf.WellKnownTypes.Any data_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Google.Protobuf.WellKnownTypes.Any Data {
-    get { return data_; }
-    set {
-      data_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Product);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Product other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Key, other.Key)) return false;
-    if (!object.Equals(Type, other.Type)) return false;
-    if (!object.Equals(Data, other.Data)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (key_ != null) hash ^= Key.GetHashCode();
-    if (type_ != null) hash ^= Type.GetHashCode();
-    if (data_ != null) hash ^= Data.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (key_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Key);
-    }
-    if (type_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Type);
-    }
-    if (data_ != null) {
-      output.WriteRawTag(26);
-      output.WriteMessage(Data);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (key_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Key);
-    }
-    if (type_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Type);
-    }
-    if (data_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Data);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Product other) {
-    if (other == null) {
-      return;
-    }
-    if (other.key_ != null) {
-      if (key_ == null) {
-        key_ = new global::ProductKey();
-      }
-      Key.MergeFrom(other.Key);
-    }
-    if (other.type_ != null) {
-      if (type_ == null) {
-        type_ = new global::ProductType();
-      }
-      Type.MergeFrom(other.Type);
-    }
-    if (other.data_ != null) {
-      if (data_ == null) {
-        data_ = new global::Google.Protobuf.WellKnownTypes.Any();
-      }
-      Data.MergeFrom(other.Data);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (key_ == null) {
-            key_ = new global::ProductKey();
-          }
-          input.ReadMessage(key_);
-          break;
-        }
-        case 18: {
-          if (type_ == null) {
-            type_ = new global::ProductType();
-          }
-          input.ReadMessage(type_);
-          break;
-        }
-        case 26: {
-          if (data_ == null) {
-            data_ = new global::Google.Protobuf.WellKnownTypes.Any();
-          }
-          input.ReadMessage(data_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductContent.cs b/languages/csharp/ProductContent.cs
deleted file mode 100644
index 6dc680a..0000000
--- a/languages/csharp/ProductContent.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/ProductContent.proto</summary>
-public static partial class ProductContentReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/ProductContent.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductContentReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Chxjb250ZW50L1Byb2R1Y3RDb250ZW50LnByb3RvGhJjb250ZW50L05hbWUu",
-          "cHJvdG8aFWNvbnRlbnQvQ29udGVudC5wcm90bxoTY29udGVudC9CcmFuZC5w",
-          "cm90bxoVbWVkaWEvTWVkaWFJdGVtLnByb3RvIr8BCg5Qcm9kdWN0Q29udGVu",
-          "dBITCgRuYW1lGAEgASgLMgUuTmFtZRIZCgdzdW1tYXJ5GAIgASgLMgguQ29u",
-          "dGVudBIVCgVicmFuZBgDIAEoCzIGLkJyYW5kEhkKBW1lZGlhGBQgAygLMgou",
-          "TWVkaWFJdGVtEhcKBXVzYWdlGB4gASgLMgguQ29udGVudBIYCgZkb3NhZ2UY",
-          "HyABKAsyCC5Db250ZW50EhgKBmFkdmljZRggIAEoCzIILkNvbnRlbnRCLwoa",
-          "aW8uYmxvb21ib3guc2NoZW1hLmNvbnRlbnRCD0F0dGFjaGVkQ29udGVudFAB",
-          "YgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::NameReflection.Descriptor, global::ContentReflection.Descriptor, global::BrandReflection.Descriptor, global::MediaItemReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductContent), global::ProductContent.Parser, new[]{ "Name", "Summary", "Brand", "Media", "Usage", "Dosage", "Advice" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class ProductContent : pb::IMessage<ProductContent> {
-  private static readonly pb::MessageParser<ProductContent> _parser = new pb::MessageParser<ProductContent>(() => new ProductContent());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductContent> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductContentReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductContent() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductContent(ProductContent other) : this() {
-    Name = other.name_ != null ? other.Name.Clone() : null;
-    Summary = other.summary_ != null ? other.Summary.Clone() : null;
-    Brand = other.brand_ != null ? other.Brand.Clone() : null;
-    media_ = other.media_.Clone();
-    Usage = other.usage_ != null ? other.Usage.Clone() : null;
-    Dosage = other.dosage_ != null ? other.Dosage.Clone() : null;
-    Advice = other.advice_ != null ? other.Advice.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductContent Clone() {
-    return new ProductContent(this);
-  }
-
-  /// <summary>Field number for the "name" field.</summary>
-  public const int NameFieldNumber = 1;
-  private global::Name name_;
-  /// <summary>
-  /// -- Basic Properties
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Name {
-    get { return name_; }
-    set {
-      name_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "summary" field.</summary>
-  public const int SummaryFieldNumber = 2;
-  private global::Content summary_;
-  /// <summary>
-  /// narrative summary
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Summary {
-    get { return summary_; }
-    set {
-      summary_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "brand" field.</summary>
-  public const int BrandFieldNumber = 3;
-  private global::Brand brand_;
-  /// <summary>
-  /// product's brand
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Brand Brand {
-    get { return brand_; }
-    set {
-      brand_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "media" field.</summary>
-  public const int MediaFieldNumber = 20;
-  private static readonly pb::FieldCodec<global::MediaItem> _repeated_media_codec
-      = pb::FieldCodec.ForMessage(162, global::MediaItem.Parser);
-  private readonly pbc::RepeatedField<global::MediaItem> media_ = new pbc::RepeatedField<global::MediaItem>();
-  /// <summary>
-  /// -- Media
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::MediaItem> Media {
-    get { return media_; }
-  }
-
-  /// <summary>Field number for the "usage" field.</summary>
-  public const int UsageFieldNumber = 30;
-  private global::Content usage_;
-  /// <summary>
-  /// -- Extended Attributes
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Usage {
-    get { return usage_; }
-    set {
-      usage_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "dosage" field.</summary>
-  public const int DosageFieldNumber = 31;
-  private global::Content dosage_;
-  /// <summary>
-  /// dosage advice
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Dosage {
-    get { return dosage_; }
-    set {
-      dosage_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "advice" field.</summary>
-  public const int AdviceFieldNumber = 32;
-  private global::Content advice_;
-  /// <summary>
-  /// internal advice
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Advice {
-    get { return advice_; }
-    set {
-      advice_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductContent);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductContent other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Name, other.Name)) return false;
-    if (!object.Equals(Summary, other.Summary)) return false;
-    if (!object.Equals(Brand, other.Brand)) return false;
-    if(!media_.Equals(other.media_)) return false;
-    if (!object.Equals(Usage, other.Usage)) return false;
-    if (!object.Equals(Dosage, other.Dosage)) return false;
-    if (!object.Equals(Advice, other.Advice)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (name_ != null) hash ^= Name.GetHashCode();
-    if (summary_ != null) hash ^= Summary.GetHashCode();
-    if (brand_ != null) hash ^= Brand.GetHashCode();
-    hash ^= media_.GetHashCode();
-    if (usage_ != null) hash ^= Usage.GetHashCode();
-    if (dosage_ != null) hash ^= Dosage.GetHashCode();
-    if (advice_ != null) hash ^= Advice.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (name_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Name);
-    }
-    if (summary_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Summary);
-    }
-    if (brand_ != null) {
-      output.WriteRawTag(26);
-      output.WriteMessage(Brand);
-    }
-    media_.WriteTo(output, _repeated_media_codec);
-    if (usage_ != null) {
-      output.WriteRawTag(242, 1);
-      output.WriteMessage(Usage);
-    }
-    if (dosage_ != null) {
-      output.WriteRawTag(250, 1);
-      output.WriteMessage(Dosage);
-    }
-    if (advice_ != null) {
-      output.WriteRawTag(130, 2);
-      output.WriteMessage(Advice);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (name_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
-    }
-    if (summary_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Summary);
-    }
-    if (brand_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Brand);
-    }
-    size += media_.CalculateSize(_repeated_media_codec);
-    if (usage_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Usage);
-    }
-    if (dosage_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Dosage);
-    }
-    if (advice_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Advice);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductContent other) {
-    if (other == null) {
-      return;
-    }
-    if (other.name_ != null) {
-      if (name_ == null) {
-        name_ = new global::Name();
-      }
-      Name.MergeFrom(other.Name);
-    }
-    if (other.summary_ != null) {
-      if (summary_ == null) {
-        summary_ = new global::Content();
-      }
-      Summary.MergeFrom(other.Summary);
-    }
-    if (other.brand_ != null) {
-      if (brand_ == null) {
-        brand_ = new global::Brand();
-      }
-      Brand.MergeFrom(other.Brand);
-    }
-    media_.Add(other.media_);
-    if (other.usage_ != null) {
-      if (usage_ == null) {
-        usage_ = new global::Content();
-      }
-      Usage.MergeFrom(other.Usage);
-    }
-    if (other.dosage_ != null) {
-      if (dosage_ == null) {
-        dosage_ = new global::Content();
-      }
-      Dosage.MergeFrom(other.Dosage);
-    }
-    if (other.advice_ != null) {
-      if (advice_ == null) {
-        advice_ = new global::Content();
-      }
-      Advice.MergeFrom(other.Advice);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (name_ == null) {
-            name_ = new global::Name();
-          }
-          input.ReadMessage(name_);
-          break;
-        }
-        case 18: {
-          if (summary_ == null) {
-            summary_ = new global::Content();
-          }
-          input.ReadMessage(summary_);
-          break;
-        }
-        case 26: {
-          if (brand_ == null) {
-            brand_ = new global::Brand();
-          }
-          input.ReadMessage(brand_);
-          break;
-        }
-        case 162: {
-          media_.AddEntriesFrom(input, _repeated_media_codec);
-          break;
-        }
-        case 242: {
-          if (usage_ == null) {
-            usage_ = new global::Content();
-          }
-          input.ReadMessage(usage_);
-          break;
-        }
-        case 250: {
-          if (dosage_ == null) {
-            dosage_ = new global::Content();
-          }
-          input.ReadMessage(dosage_);
-          break;
-        }
-        case 258: {
-          if (advice_ == null) {
-            advice_ = new global::Content();
-          }
-          input.ReadMessage(advice_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductContentg.cs b/languages/csharp/ProductContentg.cs
deleted file mode 100644
index 1d6e1ea..0000000
--- a/languages/csharp/ProductContentg.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from content/ProductContent.proto</summary>
-public static partial class ProductContentReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for content/ProductContent.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductContentReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Chxjb250ZW50L1Byb2R1Y3RDb250ZW50LnByb3RvGhJjb250ZW50L05hbWUu",
-          "cHJvdG8aFWNvbnRlbnQvQ29udGVudC5wcm90bxoTY29udGVudC9CcmFuZC5w",
-          "cm90bxoVbWVkaWEvTWVkaWFJdGVtLnByb3RvIr8BCg5Qcm9kdWN0Q29udGVu",
-          "dBITCgRuYW1lGAEgASgLMgUuTmFtZRIZCgdzdW1tYXJ5GAIgASgLMgguQ29u",
-          "dGVudBIVCgVicmFuZBgDIAEoCzIGLkJyYW5kEhkKBW1lZGlhGBQgAygLMgou",
-          "TWVkaWFJdGVtEhcKBXVzYWdlGB4gASgLMgguQ29udGVudBIYCgZkb3NhZ2UY",
-          "HyABKAsyCC5Db250ZW50EhgKBmFkdmljZRggIAEoCzIILkNvbnRlbnRCNAoa",
-          "aW8uYmxvb21ib3guc2NoZW1hLmNvbnRlbnRCD0F0dGFjaGVkQ29udGVudEgB",
-          "UAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::NameReflection.Descriptor, global::ContentReflection.Descriptor, global::BrandReflection.Descriptor, global::MediaItemReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductContent), global::ProductContent.Parser, new[]{ "Name", "Summary", "Brand", "Media", "Usage", "Dosage", "Advice" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class ProductContent : pb::IMessage<ProductContent> {
-  private static readonly pb::MessageParser<ProductContent> _parser = new pb::MessageParser<ProductContent>(() => new ProductContent());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductContent> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductContentReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductContent() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductContent(ProductContent other) : this() {
-    Name = other.name_ != null ? other.Name.Clone() : null;
-    Summary = other.summary_ != null ? other.Summary.Clone() : null;
-    Brand = other.brand_ != null ? other.Brand.Clone() : null;
-    media_ = other.media_.Clone();
-    Usage = other.usage_ != null ? other.Usage.Clone() : null;
-    Dosage = other.dosage_ != null ? other.Dosage.Clone() : null;
-    Advice = other.advice_ != null ? other.Advice.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductContent Clone() {
-    return new ProductContent(this);
-  }
-
-  /// <summary>Field number for the "name" field.</summary>
-  public const int NameFieldNumber = 1;
-  private global::Name name_;
-  /// <summary>
-  /// -- Basic Properties
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Name Name {
-    get { return name_; }
-    set {
-      name_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "summary" field.</summary>
-  public const int SummaryFieldNumber = 2;
-  private global::Content summary_;
-  /// <summary>
-  /// narrative summary
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Summary {
-    get { return summary_; }
-    set {
-      summary_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "brand" field.</summary>
-  public const int BrandFieldNumber = 3;
-  private global::Brand brand_;
-  /// <summary>
-  /// product's brand
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Brand Brand {
-    get { return brand_; }
-    set {
-      brand_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "media" field.</summary>
-  public const int MediaFieldNumber = 20;
-  private static readonly pb::FieldCodec<global::MediaItem> _repeated_media_codec
-      = pb::FieldCodec.ForMessage(162, global::MediaItem.Parser);
-  private readonly pbc::RepeatedField<global::MediaItem> media_ = new pbc::RepeatedField<global::MediaItem>();
-  /// <summary>
-  /// -- Media
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public pbc::RepeatedField<global::MediaItem> Media {
-    get { return media_; }
-  }
-
-  /// <summary>Field number for the "usage" field.</summary>
-  public const int UsageFieldNumber = 30;
-  private global::Content usage_;
-  /// <summary>
-  /// -- Extended Attributes
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Usage {
-    get { return usage_; }
-    set {
-      usage_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "dosage" field.</summary>
-  public const int DosageFieldNumber = 31;
-  private global::Content dosage_;
-  /// <summary>
-  /// dosage advice
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Dosage {
-    get { return dosage_; }
-    set {
-      dosage_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "advice" field.</summary>
-  public const int AdviceFieldNumber = 32;
-  private global::Content advice_;
-  /// <summary>
-  /// internal advice
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Content Advice {
-    get { return advice_; }
-    set {
-      advice_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductContent);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductContent other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Name, other.Name)) return false;
-    if (!object.Equals(Summary, other.Summary)) return false;
-    if (!object.Equals(Brand, other.Brand)) return false;
-    if(!media_.Equals(other.media_)) return false;
-    if (!object.Equals(Usage, other.Usage)) return false;
-    if (!object.Equals(Dosage, other.Dosage)) return false;
-    if (!object.Equals(Advice, other.Advice)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (name_ != null) hash ^= Name.GetHashCode();
-    if (summary_ != null) hash ^= Summary.GetHashCode();
-    if (brand_ != null) hash ^= Brand.GetHashCode();
-    hash ^= media_.GetHashCode();
-    if (usage_ != null) hash ^= Usage.GetHashCode();
-    if (dosage_ != null) hash ^= Dosage.GetHashCode();
-    if (advice_ != null) hash ^= Advice.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (name_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Name);
-    }
-    if (summary_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Summary);
-    }
-    if (brand_ != null) {
-      output.WriteRawTag(26);
-      output.WriteMessage(Brand);
-    }
-    media_.WriteTo(output, _repeated_media_codec);
-    if (usage_ != null) {
-      output.WriteRawTag(242, 1);
-      output.WriteMessage(Usage);
-    }
-    if (dosage_ != null) {
-      output.WriteRawTag(250, 1);
-      output.WriteMessage(Dosage);
-    }
-    if (advice_ != null) {
-      output.WriteRawTag(130, 2);
-      output.WriteMessage(Advice);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (name_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
-    }
-    if (summary_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Summary);
-    }
-    if (brand_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Brand);
-    }
-    size += media_.CalculateSize(_repeated_media_codec);
-    if (usage_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Usage);
-    }
-    if (dosage_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Dosage);
-    }
-    if (advice_ != null) {
-      size += 2 + pb::CodedOutputStream.ComputeMessageSize(Advice);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductContent other) {
-    if (other == null) {
-      return;
-    }
-    if (other.name_ != null) {
-      if (name_ == null) {
-        name_ = new global::Name();
-      }
-      Name.MergeFrom(other.Name);
-    }
-    if (other.summary_ != null) {
-      if (summary_ == null) {
-        summary_ = new global::Content();
-      }
-      Summary.MergeFrom(other.Summary);
-    }
-    if (other.brand_ != null) {
-      if (brand_ == null) {
-        brand_ = new global::Brand();
-      }
-      Brand.MergeFrom(other.Brand);
-    }
-    media_.Add(other.media_);
-    if (other.usage_ != null) {
-      if (usage_ == null) {
-        usage_ = new global::Content();
-      }
-      Usage.MergeFrom(other.Usage);
-    }
-    if (other.dosage_ != null) {
-      if (dosage_ == null) {
-        dosage_ = new global::Content();
-      }
-      Dosage.MergeFrom(other.Dosage);
-    }
-    if (other.advice_ != null) {
-      if (advice_ == null) {
-        advice_ = new global::Content();
-      }
-      Advice.MergeFrom(other.Advice);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (name_ == null) {
-            name_ = new global::Name();
-          }
-          input.ReadMessage(name_);
-          break;
-        }
-        case 18: {
-          if (summary_ == null) {
-            summary_ = new global::Content();
-          }
-          input.ReadMessage(summary_);
-          break;
-        }
-        case 26: {
-          if (brand_ == null) {
-            brand_ = new global::Brand();
-          }
-          input.ReadMessage(brand_);
-          break;
-        }
-        case 162: {
-          media_.AddEntriesFrom(input, _repeated_media_codec);
-          break;
-        }
-        case 242: {
-          if (usage_ == null) {
-            usage_ = new global::Content();
-          }
-          input.ReadMessage(usage_);
-          break;
-        }
-        case 250: {
-          if (dosage_ == null) {
-            dosage_ = new global::Content();
-          }
-          input.ReadMessage(dosage_);
-          break;
-        }
-        case 258: {
-          if (advice_ == null) {
-            advice_ = new global::Content();
-          }
-          input.ReadMessage(advice_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductKey.cs b/languages/csharp/ProductKey.cs
deleted file mode 100644
index 17b1bcb..0000000
--- a/languages/csharp/ProductKey.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/ProductKey.proto</summary>
-public static partial class ProductKeyReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/ProductKey.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductKeyReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChViYXNlL1Byb2R1Y3RLZXkucHJvdG8iGAoKUHJvZHVjdEtleRIKCgJpZBgB",
-          "IAEoCUIrChdpby5ibG9vbWJveC5zY2hlbWEuYmFzZUIOQmFzZVByb2R1Y3RL",
-          "ZXlQAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductKey), global::ProductKey.Parser, new[]{ "Id" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class ProductKey : pb::IMessage<ProductKey> {
-  private static readonly pb::MessageParser<ProductKey> _parser = new pb::MessageParser<ProductKey>(() => new ProductKey());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductKey> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductKeyReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductKey() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductKey(ProductKey other) : this() {
-    id_ = other.id_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductKey Clone() {
-    return new ProductKey(this);
-  }
-
-  /// <summary>Field number for the "id" field.</summary>
-  public const int IdFieldNumber = 1;
-  private string id_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Id {
-    get { return id_; }
-    set {
-      id_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductKey);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductKey other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Id != other.Id) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Id.Length != 0) hash ^= Id.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Id.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(Id);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Id.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductKey other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Id.Length != 0) {
-      Id = other.Id;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          Id = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductKeyg.cs b/languages/csharp/ProductKeyg.cs
deleted file mode 100644
index 4685b97..0000000
--- a/languages/csharp/ProductKeyg.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/ProductKey.proto</summary>
-public static partial class ProductKeyReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/ProductKey.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductKeyReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChViYXNlL1Byb2R1Y3RLZXkucHJvdG8iGAoKUHJvZHVjdEtleRIKCgJpZBgB",
-          "IAEoCUIwChdpby5ibG9vbWJveC5zY2hlbWEuYmFzZUIOQmFzZVByb2R1Y3RL",
-          "ZXlIAVAB+AEBYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductKey), global::ProductKey.Parser, new[]{ "Id" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-public sealed partial class ProductKey : pb::IMessage<ProductKey> {
-  private static readonly pb::MessageParser<ProductKey> _parser = new pb::MessageParser<ProductKey>(() => new ProductKey());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductKey> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductKeyReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductKey() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductKey(ProductKey other) : this() {
-    id_ = other.id_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductKey Clone() {
-    return new ProductKey(this);
-  }
-
-  /// <summary>Field number for the "id" field.</summary>
-  public const int IdFieldNumber = 1;
-  private string id_ = "";
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public string Id {
-    get { return id_; }
-    set {
-      id_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductKey);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductKey other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Id != other.Id) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Id.Length != 0) hash ^= Id.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Id.Length != 0) {
-      output.WriteRawTag(10);
-      output.WriteString(Id);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Id.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductKey other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Id.Length != 0) {
-      Id = other.Id;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          Id = input.ReadString();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductKind.cs b/languages/csharp/ProductKind.cs
deleted file mode 100644
index c2a0192..0000000
--- a/languages/csharp/ProductKind.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/ProductKind.proto</summary>
-public static partial class ProductKindReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/ProductKind.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductKindReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZiYXNlL1Byb2R1Y3RLaW5kLnByb3RvKoABCgtQcm9kdWN0S2luZBILCgdG",
-          "TE9XRVJTEAASCwoHRURJQkxFUxABEgwKCEVYVFJBQ1RTEAISDAoIUFJFUk9M",
-          "TFMQAxIOCgpBUE9USEVDQVJZEAQSDgoKQ0FSVFJJREdFUxAFEgoKBlBMQU5U",
-          "UxAGEg8KC01FUkNIQU5ESVNFEAdCLAoXaW8uYmxvb21ib3guc2NoZW1hLmJh",
-          "c2VCD0Jhc2VQcm9kdWN0S2luZFABYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProductKind), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum ProductKind {
-  [pbr::OriginalName("FLOWERS")] Flowers = 0,
-  [pbr::OriginalName("EDIBLES")] Edibles = 1,
-  [pbr::OriginalName("EXTRACTS")] Extracts = 2,
-  [pbr::OriginalName("PREROLLS")] Prerolls = 3,
-  [pbr::OriginalName("APOTHECARY")] Apothecary = 4,
-  [pbr::OriginalName("CARTRIDGES")] Cartridges = 5,
-  [pbr::OriginalName("PLANTS")] Plants = 6,
-  [pbr::OriginalName("MERCHANDISE")] Merchandise = 7,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductKindg.cs b/languages/csharp/ProductKindg.cs
deleted file mode 100644
index 8bff489..0000000
--- a/languages/csharp/ProductKindg.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/ProductKind.proto</summary>
-public static partial class ProductKindReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/ProductKind.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductKindReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZiYXNlL1Byb2R1Y3RLaW5kLnByb3RvKoABCgtQcm9kdWN0S2luZBILCgdG",
-          "TE9XRVJTEAASCwoHRURJQkxFUxABEgwKCEVYVFJBQ1RTEAISDAoIUFJFUk9M",
-          "TFMQAxIOCgpBUE9USEVDQVJZEAQSDgoKQ0FSVFJJREdFUxAFEgoKBlBMQU5U",
-          "UxAGEg8KC01FUkNIQU5ESVNFEAdCMQoXaW8uYmxvb21ib3guc2NoZW1hLmJh",
-          "c2VCD0Jhc2VQcm9kdWN0S2luZEgBUAH4AQFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProductKind), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum ProductKind {
-  [pbr::OriginalName("FLOWERS")] Flowers = 0,
-  [pbr::OriginalName("EDIBLES")] Edibles = 1,
-  [pbr::OriginalName("EXTRACTS")] Extracts = 2,
-  [pbr::OriginalName("PREROLLS")] Prerolls = 3,
-  [pbr::OriginalName("APOTHECARY")] Apothecary = 4,
-  [pbr::OriginalName("CARTRIDGES")] Cartridges = 5,
-  [pbr::OriginalName("PLANTS")] Plants = 6,
-  [pbr::OriginalName("MERCHANDISE")] Merchandise = 7,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductType.cs b/languages/csharp/ProductType.cs
deleted file mode 100644
index de2d220..0000000
--- a/languages/csharp/ProductType.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/ProductType.proto</summary>
-public static partial class ProductTypeReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/ProductType.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductTypeReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZiYXNlL1Byb2R1Y3RUeXBlLnByb3RvGhZiYXNlL1Byb2R1Y3RLaW5kLnBy",
-          "b3RvIikKC1Byb2R1Y3RUeXBlEhoKBGtpbmQYASABKA4yDC5Qcm9kdWN0S2lu",
-          "ZEIsChdpby5ibG9vbWJveC5zY2hlbWEuYmFzZUIPQmFzZVByb2R1Y3RUeXBl",
-          "UAFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::ProductKindReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductType), global::ProductType.Parser, new[]{ "Kind" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-/// <summary>
-/// -- Product Type: Top-level -- //
-/// </summary>
-public sealed partial class ProductType : pb::IMessage<ProductType> {
-  private static readonly pb::MessageParser<ProductType> _parser = new pb::MessageParser<ProductType>(() => new ProductType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductTypeReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductType(ProductType other) : this() {
-    kind_ = other.kind_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductType Clone() {
-    return new ProductType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::ProductKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::ProductKind) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/ProductTypeg.cs b/languages/csharp/ProductTypeg.cs
deleted file mode 100644
index 524441a..0000000
--- a/languages/csharp/ProductTypeg.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from base/ProductType.proto</summary>
-public static partial class ProductTypeReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for base/ProductType.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductTypeReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChZiYXNlL1Byb2R1Y3RUeXBlLnByb3RvGhZiYXNlL1Byb2R1Y3RLaW5kLnBy",
-          "b3RvIikKC1Byb2R1Y3RUeXBlEhoKBGtpbmQYASABKA4yDC5Qcm9kdWN0S2lu",
-          "ZEIxChdpby5ibG9vbWJveC5zY2hlbWEuYmFzZUIPQmFzZVByb2R1Y3RUeXBl",
-          "SAFQAfgBAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::ProductKindReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::ProductType), global::ProductType.Parser, new[]{ "Kind" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-/// <summary>
-/// -- Product Type: Top-level -- //
-/// </summary>
-public sealed partial class ProductType : pb::IMessage<ProductType> {
-  private static readonly pb::MessageParser<ProductType> _parser = new pb::MessageParser<ProductType>(() => new ProductType());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<ProductType> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductTypeReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductType() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductType(ProductType other) : this() {
-    kind_ = other.kind_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ProductType Clone() {
-    return new ProductType(this);
-  }
-
-  /// <summary>Field number for the "kind" field.</summary>
-  public const int KindFieldNumber = 1;
-  private global::ProductKind kind_ = 0;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductKind Kind {
-    get { return kind_; }
-    set {
-      kind_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as ProductType);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(ProductType other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Kind != other.Kind) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Kind != 0) hash ^= Kind.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Kind != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Kind);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Kind != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(ProductType other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Kind != 0) {
-      Kind = other.Kind;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          kind_ = (global::ProductKind) input.ReadEnum();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Productg.cs b/languages/csharp/Productg.cs
deleted file mode 100644
index adba3dd..0000000
--- a/languages/csharp/Productg.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from Product.proto</summary>
-public static partial class ProductReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for Product.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static ProductReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "Cg1Qcm9kdWN0LnByb3RvGhViYXNlL1Byb2R1Y3RLZXkucHJvdG8aFmJhc2Uv",
-          "UHJvZHVjdFR5cGUucHJvdG8aGWdvb2dsZS9wcm90b2J1Zi9hbnkucHJvdG8i",
-          "YwoHUHJvZHVjdBIYCgNrZXkYASABKAsyCy5Qcm9kdWN0S2V5EhoKBHR5cGUY",
-          "AiABKAsyDC5Qcm9kdWN0VHlwZRIiCgRkYXRhGAMgASgLMhQuZ29vZ2xlLnBy",
-          "b3RvYnVmLkFueUItChdpby5ibG9vbWJveC5zY2hlbWEuYmFzZUILQmFzZVBy",
-          "b2R1Y3RIAVAB+AEBYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { global::ProductKeyReflection.Descriptor, global::ProductTypeReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, },
-        new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::Product), global::Product.Parser, new[]{ "Key", "Type", "Data" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Messages
-/// <summary>
-/// -- Product Type: Top-level -- //
-/// </summary>
-public sealed partial class Product : pb::IMessage<Product> {
-  private static readonly pb::MessageParser<Product> _parser = new pb::MessageParser<Product>(() => new Product());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<Product> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::ProductReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Product() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Product(Product other) : this() {
-    Key = other.key_ != null ? other.Key.Clone() : null;
-    Type = other.type_ != null ? other.Type.Clone() : null;
-    Data = other.data_ != null ? other.Data.Clone() : null;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public Product Clone() {
-    return new Product(this);
-  }
-
-  /// <summary>Field number for the "key" field.</summary>
-  public const int KeyFieldNumber = 1;
-  private global::ProductKey key_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductKey Key {
-    get { return key_; }
-    set {
-      key_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 2;
-  private global::ProductType type_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::ProductType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "data" field.</summary>
-  public const int DataFieldNumber = 3;
-  private global::Google.Protobuf.WellKnownTypes.Any data_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::Google.Protobuf.WellKnownTypes.Any Data {
-    get { return data_; }
-    set {
-      data_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as Product);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(Product other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (!object.Equals(Key, other.Key)) return false;
-    if (!object.Equals(Type, other.Type)) return false;
-    if (!object.Equals(Data, other.Data)) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (key_ != null) hash ^= Key.GetHashCode();
-    if (type_ != null) hash ^= Type.GetHashCode();
-    if (data_ != null) hash ^= Data.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (key_ != null) {
-      output.WriteRawTag(10);
-      output.WriteMessage(Key);
-    }
-    if (type_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Type);
-    }
-    if (data_ != null) {
-      output.WriteRawTag(26);
-      output.WriteMessage(Data);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (key_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Key);
-    }
-    if (type_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Type);
-    }
-    if (data_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Data);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(Product other) {
-    if (other == null) {
-      return;
-    }
-    if (other.key_ != null) {
-      if (key_ == null) {
-        key_ = new global::ProductKey();
-      }
-      Key.MergeFrom(other.Key);
-    }
-    if (other.type_ != null) {
-      if (type_ == null) {
-        type_ = new global::ProductType();
-      }
-      Type.MergeFrom(other.Type);
-    }
-    if (other.data_ != null) {
-      if (data_ == null) {
-        data_ = new global::Google.Protobuf.WellKnownTypes.Any();
-      }
-      Data.MergeFrom(other.Data);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 10: {
-          if (key_ == null) {
-            key_ = new global::ProductKey();
-          }
-          input.ReadMessage(key_);
-          break;
-        }
-        case 18: {
-          if (type_ == null) {
-            type_ = new global::ProductType();
-          }
-          input.ReadMessage(type_);
-          break;
-        }
-        case 26: {
-          if (data_ == null) {
-            data_ = new global::Google.Protobuf.WellKnownTypes.Any();
-          }
-          input.ReadMessage(data_);
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/SaleDescriptor.cs b/languages/csharp/SaleDescriptor.cs
deleted file mode 100644
index ba9e72b..0000000
--- a/languages/csharp/SaleDescriptor.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/pricing/SaleDescriptor.proto</summary>
-public static partial class SaleDescriptorReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/pricing/SaleDescriptor.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static SaleDescriptorReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "CiRzdHJ1Y3RzL3ByaWNpbmcvU2FsZURlc2NyaXB0b3IucHJvdG8ixwEKDlNh",
-          "bGVEZXNjcmlwdG9yEhcKBHR5cGUYASABKA4yCS5TYWxlVHlwZRIRCgllZmZl",
-          "Y3RpdmUYAiABKAQSEgoKZXhwaXJhdGlvbhgDIAEoBBIZChFwZXJjZW50YWdl",
-          "X2Ftb3VudBgUIAEoDRIUCgxib2dvX3RyaWdnZXIYFSABKA0SEwoLYm9nb19y",
-          "ZXdhcmQYFiABKA0SFwoPbG95YWx0eV90cmlnZ2VyGBcgASgNEhYKDmxveWFs",
-          "dHlfcmV3YXJkGBggASgNKjEKCFNhbGVUeXBlEg4KClBFUkNFTlRBR0UQABII",
-          "CgRCT0dPEAESCwoHTE9ZQUxUWRACQjYKIWlvLmJsb29tYm94LnNjaGVtYS5w",
-          "cm9kdWN0LnN0cnVjdEIPUHJvZHVjdERpc2NvdW50UAFiBnByb3RvMw=="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::SaleType), }, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::SaleDescriptor), global::SaleDescriptor.Parser, new[]{ "Type", "Effective", "Expiration", "PercentageAmount", "BogoTrigger", "BogoReward", "LoyaltyTrigger", "LoyaltyReward" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Enums
-public enum SaleType {
-  [pbr::OriginalName("PERCENTAGE")] Percentage = 0,
-  [pbr::OriginalName("BOGO")] Bogo = 1,
-  [pbr::OriginalName("LOYALTY")] Loyalty = 2,
-}
-
-#endregion
-
-#region Messages
-public sealed partial class SaleDescriptor : pb::IMessage<SaleDescriptor> {
-  private static readonly pb::MessageParser<SaleDescriptor> _parser = new pb::MessageParser<SaleDescriptor>(() => new SaleDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<SaleDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::SaleDescriptorReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public SaleDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public SaleDescriptor(SaleDescriptor other) : this() {
-    type_ = other.type_;
-    effective_ = other.effective_;
-    expiration_ = other.expiration_;
-    percentageAmount_ = other.percentageAmount_;
-    bogoTrigger_ = other.bogoTrigger_;
-    bogoReward_ = other.bogoReward_;
-    loyaltyTrigger_ = other.loyaltyTrigger_;
-    loyaltyReward_ = other.loyaltyReward_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public SaleDescriptor Clone() {
-    return new SaleDescriptor(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::SaleType type_ = 0;
-  /// <summary>
-  /// sale metadata
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::SaleType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "effective" field.</summary>
-  public const int EffectiveFieldNumber = 2;
-  private ulong effective_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ulong Effective {
-    get { return effective_; }
-    set {
-      effective_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "expiration" field.</summary>
-  public const int ExpirationFieldNumber = 3;
-  private ulong expiration_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ulong Expiration {
-    get { return expiration_; }
-    set {
-      expiration_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "percentage_amount" field.</summary>
-  public const int PercentageAmountFieldNumber = 20;
-  private uint percentageAmount_;
-  /// <summary>
-  /// sale amount and trigger properties
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint PercentageAmount {
-    get { return percentageAmount_; }
-    set {
-      percentageAmount_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "bogo_trigger" field.</summary>
-  public const int BogoTriggerFieldNumber = 21;
-  private uint bogoTrigger_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint BogoTrigger {
-    get { return bogoTrigger_; }
-    set {
-      bogoTrigger_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "bogo_reward" field.</summary>
-  public const int BogoRewardFieldNumber = 22;
-  private uint bogoReward_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint BogoReward {
-    get { return bogoReward_; }
-    set {
-      bogoReward_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "loyalty_trigger" field.</summary>
-  public const int LoyaltyTriggerFieldNumber = 23;
-  private uint loyaltyTrigger_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint LoyaltyTrigger {
-    get { return loyaltyTrigger_; }
-    set {
-      loyaltyTrigger_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "loyalty_reward" field.</summary>
-  public const int LoyaltyRewardFieldNumber = 24;
-  private uint loyaltyReward_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint LoyaltyReward {
-    get { return loyaltyReward_; }
-    set {
-      loyaltyReward_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as SaleDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(SaleDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (Effective != other.Effective) return false;
-    if (Expiration != other.Expiration) return false;
-    if (PercentageAmount != other.PercentageAmount) return false;
-    if (BogoTrigger != other.BogoTrigger) return false;
-    if (BogoReward != other.BogoReward) return false;
-    if (LoyaltyTrigger != other.LoyaltyTrigger) return false;
-    if (LoyaltyReward != other.LoyaltyReward) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (Effective != 0UL) hash ^= Effective.GetHashCode();
-    if (Expiration != 0UL) hash ^= Expiration.GetHashCode();
-    if (PercentageAmount != 0) hash ^= PercentageAmount.GetHashCode();
-    if (BogoTrigger != 0) hash ^= BogoTrigger.GetHashCode();
-    if (BogoReward != 0) hash ^= BogoReward.GetHashCode();
-    if (LoyaltyTrigger != 0) hash ^= LoyaltyTrigger.GetHashCode();
-    if (LoyaltyReward != 0) hash ^= LoyaltyReward.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (Effective != 0UL) {
-      output.WriteRawTag(16);
-      output.WriteUInt64(Effective);
-    }
-    if (Expiration != 0UL) {
-      output.WriteRawTag(24);
-      output.WriteUInt64(Expiration);
-    }
-    if (PercentageAmount != 0) {
-      output.WriteRawTag(160, 1);
-      output.WriteUInt32(PercentageAmount);
-    }
-    if (BogoTrigger != 0) {
-      output.WriteRawTag(168, 1);
-      output.WriteUInt32(BogoTrigger);
-    }
-    if (BogoReward != 0) {
-      output.WriteRawTag(176, 1);
-      output.WriteUInt32(BogoReward);
-    }
-    if (LoyaltyTrigger != 0) {
-      output.WriteRawTag(184, 1);
-      output.WriteUInt32(LoyaltyTrigger);
-    }
-    if (LoyaltyReward != 0) {
-      output.WriteRawTag(192, 1);
-      output.WriteUInt32(LoyaltyReward);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (Effective != 0UL) {
-      size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Effective);
-    }
-    if (Expiration != 0UL) {
-      size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Expiration);
-    }
-    if (PercentageAmount != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(PercentageAmount);
-    }
-    if (BogoTrigger != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(BogoTrigger);
-    }
-    if (BogoReward != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(BogoReward);
-    }
-    if (LoyaltyTrigger != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(LoyaltyTrigger);
-    }
-    if (LoyaltyReward != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(LoyaltyReward);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(SaleDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.Effective != 0UL) {
-      Effective = other.Effective;
-    }
-    if (other.Expiration != 0UL) {
-      Expiration = other.Expiration;
-    }
-    if (other.PercentageAmount != 0) {
-      PercentageAmount = other.PercentageAmount;
-    }
-    if (other.BogoTrigger != 0) {
-      BogoTrigger = other.BogoTrigger;
-    }
-    if (other.BogoReward != 0) {
-      BogoReward = other.BogoReward;
-    }
-    if (other.LoyaltyTrigger != 0) {
-      LoyaltyTrigger = other.LoyaltyTrigger;
-    }
-    if (other.LoyaltyReward != 0) {
-      LoyaltyReward = other.LoyaltyReward;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::SaleType) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          Effective = input.ReadUInt64();
-          break;
-        }
-        case 24: {
-          Expiration = input.ReadUInt64();
-          break;
-        }
-        case 160: {
-          PercentageAmount = input.ReadUInt32();
-          break;
-        }
-        case 168: {
-          BogoTrigger = input.ReadUInt32();
-          break;
-        }
-        case 176: {
-          BogoReward = input.ReadUInt32();
-          break;
-        }
-        case 184: {
-          LoyaltyTrigger = input.ReadUInt32();
-          break;
-        }
-        case 192: {
-          LoyaltyReward = input.ReadUInt32();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/SaleDescriptorg.cs b/languages/csharp/SaleDescriptorg.cs
deleted file mode 100644
index a9cced9..0000000
--- a/languages/csharp/SaleDescriptorg.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/pricing/SaleDescriptor.proto</summary>
-public static partial class SaleDescriptorReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/pricing/SaleDescriptor.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static SaleDescriptorReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "CiRzdHJ1Y3RzL3ByaWNpbmcvU2FsZURlc2NyaXB0b3IucHJvdG8ixwEKDlNh",
-          "bGVEZXNjcmlwdG9yEhcKBHR5cGUYASABKA4yCS5TYWxlVHlwZRIRCgllZmZl",
-          "Y3RpdmUYAiABKAQSEgoKZXhwaXJhdGlvbhgDIAEoBBIZChFwZXJjZW50YWdl",
-          "X2Ftb3VudBgUIAEoDRIUCgxib2dvX3RyaWdnZXIYFSABKA0SEwoLYm9nb19y",
-          "ZXdhcmQYFiABKA0SFwoPbG95YWx0eV90cmlnZ2VyGBcgASgNEhYKDmxveWFs",
-          "dHlfcmV3YXJkGBggASgNKjEKCFNhbGVUeXBlEg4KClBFUkNFTlRBR0UQABII",
-          "CgRCT0dPEAESCwoHTE9ZQUxUWRACQjsKIWlvLmJsb29tYm94LnNjaGVtYS5w",
-          "cm9kdWN0LnN0cnVjdEIPUHJvZHVjdERpc2NvdW50SAFQAfgBAWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::SaleType), }, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::SaleDescriptor), global::SaleDescriptor.Parser, new[]{ "Type", "Effective", "Expiration", "PercentageAmount", "BogoTrigger", "BogoReward", "LoyaltyTrigger", "LoyaltyReward" }, null, null, null)
-        }));
-  }
-  #endregion
-
-}
-#region Enums
-public enum SaleType {
-  [pbr::OriginalName("PERCENTAGE")] Percentage = 0,
-  [pbr::OriginalName("BOGO")] Bogo = 1,
-  [pbr::OriginalName("LOYALTY")] Loyalty = 2,
-}
-
-#endregion
-
-#region Messages
-public sealed partial class SaleDescriptor : pb::IMessage<SaleDescriptor> {
-  private static readonly pb::MessageParser<SaleDescriptor> _parser = new pb::MessageParser<SaleDescriptor>(() => new SaleDescriptor());
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pb::MessageParser<SaleDescriptor> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::SaleDescriptorReflection.Descriptor.MessageTypes[0]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public SaleDescriptor() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public SaleDescriptor(SaleDescriptor other) : this() {
-    type_ = other.type_;
-    effective_ = other.effective_;
-    expiration_ = other.expiration_;
-    percentageAmount_ = other.percentageAmount_;
-    bogoTrigger_ = other.bogoTrigger_;
-    bogoReward_ = other.bogoReward_;
-    loyaltyTrigger_ = other.loyaltyTrigger_;
-    loyaltyReward_ = other.loyaltyReward_;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public SaleDescriptor Clone() {
-    return new SaleDescriptor(this);
-  }
-
-  /// <summary>Field number for the "type" field.</summary>
-  public const int TypeFieldNumber = 1;
-  private global::SaleType type_ = 0;
-  /// <summary>
-  /// sale metadata
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public global::SaleType Type {
-    get { return type_; }
-    set {
-      type_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "effective" field.</summary>
-  public const int EffectiveFieldNumber = 2;
-  private ulong effective_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ulong Effective {
-    get { return effective_; }
-    set {
-      effective_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "expiration" field.</summary>
-  public const int ExpirationFieldNumber = 3;
-  private ulong expiration_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public ulong Expiration {
-    get { return expiration_; }
-    set {
-      expiration_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "percentage_amount" field.</summary>
-  public const int PercentageAmountFieldNumber = 20;
-  private uint percentageAmount_;
-  /// <summary>
-  /// sale amount and trigger properties
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint PercentageAmount {
-    get { return percentageAmount_; }
-    set {
-      percentageAmount_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "bogo_trigger" field.</summary>
-  public const int BogoTriggerFieldNumber = 21;
-  private uint bogoTrigger_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint BogoTrigger {
-    get { return bogoTrigger_; }
-    set {
-      bogoTrigger_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "bogo_reward" field.</summary>
-  public const int BogoRewardFieldNumber = 22;
-  private uint bogoReward_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint BogoReward {
-    get { return bogoReward_; }
-    set {
-      bogoReward_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "loyalty_trigger" field.</summary>
-  public const int LoyaltyTriggerFieldNumber = 23;
-  private uint loyaltyTrigger_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint LoyaltyTrigger {
-    get { return loyaltyTrigger_; }
-    set {
-      loyaltyTrigger_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "loyalty_reward" field.</summary>
-  public const int LoyaltyRewardFieldNumber = 24;
-  private uint loyaltyReward_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public uint LoyaltyReward {
-    get { return loyaltyReward_; }
-    set {
-      loyaltyReward_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override bool Equals(object other) {
-    return Equals(other as SaleDescriptor);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public bool Equals(SaleDescriptor other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (Type != other.Type) return false;
-    if (Effective != other.Effective) return false;
-    if (Expiration != other.Expiration) return false;
-    if (PercentageAmount != other.PercentageAmount) return false;
-    if (BogoTrigger != other.BogoTrigger) return false;
-    if (BogoReward != other.BogoReward) return false;
-    if (LoyaltyTrigger != other.LoyaltyTrigger) return false;
-    if (LoyaltyReward != other.LoyaltyReward) return false;
-    return true;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (Type != 0) hash ^= Type.GetHashCode();
-    if (Effective != 0UL) hash ^= Effective.GetHashCode();
-    if (Expiration != 0UL) hash ^= Expiration.GetHashCode();
-    if (PercentageAmount != 0) hash ^= PercentageAmount.GetHashCode();
-    if (BogoTrigger != 0) hash ^= BogoTrigger.GetHashCode();
-    if (BogoReward != 0) hash ^= BogoReward.GetHashCode();
-    if (LoyaltyTrigger != 0) hash ^= LoyaltyTrigger.GetHashCode();
-    if (LoyaltyReward != 0) hash ^= LoyaltyReward.GetHashCode();
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void WriteTo(pb::CodedOutputStream output) {
-    if (Type != 0) {
-      output.WriteRawTag(8);
-      output.WriteEnum((int) Type);
-    }
-    if (Effective != 0UL) {
-      output.WriteRawTag(16);
-      output.WriteUInt64(Effective);
-    }
-    if (Expiration != 0UL) {
-      output.WriteRawTag(24);
-      output.WriteUInt64(Expiration);
-    }
-    if (PercentageAmount != 0) {
-      output.WriteRawTag(160, 1);
-      output.WriteUInt32(PercentageAmount);
-    }
-    if (BogoTrigger != 0) {
-      output.WriteRawTag(168, 1);
-      output.WriteUInt32(BogoTrigger);
-    }
-    if (BogoReward != 0) {
-      output.WriteRawTag(176, 1);
-      output.WriteUInt32(BogoReward);
-    }
-    if (LoyaltyTrigger != 0) {
-      output.WriteRawTag(184, 1);
-      output.WriteUInt32(LoyaltyTrigger);
-    }
-    if (LoyaltyReward != 0) {
-      output.WriteRawTag(192, 1);
-      output.WriteUInt32(LoyaltyReward);
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public int CalculateSize() {
-    int size = 0;
-    if (Type != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-    }
-    if (Effective != 0UL) {
-      size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Effective);
-    }
-    if (Expiration != 0UL) {
-      size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Expiration);
-    }
-    if (PercentageAmount != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(PercentageAmount);
-    }
-    if (BogoTrigger != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(BogoTrigger);
-    }
-    if (BogoReward != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(BogoReward);
-    }
-    if (LoyaltyTrigger != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(LoyaltyTrigger);
-    }
-    if (LoyaltyReward != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeUInt32Size(LoyaltyReward);
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(SaleDescriptor other) {
-    if (other == null) {
-      return;
-    }
-    if (other.Type != 0) {
-      Type = other.Type;
-    }
-    if (other.Effective != 0UL) {
-      Effective = other.Effective;
-    }
-    if (other.Expiration != 0UL) {
-      Expiration = other.Expiration;
-    }
-    if (other.PercentageAmount != 0) {
-      PercentageAmount = other.PercentageAmount;
-    }
-    if (other.BogoTrigger != 0) {
-      BogoTrigger = other.BogoTrigger;
-    }
-    if (other.BogoReward != 0) {
-      BogoReward = other.BogoReward;
-    }
-    if (other.LoyaltyTrigger != 0) {
-      LoyaltyTrigger = other.LoyaltyTrigger;
-    }
-    if (other.LoyaltyReward != 0) {
-      LoyaltyReward = other.LoyaltyReward;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  public void MergeFrom(pb::CodedInputStream input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          input.SkipLastField();
-          break;
-        case 8: {
-          type_ = (global::SaleType) input.ReadEnum();
-          break;
-        }
-        case 16: {
-          Effective = input.ReadUInt64();
-          break;
-        }
-        case 24: {
-          Expiration = input.ReadUInt64();
-          break;
-        }
-        case 160: {
-          PercentageAmount = input.ReadUInt32();
-          break;
-        }
-        case 168: {
-          BogoTrigger = input.ReadUInt32();
-          break;
-        }
-        case 176: {
-          BogoReward = input.ReadUInt32();
-          break;
-        }
-        case 184: {
-          LoyaltyTrigger = input.ReadUInt32();
-          break;
-        }
-        case 192: {
-          LoyaltyReward = input.ReadUInt32();
-          break;
-        }
-      }
-    }
-  }
-
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Species.cs b/languages/csharp/Species.cs
deleted file mode 100644
index 2218ecc..0000000
--- a/languages/csharp/Species.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/Species.proto</summary>
-public static partial class SpeciesReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/Species.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static SpeciesReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVzdHJ1Y3RzL1NwZWNpZXMucHJvdG8qZAoHU3BlY2llcxIPCgtVTlNQRUNJ",
-          "RklFRBAAEgoKBlNBVElWQRABEhEKDUhZQlJJRF9TQVRJVkEQAhIKCgZIWUJS",
-          "SUQQAxIRCg1IWUJSSURfSU5ESUNBEAQSCgoGSU5ESUNBEAVCNgohaW8uYmxv",
-          "b21ib3guc2NoZW1hLnByb2R1Y3Quc3RydWN0Qg9NYXRlcmlhbFNwZWNpZXNQ",
-          "AWIGcHJvdG8z"));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Species), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum Species {
-  [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
-  [pbr::OriginalName("SATIVA")] Sativa = 1,
-  [pbr::OriginalName("HYBRID_SATIVA")] HybridSativa = 2,
-  [pbr::OriginalName("HYBRID")] Hybrid = 3,
-  [pbr::OriginalName("HYBRID_INDICA")] HybridIndica = 4,
-  [pbr::OriginalName("INDICA")] Indica = 5,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/csharp/Speciesg.cs b/languages/csharp/Speciesg.cs
deleted file mode 100644
index 7ab23e5..0000000
--- a/languages/csharp/Speciesg.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-/// <summary>Holder for reflection information generated from structs/Species.proto</summary>
-public static partial class SpeciesReflection {
-
-  #region Descriptor
-  /// <summary>File descriptor for structs/Species.proto</summary>
-  public static pbr::FileDescriptor Descriptor {
-    get { return descriptor; }
-  }
-  private static pbr::FileDescriptor descriptor;
-
-  static SpeciesReflection() {
-    byte[] descriptorData = global::System.Convert.FromBase64String(
-        string.Concat(
-          "ChVzdHJ1Y3RzL1NwZWNpZXMucHJvdG8qZAoHU3BlY2llcxIPCgtVTlNQRUNJ",
-          "RklFRBAAEgoKBlNBVElWQRABEhEKDUhZQlJJRF9TQVRJVkEQAhIKCgZIWUJS",
-          "SUQQAxIRCg1IWUJSSURfSU5ESUNBEAQSCgoGSU5ESUNBEAVCOwohaW8uYmxv",
-          "b21ib3guc2NoZW1hLnByb2R1Y3Quc3RydWN0Qg9NYXRlcmlhbFNwZWNpZXNI",
-          "AVAB+AEBYgZwcm90bzM="));
-    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-        new pbr::FileDescriptor[] { },
-        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Species), }, null));
-  }
-  #endregion
-
-}
-#region Enums
-public enum Species {
-  [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
-  [pbr::OriginalName("SATIVA")] Sativa = 1,
-  [pbr::OriginalName("HYBRID_SATIVA")] HybridSativa = 2,
-  [pbr::OriginalName("HYBRID")] Hybrid = 3,
-  [pbr::OriginalName("HYBRID_INDICA")] HybridIndica = 4,
-  [pbr::OriginalName("INDICA")] Indica = 5,
-}
-
-#endregion
-
-
-#endregion Designer generated code
diff --git a/languages/dart/Product.pb.dart b/languages/dart/Product.pb.dart
deleted file mode 100644
index de4174b..0000000
--- a/languages/dart/Product.pb.dart
+++ /dev/null
@@ -1,58 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Product;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'base/ProductKey.pb.dart';
-import 'base/ProductType.pb.dart';
-import 'google/protobuf/any.pb.dart' as google$protobuf;
-
-class Product extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Product')
-    ..a/*<ProductKey>*/(1, 'key', PbFieldType.OM, ProductKey.getDefault, ProductKey.create)
-    ..a/*<ProductType>*/(2, 'type', PbFieldType.OM, ProductType.getDefault, ProductType.create)
-    ..a/*<google$protobuf.Any>*/(3, 'data', PbFieldType.OM, google$protobuf.Any.getDefault, google$protobuf.Any.create)
-    ..hasRequiredFields = false
-  ;
-
-  Product() : super();
-  Product.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Product.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Product clone() => new Product()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Product create() => new Product();
-  static PbList<Product> createRepeated() => new PbList<Product>();
-  static Product getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProduct();
-    return _defaultInstance;
-  }
-  static Product _defaultInstance;
-  static void $checkItem(Product v) {
-    if (v is! Product) checkItemFailed(v, 'Product');
-  }
-
-  ProductKey get key => $_get(0, 1, null);
-  set key(ProductKey v) { setField(1, v); }
-  bool hasKey() => $_has(0, 1);
-  void clearKey() => clearField(1);
-
-  ProductType get type => $_get(1, 2, null);
-  set type(ProductType v) { setField(2, v); }
-  bool hasType() => $_has(1, 2);
-  void clearType() => clearField(2);
-
-  google$protobuf.Any get data => $_get(2, 3, null);
-  set data(google$protobuf.Any v) { setField(3, v); }
-  bool hasData() => $_has(2, 3);
-  void clearData() => clearField(3);
-}
-
-class _ReadonlyProduct extends Product with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/Product.pbenum.dart b/languages/dart/Product.pbenum.dart
deleted file mode 100644
index 248b069..0000000
--- a/languages/dart/Product.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Product_pbenum;
-
diff --git a/languages/dart/Product.pbjson.dart b/languages/dart/Product.pbjson.dart
deleted file mode 100644
index edb743e..0000000
--- a/languages/dart/Product.pbjson.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Product_pbjson;
-
-const Product$json = const {
-  '1': 'Product',
-  '2': const [
-    const {'1': 'key', '3': 1, '4': 1, '5': 11, '6': '.ProductKey', '10': 'key'},
-    const {'1': 'type', '3': 2, '4': 1, '5': 11, '6': '.ProductType', '10': 'type'},
-    const {'1': 'data', '3': 3, '4': 1, '5': 11, '6': '.google.protobuf.Any', '10': 'data'},
-  ],
-};
-
diff --git a/languages/dart/Product.pbserver.dart b/languages/dart/Product.pbserver.dart
deleted file mode 100644
index f0f7371..0000000
--- a/languages/dart/Product.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Product_pbserver;
-
-export 'Product.pb.dart';
-
diff --git a/languages/dart/base/Compression.pb.dart b/languages/dart/base/Compression.pb.dart
deleted file mode 100644
index 1aeb669..0000000
--- a/languages/dart/base/Compression.pb.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Compression;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'Compression.pbenum.dart';
-
-export 'Compression.pbenum.dart';
-
-class Compression extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Compression')
-    ..a/*<bool>*/(1, 'enabled', PbFieldType.OB)
-    ..e/*<Compression_Type>*/(2, 'type', PbFieldType.OE, Compression_Type.GZIP, Compression_Type.valueOf)
-    ..hasRequiredFields = false
-  ;
-
-  Compression() : super();
-  Compression.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Compression.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Compression clone() => new Compression()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Compression create() => new Compression();
-  static PbList<Compression> createRepeated() => new PbList<Compression>();
-  static Compression getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyCompression();
-    return _defaultInstance;
-  }
-  static Compression _defaultInstance;
-  static void $checkItem(Compression v) {
-    if (v is! Compression) checkItemFailed(v, 'Compression');
-  }
-
-  bool get enabled => $_get(0, 1, false);
-  set enabled(bool v) { $_setBool(0, 1, v); }
-  bool hasEnabled() => $_has(0, 1);
-  void clearEnabled() => clearField(1);
-
-  Compression_Type get type => $_get(1, 2, null);
-  set type(Compression_Type v) { setField(2, v); }
-  bool hasType() => $_has(1, 2);
-  void clearType() => clearField(2);
-}
-
-class _ReadonlyCompression extends Compression with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/base/Compression.pbenum.dart b/languages/dart/base/Compression.pbenum.dart
deleted file mode 100644
index b00a6be..0000000
--- a/languages/dart/base/Compression.pbenum.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Compression_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class Compression_Type extends ProtobufEnum {
-  static const Compression_Type GZIP = const Compression_Type._(0, 'GZIP');
-
-  static const List<Compression_Type> values = const <Compression_Type> [
-    GZIP,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static Compression_Type valueOf(int value) => _byValue[value] as Compression_Type;
-  static void $checkItem(Compression_Type v) {
-    if (v is! Compression_Type) checkItemFailed(v, 'Compression_Type');
-  }
-
-  const Compression_Type._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/base/Compression.pbjson.dart b/languages/dart/base/Compression.pbjson.dart
deleted file mode 100644
index 299cd35..0000000
--- a/languages/dart/base/Compression.pbjson.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Compression_pbjson;
-
-const Compression$json = const {
-  '1': 'Compression',
-  '2': const [
-    const {'1': 'enabled', '3': 1, '4': 1, '5': 8, '10': 'enabled'},
-    const {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.Compression.Type', '10': 'type'},
-  ],
-  '4': const [Compression_Type$json],
-};
-
-const Compression_Type$json = const {
-  '1': 'Type',
-  '2': const [
-    const {'1': 'GZIP', '2': 0},
-  ],
-};
-
diff --git a/languages/dart/base/Compression.pbserver.dart b/languages/dart/base/Compression.pbserver.dart
deleted file mode 100644
index 1e3f38d..0000000
--- a/languages/dart/base/Compression.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Compression_pbserver;
-
-export 'Compression.pb.dart';
-
diff --git a/languages/dart/base/Language.pb.dart b/languages/dart/base/Language.pb.dart
deleted file mode 100644
index 9be0efc..0000000
--- a/languages/dart/base/Language.pb.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Language;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-export 'Language.pbenum.dart';
-
diff --git a/languages/dart/base/Language.pbenum.dart b/languages/dart/base/Language.pbenum.dart
deleted file mode 100644
index 64fa789..0000000
--- a/languages/dart/base/Language.pbenum.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Language_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class Language extends ProtobufEnum {
-  static const Language ENGLISH = const Language._(0, 'ENGLISH');
-  static const Language SPANISH = const Language._(1, 'SPANISH');
-  static const Language FRENCH = const Language._(2, 'FRENCH');
-
-  static const List<Language> values = const <Language> [
-    ENGLISH,
-    SPANISH,
-    FRENCH,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static Language valueOf(int value) => _byValue[value] as Language;
-  static void $checkItem(Language v) {
-    if (v is! Language) checkItemFailed(v, 'Language');
-  }
-
-  const Language._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/base/Language.pbjson.dart b/languages/dart/base/Language.pbjson.dart
deleted file mode 100644
index 8870a2e..0000000
--- a/languages/dart/base/Language.pbjson.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Language_pbjson;
-
-const Language$json = const {
-  '1': 'Language',
-  '2': const [
-    const {'1': 'ENGLISH', '2': 0},
-    const {'1': 'SPANISH', '2': 1},
-    const {'1': 'FRENCH', '2': 2},
-  ],
-};
-
diff --git a/languages/dart/base/Language.pbserver.dart b/languages/dart/base/Language.pbserver.dart
deleted file mode 100644
index 459f41a..0000000
--- a/languages/dart/base/Language.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Language_pbserver;
-
-export 'Language.pb.dart';
-
diff --git a/languages/dart/base/ProductKey.pb.dart b/languages/dart/base/ProductKey.pb.dart
deleted file mode 100644
index 8edda6f..0000000
--- a/languages/dart/base/ProductKey.pb.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKey;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-class ProductKey extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ProductKey')
-    ..a/*<String>*/(1, 'id', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
-
-  ProductKey() : super();
-  ProductKey.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ProductKey.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ProductKey clone() => new ProductKey()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ProductKey create() => new ProductKey();
-  static PbList<ProductKey> createRepeated() => new PbList<ProductKey>();
-  static ProductKey getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProductKey();
-    return _defaultInstance;
-  }
-  static ProductKey _defaultInstance;
-  static void $checkItem(ProductKey v) {
-    if (v is! ProductKey) checkItemFailed(v, 'ProductKey');
-  }
-
-  String get id => $_get(0, 1, '');
-  set id(String v) { $_setString(0, 1, v); }
-  bool hasId() => $_has(0, 1);
-  void clearId() => clearField(1);
-}
-
-class _ReadonlyProductKey extends ProductKey with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/base/ProductKey.pbenum.dart b/languages/dart/base/ProductKey.pbenum.dart
deleted file mode 100644
index 800eedf..0000000
--- a/languages/dart/base/ProductKey.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKey_pbenum;
-
diff --git a/languages/dart/base/ProductKey.pbjson.dart b/languages/dart/base/ProductKey.pbjson.dart
deleted file mode 100644
index da1a7b5..0000000
--- a/languages/dart/base/ProductKey.pbjson.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKey_pbjson;
-
-const ProductKey$json = const {
-  '1': 'ProductKey',
-  '2': const [
-    const {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-  ],
-};
-
diff --git a/languages/dart/base/ProductKey.pbserver.dart b/languages/dart/base/ProductKey.pbserver.dart
deleted file mode 100644
index dce1b77..0000000
--- a/languages/dart/base/ProductKey.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKey_pbserver;
-
-export 'ProductKey.pb.dart';
-
diff --git a/languages/dart/base/ProductKind.pb.dart b/languages/dart/base/ProductKind.pb.dart
deleted file mode 100644
index 75a371a..0000000
--- a/languages/dart/base/ProductKind.pb.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKind;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-export 'ProductKind.pbenum.dart';
-
diff --git a/languages/dart/base/ProductKind.pbenum.dart b/languages/dart/base/ProductKind.pbenum.dart
deleted file mode 100644
index a673a91..0000000
--- a/languages/dart/base/ProductKind.pbenum.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKind_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class ProductKind extends ProtobufEnum {
-  static const ProductKind FLOWERS = const ProductKind._(0, 'FLOWERS');
-  static const ProductKind EDIBLES = const ProductKind._(1, 'EDIBLES');
-  static const ProductKind EXTRACTS = const ProductKind._(2, 'EXTRACTS');
-  static const ProductKind PREROLLS = const ProductKind._(3, 'PREROLLS');
-  static const ProductKind APOTHECARY = const ProductKind._(4, 'APOTHECARY');
-  static const ProductKind CARTRIDGES = const ProductKind._(5, 'CARTRIDGES');
-  static const ProductKind PLANTS = const ProductKind._(6, 'PLANTS');
-  static const ProductKind MERCHANDISE = const ProductKind._(7, 'MERCHANDISE');
-
-  static const List<ProductKind> values = const <ProductKind> [
-    FLOWERS,
-    EDIBLES,
-    EXTRACTS,
-    PREROLLS,
-    APOTHECARY,
-    CARTRIDGES,
-    PLANTS,
-    MERCHANDISE,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static ProductKind valueOf(int value) => _byValue[value] as ProductKind;
-  static void $checkItem(ProductKind v) {
-    if (v is! ProductKind) checkItemFailed(v, 'ProductKind');
-  }
-
-  const ProductKind._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/base/ProductKind.pbjson.dart b/languages/dart/base/ProductKind.pbjson.dart
deleted file mode 100644
index 0c2427b..0000000
--- a/languages/dart/base/ProductKind.pbjson.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKind_pbjson;
-
-const ProductKind$json = const {
-  '1': 'ProductKind',
-  '2': const [
-    const {'1': 'FLOWERS', '2': 0},
-    const {'1': 'EDIBLES', '2': 1},
-    const {'1': 'EXTRACTS', '2': 2},
-    const {'1': 'PREROLLS', '2': 3},
-    const {'1': 'APOTHECARY', '2': 4},
-    const {'1': 'CARTRIDGES', '2': 5},
-    const {'1': 'PLANTS', '2': 6},
-    const {'1': 'MERCHANDISE', '2': 7},
-  ],
-};
-
diff --git a/languages/dart/base/ProductKind.pbserver.dart b/languages/dart/base/ProductKind.pbserver.dart
deleted file mode 100644
index ca52354..0000000
--- a/languages/dart/base/ProductKind.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductKind_pbserver;
-
-export 'ProductKind.pb.dart';
-
diff --git a/languages/dart/base/ProductType.pb.dart b/languages/dart/base/ProductType.pb.dart
deleted file mode 100644
index e721dbf..0000000
--- a/languages/dart/base/ProductType.pb.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductType;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'ProductKind.pbenum.dart';
-
-class ProductType extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ProductType')
-    ..e/*<ProductKind>*/(1, 'kind', PbFieldType.OE, ProductKind.FLOWERS, ProductKind.valueOf)
-    ..hasRequiredFields = false
-  ;
-
-  ProductType() : super();
-  ProductType.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ProductType.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ProductType clone() => new ProductType()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ProductType create() => new ProductType();
-  static PbList<ProductType> createRepeated() => new PbList<ProductType>();
-  static ProductType getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProductType();
-    return _defaultInstance;
-  }
-  static ProductType _defaultInstance;
-  static void $checkItem(ProductType v) {
-    if (v is! ProductType) checkItemFailed(v, 'ProductType');
-  }
-
-  ProductKind get kind => $_get(0, 1, null);
-  set kind(ProductKind v) { setField(1, v); }
-  bool hasKind() => $_has(0, 1);
-  void clearKind() => clearField(1);
-}
-
-class _ReadonlyProductType extends ProductType with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/base/ProductType.pbenum.dart b/languages/dart/base/ProductType.pbenum.dart
deleted file mode 100644
index 7758981..0000000
--- a/languages/dart/base/ProductType.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductType_pbenum;
-
diff --git a/languages/dart/base/ProductType.pbjson.dart b/languages/dart/base/ProductType.pbjson.dart
deleted file mode 100644
index 3ebfd54..0000000
--- a/languages/dart/base/ProductType.pbjson.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductType_pbjson;
-
-const ProductType$json = const {
-  '1': 'ProductType',
-  '2': const [
-    const {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.ProductKind', '10': 'kind'},
-  ],
-};
-
diff --git a/languages/dart/base/ProductType.pbserver.dart b/languages/dart/base/ProductType.pbserver.dart
deleted file mode 100644
index d2e0382..0000000
--- a/languages/dart/base/ProductType.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductType_pbserver;
-
-export 'ProductType.pb.dart';
-
diff --git a/languages/dart/content/Brand.pb.dart b/languages/dart/content/Brand.pb.dart
deleted file mode 100644
index f6cdff1..0000000
--- a/languages/dart/content/Brand.pb.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Brand;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'Name.pb.dart';
-import 'Content.pb.dart';
-import '../media/MediaItem.pb.dart';
-
-class Brand extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Brand')
-    ..a/*<Name>*/(1, 'name', PbFieldType.OM, Name.getDefault, Name.create)
-    ..a/*<Brand>*/(2, 'parent', PbFieldType.OM, Brand.getDefault, Brand.create)
-    ..a/*<Content>*/(3, 'summary', PbFieldType.OM, Content.getDefault, Content.create)
-    ..pp/*<MediaItem>*/(20, 'media', PbFieldType.PM, MediaItem.$checkItem, MediaItem.create)
-    ..hasRequiredFields = false
-  ;
-
-  Brand() : super();
-  Brand.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Brand.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Brand clone() => new Brand()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Brand create() => new Brand();
-  static PbList<Brand> createRepeated() => new PbList<Brand>();
-  static Brand getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyBrand();
-    return _defaultInstance;
-  }
-  static Brand _defaultInstance;
-  static void $checkItem(Brand v) {
-    if (v is! Brand) checkItemFailed(v, 'Brand');
-  }
-
-  Name get name => $_get(0, 1, null);
-  set name(Name v) { setField(1, v); }
-  bool hasName() => $_has(0, 1);
-  void clearName() => clearField(1);
-
-  Brand get parent => $_get(1, 2, null);
-  set parent(Brand v) { setField(2, v); }
-  bool hasParent() => $_has(1, 2);
-  void clearParent() => clearField(2);
-
-  Content get summary => $_get(2, 3, null);
-  set summary(Content v) { setField(3, v); }
-  bool hasSummary() => $_has(2, 3);
-  void clearSummary() => clearField(3);
-
-  List<MediaItem> get media => $_get(3, 20, null);
-}
-
-class _ReadonlyBrand extends Brand with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/content/Brand.pbenum.dart b/languages/dart/content/Brand.pbenum.dart
deleted file mode 100644
index db37337..0000000
--- a/languages/dart/content/Brand.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Brand_pbenum;
-
diff --git a/languages/dart/content/Brand.pbjson.dart b/languages/dart/content/Brand.pbjson.dart
deleted file mode 100644
index 4845956..0000000
--- a/languages/dart/content/Brand.pbjson.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Brand_pbjson;
-
-const Brand$json = const {
-  '1': 'Brand',
-  '2': const [
-    const {'1': 'name', '3': 1, '4': 1, '5': 11, '6': '.Name', '10': 'name'},
-    const {'1': 'parent', '3': 2, '4': 1, '5': 11, '6': '.Brand', '10': 'parent'},
-    const {'1': 'summary', '3': 3, '4': 1, '5': 11, '6': '.Content', '10': 'summary'},
-    const {'1': 'media', '3': 20, '4': 3, '5': 11, '6': '.MediaItem', '10': 'media'},
-  ],
-};
-
diff --git a/languages/dart/content/Brand.pbserver.dart b/languages/dart/content/Brand.pbserver.dart
deleted file mode 100644
index 279431e..0000000
--- a/languages/dart/content/Brand.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Brand_pbserver;
-
-export 'Brand.pb.dart';
-
diff --git a/languages/dart/content/Content.pb.dart b/languages/dart/content/Content.pb.dart
deleted file mode 100644
index d322fef..0000000
--- a/languages/dart/content/Content.pb.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Content;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import '../base/Compression.pb.dart';
-
-import 'Content.pbenum.dart';
-import '../base/Language.pbenum.dart';
-
-export 'Content.pbenum.dart';
-
-class Content extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Content')
-    ..e/*<Content_Type>*/(1, 'type', PbFieldType.OE, Content_Type.TEXT, Content_Type.valueOf)
-    ..e/*<Content_Encoding>*/(2, 'encoding', PbFieldType.OE, Content_Encoding.UTF8, Content_Encoding.valueOf)
-    ..a/*<List<int>>*/(3, 'content', PbFieldType.OY)
-    ..e/*<Language>*/(4, 'language', PbFieldType.OE, Language.ENGLISH, Language.valueOf)
-    ..a/*<Compression>*/(5, 'compression', PbFieldType.OM, Compression.getDefault, Compression.create)
-    ..hasRequiredFields = false
-  ;
-
-  Content() : super();
-  Content.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Content.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Content clone() => new Content()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Content create() => new Content();
-  static PbList<Content> createRepeated() => new PbList<Content>();
-  static Content getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyContent();
-    return _defaultInstance;
-  }
-  static Content _defaultInstance;
-  static void $checkItem(Content v) {
-    if (v is! Content) checkItemFailed(v, 'Content');
-  }
-
-  Content_Type get type => $_get(0, 1, null);
-  set type(Content_Type v) { setField(1, v); }
-  bool hasType() => $_has(0, 1);
-  void clearType() => clearField(1);
-
-  Content_Encoding get encoding => $_get(1, 2, null);
-  set encoding(Content_Encoding v) { setField(2, v); }
-  bool hasEncoding() => $_has(1, 2);
-  void clearEncoding() => clearField(2);
-
-  List<int> get content => $_get(2, 3, null);
-  set content(List<int> v) { $_setBytes(2, 3, v); }
-  bool hasContent() => $_has(2, 3);
-  void clearContent() => clearField(3);
-
-  Language get language => $_get(3, 4, null);
-  set language(Language v) { setField(4, v); }
-  bool hasLanguage() => $_has(3, 4);
-  void clearLanguage() => clearField(4);
-
-  Compression get compression => $_get(4, 5, null);
-  set compression(Compression v) { setField(5, v); }
-  bool hasCompression() => $_has(4, 5);
-  void clearCompression() => clearField(5);
-}
-
-class _ReadonlyContent extends Content with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/content/Content.pbenum.dart b/languages/dart/content/Content.pbenum.dart
deleted file mode 100644
index cf4360f..0000000
--- a/languages/dart/content/Content.pbenum.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Content_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class Content_Type extends ProtobufEnum {
-  static const Content_Type TEXT = const Content_Type._(0, 'TEXT');
-  static const Content_Type MARKDOWN = const Content_Type._(1, 'MARKDOWN');
-  static const Content_Type HTML = const Content_Type._(2, 'HTML');
-
-  static const List<Content_Type> values = const <Content_Type> [
-    TEXT,
-    MARKDOWN,
-    HTML,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static Content_Type valueOf(int value) => _byValue[value] as Content_Type;
-  static void $checkItem(Content_Type v) {
-    if (v is! Content_Type) checkItemFailed(v, 'Content_Type');
-  }
-
-  const Content_Type._(int v, String n) : super(v, n);
-}
-
-class Content_Encoding extends ProtobufEnum {
-  static const Content_Encoding UTF8 = const Content_Encoding._(0, 'UTF8');
-
-  static const List<Content_Encoding> values = const <Content_Encoding> [
-    UTF8,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static Content_Encoding valueOf(int value) => _byValue[value] as Content_Encoding;
-  static void $checkItem(Content_Encoding v) {
-    if (v is! Content_Encoding) checkItemFailed(v, 'Content_Encoding');
-  }
-
-  const Content_Encoding._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/content/Content.pbjson.dart b/languages/dart/content/Content.pbjson.dart
deleted file mode 100644
index af8144a..0000000
--- a/languages/dart/content/Content.pbjson.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Content_pbjson;
-
-const Content$json = const {
-  '1': 'Content',
-  '2': const [
-    const {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.Content.Type', '10': 'type'},
-    const {'1': 'encoding', '3': 2, '4': 1, '5': 14, '6': '.Content.Encoding', '10': 'encoding'},
-    const {'1': 'content', '3': 3, '4': 1, '5': 12, '10': 'content'},
-    const {'1': 'language', '3': 4, '4': 1, '5': 14, '6': '.Language', '10': 'language'},
-    const {'1': 'compression', '3': 5, '4': 1, '5': 11, '6': '.Compression', '10': 'compression'},
-  ],
-  '4': const [Content_Type$json, Content_Encoding$json],
-};
-
-const Content_Type$json = const {
-  '1': 'Type',
-  '2': const [
-    const {'1': 'TEXT', '2': 0},
-    const {'1': 'MARKDOWN', '2': 1},
-    const {'1': 'HTML', '2': 2},
-  ],
-};
-
-const Content_Encoding$json = const {
-  '1': 'Encoding',
-  '2': const [
-    const {'1': 'UTF8', '2': 0},
-  ],
-};
-
diff --git a/languages/dart/content/Content.pbserver.dart b/languages/dart/content/Content.pbserver.dart
deleted file mode 100644
index 8985615..0000000
--- a/languages/dart/content/Content.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Content_pbserver;
-
-export 'Content.pb.dart';
-
diff --git a/languages/dart/content/MaterialsData.pb.dart b/languages/dart/content/MaterialsData.pb.dart
deleted file mode 100644
index 4b6ab8e..0000000
--- a/languages/dart/content/MaterialsData.pb.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MaterialsData;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import '../structs/Genetics.pb.dart';
-
-import '../structs/Grow.pbenum.dart';
-import '../structs/Species.pbenum.dart';
-
-class MaterialsData extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('MaterialsData')
-    ..p/*<String>*/(1, 'ingredients', PbFieldType.PS)
-    ..e/*<Grow>*/(2, 'grow', PbFieldType.OE, Grow.GENERIC, Grow.valueOf)
-    ..e/*<Species>*/(3, 'species', PbFieldType.OE, Species.UNSPECIFIED, Species.valueOf)
-    ..a/*<Genetics>*/(4, 'genetics', PbFieldType.OM, Genetics.getDefault, Genetics.create)
-    ..hasRequiredFields = false
-  ;
-
-  MaterialsData() : super();
-  MaterialsData.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MaterialsData.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  MaterialsData clone() => new MaterialsData()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static MaterialsData create() => new MaterialsData();
-  static PbList<MaterialsData> createRepeated() => new PbList<MaterialsData>();
-  static MaterialsData getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMaterialsData();
-    return _defaultInstance;
-  }
-  static MaterialsData _defaultInstance;
-  static void $checkItem(MaterialsData v) {
-    if (v is! MaterialsData) checkItemFailed(v, 'MaterialsData');
-  }
-
-  List<String> get ingredients => $_get(0, 1, null);
-
-  Grow get grow => $_get(1, 2, null);
-  set grow(Grow v) { setField(2, v); }
-  bool hasGrow() => $_has(1, 2);
-  void clearGrow() => clearField(2);
-
-  Species get species => $_get(2, 3, null);
-  set species(Species v) { setField(3, v); }
-  bool hasSpecies() => $_has(2, 3);
-  void clearSpecies() => clearField(3);
-
-  Genetics get genetics => $_get(3, 4, null);
-  set genetics(Genetics v) { setField(4, v); }
-  bool hasGenetics() => $_has(3, 4);
-  void clearGenetics() => clearField(4);
-}
-
-class _ReadonlyMaterialsData extends MaterialsData with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/content/MaterialsData.pbenum.dart b/languages/dart/content/MaterialsData.pbenum.dart
deleted file mode 100644
index 94ee773..0000000
--- a/languages/dart/content/MaterialsData.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MaterialsData_pbenum;
-
diff --git a/languages/dart/content/MaterialsData.pbjson.dart b/languages/dart/content/MaterialsData.pbjson.dart
deleted file mode 100644
index cb32f8a..0000000
--- a/languages/dart/content/MaterialsData.pbjson.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MaterialsData_pbjson;
-
-const MaterialsData$json = const {
-  '1': 'MaterialsData',
-  '2': const [
-    const {'1': 'ingredients', '3': 1, '4': 3, '5': 9, '10': 'ingredients'},
-    const {'1': 'grow', '3': 2, '4': 1, '5': 14, '6': '.Grow', '10': 'grow'},
-    const {'1': 'species', '3': 3, '4': 1, '5': 14, '6': '.Species', '10': 'species'},
-    const {'1': 'genetics', '3': 4, '4': 1, '5': 11, '6': '.Genetics', '10': 'genetics'},
-  ],
-};
-
diff --git a/languages/dart/content/MaterialsData.pbserver.dart b/languages/dart/content/MaterialsData.pbserver.dart
deleted file mode 100644
index eca09d3..0000000
--- a/languages/dart/content/MaterialsData.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MaterialsData_pbserver;
-
-export 'MaterialsData.pb.dart';
-
diff --git a/languages/dart/content/Name.pb.dart b/languages/dart/content/Name.pb.dart
deleted file mode 100644
index 7819a52..0000000
--- a/languages/dart/content/Name.pb.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Name;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-class Name extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Name')
-    ..a/*<String>*/(1, 'primary', PbFieldType.OS)
-    ..a/*<String>*/(2, 'display', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
-
-  Name() : super();
-  Name.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Name.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Name clone() => new Name()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Name create() => new Name();
-  static PbList<Name> createRepeated() => new PbList<Name>();
-  static Name getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyName();
-    return _defaultInstance;
-  }
-  static Name _defaultInstance;
-  static void $checkItem(Name v) {
-    if (v is! Name) checkItemFailed(v, 'Name');
-  }
-
-  String get primary => $_get(0, 1, '');
-  set primary(String v) { $_setString(0, 1, v); }
-  bool hasPrimary() => $_has(0, 1);
-  void clearPrimary() => clearField(1);
-
-  String get display => $_get(1, 2, '');
-  set display(String v) { $_setString(1, 2, v); }
-  bool hasDisplay() => $_has(1, 2);
-  void clearDisplay() => clearField(2);
-}
-
-class _ReadonlyName extends Name with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/content/Name.pbenum.dart b/languages/dart/content/Name.pbenum.dart
deleted file mode 100644
index ab2331d..0000000
--- a/languages/dart/content/Name.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Name_pbenum;
-
diff --git a/languages/dart/content/Name.pbjson.dart b/languages/dart/content/Name.pbjson.dart
deleted file mode 100644
index 28dbb3c..0000000
--- a/languages/dart/content/Name.pbjson.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Name_pbjson;
-
-const Name$json = const {
-  '1': 'Name',
-  '2': const [
-    const {'1': 'primary', '3': 1, '4': 1, '5': 9, '10': 'primary'},
-    const {'1': 'display', '3': 2, '4': 1, '5': 9, '10': 'display'},
-  ],
-};
-
diff --git a/languages/dart/content/Name.pbserver.dart b/languages/dart/content/Name.pbserver.dart
deleted file mode 100644
index 73726d4..0000000
--- a/languages/dart/content/Name.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Name_pbserver;
-
-export 'Name.pb.dart';
-
diff --git a/languages/dart/content/ProductContent.pb.dart b/languages/dart/content/ProductContent.pb.dart
deleted file mode 100644
index 298bb5a..0000000
--- a/languages/dart/content/ProductContent.pb.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductContent;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'Name.pb.dart';
-import 'Content.pb.dart';
-import 'Brand.pb.dart';
-import '../media/MediaItem.pb.dart';
-
-class ProductContent extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ProductContent')
-    ..a/*<Name>*/(1, 'name', PbFieldType.OM, Name.getDefault, Name.create)
-    ..a/*<Content>*/(2, 'summary', PbFieldType.OM, Content.getDefault, Content.create)
-    ..a/*<Brand>*/(3, 'brand', PbFieldType.OM, Brand.getDefault, Brand.create)
-    ..pp/*<MediaItem>*/(20, 'media', PbFieldType.PM, MediaItem.$checkItem, MediaItem.create)
-    ..a/*<Content>*/(30, 'usage', PbFieldType.OM, Content.getDefault, Content.create)
-    ..a/*<Content>*/(31, 'dosage', PbFieldType.OM, Content.getDefault, Content.create)
-    ..a/*<Content>*/(32, 'advice', PbFieldType.OM, Content.getDefault, Content.create)
-    ..hasRequiredFields = false
-  ;
-
-  ProductContent() : super();
-  ProductContent.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ProductContent.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ProductContent clone() => new ProductContent()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ProductContent create() => new ProductContent();
-  static PbList<ProductContent> createRepeated() => new PbList<ProductContent>();
-  static ProductContent getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProductContent();
-    return _defaultInstance;
-  }
-  static ProductContent _defaultInstance;
-  static void $checkItem(ProductContent v) {
-    if (v is! ProductContent) checkItemFailed(v, 'ProductContent');
-  }
-
-  Name get name => $_get(0, 1, null);
-  set name(Name v) { setField(1, v); }
-  bool hasName() => $_has(0, 1);
-  void clearName() => clearField(1);
-
-  Content get summary => $_get(1, 2, null);
-  set summary(Content v) { setField(2, v); }
-  bool hasSummary() => $_has(1, 2);
-  void clearSummary() => clearField(2);
-
-  Brand get brand => $_get(2, 3, null);
-  set brand(Brand v) { setField(3, v); }
-  bool hasBrand() => $_has(2, 3);
-  void clearBrand() => clearField(3);
-
-  List<MediaItem> get media => $_get(3, 20, null);
-
-  Content get usage => $_get(4, 30, null);
-  set usage(Content v) { setField(30, v); }
-  bool hasUsage() => $_has(4, 30);
-  void clearUsage() => clearField(30);
-
-  Content get dosage => $_get(5, 31, null);
-  set dosage(Content v) { setField(31, v); }
-  bool hasDosage() => $_has(5, 31);
-  void clearDosage() => clearField(31);
-
-  Content get advice => $_get(6, 32, null);
-  set advice(Content v) { setField(32, v); }
-  bool hasAdvice() => $_has(6, 32);
-  void clearAdvice() => clearField(32);
-}
-
-class _ReadonlyProductContent extends ProductContent with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/content/ProductContent.pbenum.dart b/languages/dart/content/ProductContent.pbenum.dart
deleted file mode 100644
index 13ac2d0..0000000
--- a/languages/dart/content/ProductContent.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductContent_pbenum;
-
diff --git a/languages/dart/content/ProductContent.pbjson.dart b/languages/dart/content/ProductContent.pbjson.dart
deleted file mode 100644
index 486e19e..0000000
--- a/languages/dart/content/ProductContent.pbjson.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductContent_pbjson;
-
-const ProductContent$json = const {
-  '1': 'ProductContent',
-  '2': const [
-    const {'1': 'name', '3': 1, '4': 1, '5': 11, '6': '.Name', '10': 'name'},
-    const {'1': 'summary', '3': 2, '4': 1, '5': 11, '6': '.Content', '10': 'summary'},
-    const {'1': 'brand', '3': 3, '4': 1, '5': 11, '6': '.Brand', '10': 'brand'},
-    const {'1': 'media', '3': 20, '4': 3, '5': 11, '6': '.MediaItem', '10': 'media'},
-    const {'1': 'usage', '3': 30, '4': 1, '5': 11, '6': '.Content', '10': 'usage'},
-    const {'1': 'dosage', '3': 31, '4': 1, '5': 11, '6': '.Content', '10': 'dosage'},
-    const {'1': 'advice', '3': 32, '4': 1, '5': 11, '6': '.Content', '10': 'advice'},
-  ],
-};
-
diff --git a/languages/dart/content/ProductContent.pbserver.dart b/languages/dart/content/ProductContent.pbserver.dart
deleted file mode 100644
index f75e7d4..0000000
--- a/languages/dart/content/ProductContent.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library ProductContent_pbserver;
-
-export 'ProductContent.pb.dart';
-
diff --git a/languages/dart/geo/Address.pb.dart b/languages/dart/geo/Address.pb.dart
deleted file mode 100644
index 64016b5..0000000
--- a/languages/dart/geo/Address.pb.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Address;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-class Address extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Address')
-    ..a/*<String>*/(1, 'firstLine', PbFieldType.OS)
-    ..a/*<String>*/(2, 'secondLine', PbFieldType.OS)
-    ..a/*<String>*/(3, 'city', PbFieldType.OS)
-    ..a/*<String>*/(4, 'state', PbFieldType.OS)
-    ..a/*<String>*/(5, 'zipcode', PbFieldType.OS)
-    ..a/*<String>*/(6, 'country', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
-
-  Address() : super();
-  Address.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Address.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Address clone() => new Address()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Address create() => new Address();
-  static PbList<Address> createRepeated() => new PbList<Address>();
-  static Address getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyAddress();
-    return _defaultInstance;
-  }
-  static Address _defaultInstance;
-  static void $checkItem(Address v) {
-    if (v is! Address) checkItemFailed(v, 'Address');
-  }
-
-  String get firstLine => $_get(0, 1, '');
-  set firstLine(String v) { $_setString(0, 1, v); }
-  bool hasFirstLine() => $_has(0, 1);
-  void clearFirstLine() => clearField(1);
-
-  String get secondLine => $_get(1, 2, '');
-  set secondLine(String v) { $_setString(1, 2, v); }
-  bool hasSecondLine() => $_has(1, 2);
-  void clearSecondLine() => clearField(2);
-
-  String get city => $_get(2, 3, '');
-  set city(String v) { $_setString(2, 3, v); }
-  bool hasCity() => $_has(2, 3);
-  void clearCity() => clearField(3);
-
-  String get state => $_get(3, 4, '');
-  set state(String v) { $_setString(3, 4, v); }
-  bool hasState() => $_has(3, 4);
-  void clearState() => clearField(4);
-
-  String get zipcode => $_get(4, 5, '');
-  set zipcode(String v) { $_setString(4, 5, v); }
-  bool hasZipcode() => $_has(4, 5);
-  void clearZipcode() => clearField(5);
-
-  String get country => $_get(5, 6, '');
-  set country(String v) { $_setString(5, 6, v); }
-  bool hasCountry() => $_has(5, 6);
-  void clearCountry() => clearField(6);
-}
-
-class _ReadonlyAddress extends Address with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/geo/Address.pbenum.dart b/languages/dart/geo/Address.pbenum.dart
deleted file mode 100644
index ae1ffa7..0000000
--- a/languages/dart/geo/Address.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Address_pbenum;
-
diff --git a/languages/dart/geo/Address.pbjson.dart b/languages/dart/geo/Address.pbjson.dart
deleted file mode 100644
index 77777d3..0000000
--- a/languages/dart/geo/Address.pbjson.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Address_pbjson;
-
-const Address$json = const {
-  '1': 'Address',
-  '2': const [
-    const {'1': 'first_line', '3': 1, '4': 1, '5': 9, '10': 'firstLine'},
-    const {'1': 'second_line', '3': 2, '4': 1, '5': 9, '10': 'secondLine'},
-    const {'1': 'city', '3': 3, '4': 1, '5': 9, '10': 'city'},
-    const {'1': 'state', '3': 4, '4': 1, '5': 9, '10': 'state'},
-    const {'1': 'zipcode', '3': 5, '4': 1, '5': 9, '10': 'zipcode'},
-    const {'1': 'country', '3': 6, '4': 1, '5': 9, '10': 'country'},
-  ],
-};
-
diff --git a/languages/dart/geo/Address.pbserver.dart b/languages/dart/geo/Address.pbserver.dart
deleted file mode 100644
index 9ae3039..0000000
--- a/languages/dart/geo/Address.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Address_pbserver;
-
-export 'Address.pb.dart';
-
diff --git a/languages/dart/media/MediaItem.pb.dart b/languages/dart/media/MediaItem.pb.dart
deleted file mode 100644
index 3de1ab8..0000000
--- a/languages/dart/media/MediaItem.pb.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaItem;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'MediaKey.pb.dart';
-import 'MediaType.pb.dart';
-
-class MediaItem extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('MediaItem')
-    ..a/*<MediaKey>*/(1, 'key', PbFieldType.OM, MediaKey.getDefault, MediaKey.create)
-    ..a/*<MediaType>*/(2, 'type', PbFieldType.OM, MediaType.getDefault, MediaType.create)
-    ..a/*<String>*/(3, 'name', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
-
-  MediaItem() : super();
-  MediaItem.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MediaItem.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  MediaItem clone() => new MediaItem()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static MediaItem create() => new MediaItem();
-  static PbList<MediaItem> createRepeated() => new PbList<MediaItem>();
-  static MediaItem getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMediaItem();
-    return _defaultInstance;
-  }
-  static MediaItem _defaultInstance;
-  static void $checkItem(MediaItem v) {
-    if (v is! MediaItem) checkItemFailed(v, 'MediaItem');
-  }
-
-  MediaKey get key => $_get(0, 1, null);
-  set key(MediaKey v) { setField(1, v); }
-  bool hasKey() => $_has(0, 1);
-  void clearKey() => clearField(1);
-
-  MediaType get type => $_get(1, 2, null);
-  set type(MediaType v) { setField(2, v); }
-  bool hasType() => $_has(1, 2);
-  void clearType() => clearField(2);
-
-  String get name => $_get(2, 3, '');
-  set name(String v) { $_setString(2, 3, v); }
-  bool hasName() => $_has(2, 3);
-  void clearName() => clearField(3);
-}
-
-class _ReadonlyMediaItem extends MediaItem with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/media/MediaItem.pbenum.dart b/languages/dart/media/MediaItem.pbenum.dart
deleted file mode 100644
index 36f3b16..0000000
--- a/languages/dart/media/MediaItem.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaItem_pbenum;
-
diff --git a/languages/dart/media/MediaItem.pbjson.dart b/languages/dart/media/MediaItem.pbjson.dart
deleted file mode 100644
index 87028ca..0000000
--- a/languages/dart/media/MediaItem.pbjson.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaItem_pbjson;
-
-const MediaItem$json = const {
-  '1': 'MediaItem',
-  '2': const [
-    const {'1': 'key', '3': 1, '4': 1, '5': 11, '6': '.MediaKey', '10': 'key'},
-    const {'1': 'type', '3': 2, '4': 1, '5': 11, '6': '.MediaType', '10': 'type'},
-    const {'1': 'name', '3': 3, '4': 1, '5': 9, '10': 'name'},
-  ],
-};
-
diff --git a/languages/dart/media/MediaItem.pbserver.dart b/languages/dart/media/MediaItem.pbserver.dart
deleted file mode 100644
index d35a171..0000000
--- a/languages/dart/media/MediaItem.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaItem_pbserver;
-
-export 'MediaItem.pb.dart';
-
diff --git a/languages/dart/media/MediaKey.pb.dart b/languages/dart/media/MediaKey.pb.dart
deleted file mode 100644
index 7a9594d..0000000
--- a/languages/dart/media/MediaKey.pb.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaKey;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-class MediaKey extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('MediaKey')
-    ..a/*<String>*/(1, 'id', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
-
-  MediaKey() : super();
-  MediaKey.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MediaKey.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  MediaKey clone() => new MediaKey()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static MediaKey create() => new MediaKey();
-  static PbList<MediaKey> createRepeated() => new PbList<MediaKey>();
-  static MediaKey getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMediaKey();
-    return _defaultInstance;
-  }
-  static MediaKey _defaultInstance;
-  static void $checkItem(MediaKey v) {
-    if (v is! MediaKey) checkItemFailed(v, 'MediaKey');
-  }
-
-  String get id => $_get(0, 1, '');
-  set id(String v) { $_setString(0, 1, v); }
-  bool hasId() => $_has(0, 1);
-  void clearId() => clearField(1);
-}
-
-class _ReadonlyMediaKey extends MediaKey with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/media/MediaKey.pbenum.dart b/languages/dart/media/MediaKey.pbenum.dart
deleted file mode 100644
index 64e0c4f..0000000
--- a/languages/dart/media/MediaKey.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaKey_pbenum;
-
diff --git a/languages/dart/media/MediaKey.pbjson.dart b/languages/dart/media/MediaKey.pbjson.dart
deleted file mode 100644
index 674fcb8..0000000
--- a/languages/dart/media/MediaKey.pbjson.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaKey_pbjson;
-
-const MediaKey$json = const {
-  '1': 'MediaKey',
-  '2': const [
-    const {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-  ],
-};
-
diff --git a/languages/dart/media/MediaKey.pbserver.dart b/languages/dart/media/MediaKey.pbserver.dart
deleted file mode 100644
index 7e6264b..0000000
--- a/languages/dart/media/MediaKey.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaKey_pbserver;
-
-export 'MediaKey.pb.dart';
-
diff --git a/languages/dart/media/MediaType.pb.dart b/languages/dart/media/MediaType.pb.dart
deleted file mode 100644
index cba6106..0000000
--- a/languages/dart/media/MediaType.pb.dart
+++ /dev/null
@@ -1,160 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaType;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'MediaType.pbenum.dart';
-
-export 'MediaType.pbenum.dart';
-
-class MediaType extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('MediaType')
-    ..e/*<MediaType_Kind>*/(1, 'kind', PbFieldType.OE, MediaType_Kind.LINK, MediaType_Kind.valueOf)
-    ..a/*<ImageType>*/(101, 'imageType', PbFieldType.OM, ImageType.getDefault, ImageType.create)
-    ..a/*<DocumentType>*/(201, 'documentType', PbFieldType.OM, DocumentType.getDefault, DocumentType.create)
-    ..a/*<VideoType>*/(301, 'videoType', PbFieldType.OM, VideoType.getDefault, VideoType.create)
-    ..hasRequiredFields = false
-  ;
-
-  MediaType() : super();
-  MediaType.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MediaType.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  MediaType clone() => new MediaType()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static MediaType create() => new MediaType();
-  static PbList<MediaType> createRepeated() => new PbList<MediaType>();
-  static MediaType getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMediaType();
-    return _defaultInstance;
-  }
-  static MediaType _defaultInstance;
-  static void $checkItem(MediaType v) {
-    if (v is! MediaType) checkItemFailed(v, 'MediaType');
-  }
-
-  MediaType_Kind get kind => $_get(0, 1, null);
-  set kind(MediaType_Kind v) { setField(1, v); }
-  bool hasKind() => $_has(0, 1);
-  void clearKind() => clearField(1);
-
-  ImageType get imageType => $_get(1, 101, null);
-  set imageType(ImageType v) { setField(101, v); }
-  bool hasImageType() => $_has(1, 101);
-  void clearImageType() => clearField(101);
-
-  DocumentType get documentType => $_get(2, 201, null);
-  set documentType(DocumentType v) { setField(201, v); }
-  bool hasDocumentType() => $_has(2, 201);
-  void clearDocumentType() => clearField(201);
-
-  VideoType get videoType => $_get(3, 301, null);
-  set videoType(VideoType v) { setField(301, v); }
-  bool hasVideoType() => $_has(3, 301);
-  void clearVideoType() => clearField(301);
-}
-
-class _ReadonlyMediaType extends MediaType with ReadonlyMessageMixin {}
-
-class ImageType extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ImageType')
-    ..e/*<ImageType_ImageKind>*/(1, 'kind', PbFieldType.OE, ImageType_ImageKind.PNG, ImageType_ImageKind.valueOf)
-    ..hasRequiredFields = false
-  ;
-
-  ImageType() : super();
-  ImageType.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ImageType.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ImageType clone() => new ImageType()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ImageType create() => new ImageType();
-  static PbList<ImageType> createRepeated() => new PbList<ImageType>();
-  static ImageType getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyImageType();
-    return _defaultInstance;
-  }
-  static ImageType _defaultInstance;
-  static void $checkItem(ImageType v) {
-    if (v is! ImageType) checkItemFailed(v, 'ImageType');
-  }
-
-  ImageType_ImageKind get kind => $_get(0, 1, null);
-  set kind(ImageType_ImageKind v) { setField(1, v); }
-  bool hasKind() => $_has(0, 1);
-  void clearKind() => clearField(1);
-}
-
-class _ReadonlyImageType extends ImageType with ReadonlyMessageMixin {}
-
-class DocumentType extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('DocumentType')
-    ..e/*<DocumentType_DocumentKind>*/(1, 'kind', PbFieldType.OE, DocumentType_DocumentKind.TXT, DocumentType_DocumentKind.valueOf)
-    ..a/*<bool>*/(2, 'compressed', PbFieldType.OB)
-    ..hasRequiredFields = false
-  ;
-
-  DocumentType() : super();
-  DocumentType.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  DocumentType.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  DocumentType clone() => new DocumentType()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static DocumentType create() => new DocumentType();
-  static PbList<DocumentType> createRepeated() => new PbList<DocumentType>();
-  static DocumentType getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyDocumentType();
-    return _defaultInstance;
-  }
-  static DocumentType _defaultInstance;
-  static void $checkItem(DocumentType v) {
-    if (v is! DocumentType) checkItemFailed(v, 'DocumentType');
-  }
-
-  DocumentType_DocumentKind get kind => $_get(0, 1, null);
-  set kind(DocumentType_DocumentKind v) { setField(1, v); }
-  bool hasKind() => $_has(0, 1);
-  void clearKind() => clearField(1);
-
-  bool get compressed => $_get(1, 2, false);
-  set compressed(bool v) { $_setBool(1, 2, v); }
-  bool hasCompressed() => $_has(1, 2);
-  void clearCompressed() => clearField(2);
-}
-
-class _ReadonlyDocumentType extends DocumentType with ReadonlyMessageMixin {}
-
-class VideoType extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('VideoType')
-    ..e/*<VideoType_VideoKind>*/(1, 'kind', PbFieldType.OE, VideoType_VideoKind.MP4, VideoType_VideoKind.valueOf)
-    ..hasRequiredFields = false
-  ;
-
-  VideoType() : super();
-  VideoType.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  VideoType.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  VideoType clone() => new VideoType()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static VideoType create() => new VideoType();
-  static PbList<VideoType> createRepeated() => new PbList<VideoType>();
-  static VideoType getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyVideoType();
-    return _defaultInstance;
-  }
-  static VideoType _defaultInstance;
-  static void $checkItem(VideoType v) {
-    if (v is! VideoType) checkItemFailed(v, 'VideoType');
-  }
-
-  VideoType_VideoKind get kind => $_get(0, 1, null);
-  set kind(VideoType_VideoKind v) { setField(1, v); }
-  bool hasKind() => $_has(0, 1);
-  void clearKind() => clearField(1);
-}
-
-class _ReadonlyVideoType extends VideoType with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/media/MediaType.pbenum.dart b/languages/dart/media/MediaType.pbenum.dart
deleted file mode 100644
index f60af98..0000000
--- a/languages/dart/media/MediaType.pbenum.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaType_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class MediaType_Kind extends ProtobufEnum {
-  static const MediaType_Kind LINK = const MediaType_Kind._(0, 'LINK');
-  static const MediaType_Kind IMAGE = const MediaType_Kind._(1, 'IMAGE');
-  static const MediaType_Kind DOCUMENT = const MediaType_Kind._(2, 'DOCUMENT');
-  static const MediaType_Kind VIDEO = const MediaType_Kind._(3, 'VIDEO');
-
-  static const List<MediaType_Kind> values = const <MediaType_Kind> [
-    LINK,
-    IMAGE,
-    DOCUMENT,
-    VIDEO,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static MediaType_Kind valueOf(int value) => _byValue[value] as MediaType_Kind;
-  static void $checkItem(MediaType_Kind v) {
-    if (v is! MediaType_Kind) checkItemFailed(v, 'MediaType_Kind');
-  }
-
-  const MediaType_Kind._(int v, String n) : super(v, n);
-}
-
-class ImageType_ImageKind extends ProtobufEnum {
-  static const ImageType_ImageKind PNG = const ImageType_ImageKind._(0, 'PNG');
-  static const ImageType_ImageKind JPG = const ImageType_ImageKind._(1, 'JPG');
-  static const ImageType_ImageKind GIF = const ImageType_ImageKind._(2, 'GIF');
-  static const ImageType_ImageKind SVG = const ImageType_ImageKind._(3, 'SVG');
-  static const ImageType_ImageKind WEBP = const ImageType_ImageKind._(4, 'WEBP');
-
-  static const List<ImageType_ImageKind> values = const <ImageType_ImageKind> [
-    PNG,
-    JPG,
-    GIF,
-    SVG,
-    WEBP,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static ImageType_ImageKind valueOf(int value) => _byValue[value] as ImageType_ImageKind;
-  static void $checkItem(ImageType_ImageKind v) {
-    if (v is! ImageType_ImageKind) checkItemFailed(v, 'ImageType_ImageKind');
-  }
-
-  const ImageType_ImageKind._(int v, String n) : super(v, n);
-}
-
-class DocumentType_DocumentKind extends ProtobufEnum {
-  static const DocumentType_DocumentKind TXT = const DocumentType_DocumentKind._(0, 'TXT');
-  static const DocumentType_DocumentKind HTML = const DocumentType_DocumentKind._(1, 'HTML');
-  static const DocumentType_DocumentKind PDF = const DocumentType_DocumentKind._(2, 'PDF');
-  static const DocumentType_DocumentKind MARKDOWN = const DocumentType_DocumentKind._(3, 'MARKDOWN');
-
-  static const List<DocumentType_DocumentKind> values = const <DocumentType_DocumentKind> [
-    TXT,
-    HTML,
-    PDF,
-    MARKDOWN,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static DocumentType_DocumentKind valueOf(int value) => _byValue[value] as DocumentType_DocumentKind;
-  static void $checkItem(DocumentType_DocumentKind v) {
-    if (v is! DocumentType_DocumentKind) checkItemFailed(v, 'DocumentType_DocumentKind');
-  }
-
-  const DocumentType_DocumentKind._(int v, String n) : super(v, n);
-}
-
-class VideoType_VideoKind extends ProtobufEnum {
-  static const VideoType_VideoKind MP4 = const VideoType_VideoKind._(0, 'MP4');
-  static const VideoType_VideoKind FLV = const VideoType_VideoKind._(1, 'FLV');
-  static const VideoType_VideoKind HLS = const VideoType_VideoKind._(2, 'HLS');
-
-  static const List<VideoType_VideoKind> values = const <VideoType_VideoKind> [
-    MP4,
-    FLV,
-    HLS,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static VideoType_VideoKind valueOf(int value) => _byValue[value] as VideoType_VideoKind;
-  static void $checkItem(VideoType_VideoKind v) {
-    if (v is! VideoType_VideoKind) checkItemFailed(v, 'VideoType_VideoKind');
-  }
-
-  const VideoType_VideoKind._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/media/MediaType.pbjson.dart b/languages/dart/media/MediaType.pbjson.dart
deleted file mode 100644
index e594e7a..0000000
--- a/languages/dart/media/MediaType.pbjson.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaType_pbjson;
-
-const MediaType$json = const {
-  '1': 'MediaType',
-  '2': const [
-    const {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.MediaType.Kind', '10': 'kind'},
-    const {'1': 'image_type', '3': 101, '4': 1, '5': 11, '6': '.ImageType', '10': 'imageType'},
-    const {'1': 'document_type', '3': 201, '4': 1, '5': 11, '6': '.DocumentType', '10': 'documentType'},
-    const {'1': 'video_type', '3': 301, '4': 1, '5': 11, '6': '.VideoType', '10': 'videoType'},
-  ],
-  '4': const [MediaType_Kind$json],
-};
-
-const MediaType_Kind$json = const {
-  '1': 'Kind',
-  '2': const [
-    const {'1': 'LINK', '2': 0},
-    const {'1': 'IMAGE', '2': 1},
-    const {'1': 'DOCUMENT', '2': 2},
-    const {'1': 'VIDEO', '2': 3},
-  ],
-};
-
-const ImageType$json = const {
-  '1': 'ImageType',
-  '2': const [
-    const {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.ImageType.ImageKind', '10': 'kind'},
-  ],
-  '4': const [ImageType_ImageKind$json],
-};
-
-const ImageType_ImageKind$json = const {
-  '1': 'ImageKind',
-  '2': const [
-    const {'1': 'PNG', '2': 0},
-    const {'1': 'JPG', '2': 1},
-    const {'1': 'GIF', '2': 2},
-    const {'1': 'SVG', '2': 3},
-    const {'1': 'WEBP', '2': 4},
-  ],
-};
-
-const DocumentType$json = const {
-  '1': 'DocumentType',
-  '2': const [
-    const {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.DocumentType.DocumentKind', '10': 'kind'},
-    const {'1': 'compressed', '3': 2, '4': 1, '5': 8, '10': 'compressed'},
-  ],
-  '4': const [DocumentType_DocumentKind$json],
-};
-
-const DocumentType_DocumentKind$json = const {
-  '1': 'DocumentKind',
-  '2': const [
-    const {'1': 'TXT', '2': 0},
-    const {'1': 'HTML', '2': 1},
-    const {'1': 'PDF', '2': 2},
-    const {'1': 'MARKDOWN', '2': 3},
-  ],
-};
-
-const VideoType$json = const {
-  '1': 'VideoType',
-  '2': const [
-    const {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.VideoType.VideoKind', '10': 'kind'},
-  ],
-  '4': const [VideoType_VideoKind$json],
-};
-
-const VideoType_VideoKind$json = const {
-  '1': 'VideoKind',
-  '2': const [
-    const {'1': 'MP4', '2': 0},
-    const {'1': 'FLV', '2': 1},
-    const {'1': 'HLS', '2': 2},
-  ],
-};
-
diff --git a/languages/dart/media/MediaType.pbserver.dart b/languages/dart/media/MediaType.pbserver.dart
deleted file mode 100644
index fcebea2..0000000
--- a/languages/dart/media/MediaType.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library MediaType_pbserver;
-
-export 'MediaType.pb.dart';
-
diff --git a/languages/dart/products/Flower.pb.dart b/languages/dart/products/Flower.pb.dart
deleted file mode 100644
index 189473a..0000000
--- a/languages/dart/products/Flower.pb.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Flower;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import '../base/ProductKey.pb.dart';
-import '../content/ProductContent.pb.dart';
-import '../content/MaterialsData.pb.dart';
-import '../structs/FlagsDescriptor.pb.dart';
-import '../structs/pricing/PricingDescriptor.pb.dart';
-
-class Flower extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Flower')
-    ..a/*<ProductKey>*/(1, 'key', PbFieldType.OM, ProductKey.getDefault, ProductKey.create)
-    ..a/*<ProductContent>*/(20, 'productData', PbFieldType.OM, ProductContent.getDefault, ProductContent.create)
-    ..a/*<MaterialsData>*/(21, 'materialData', PbFieldType.OM, MaterialsData.getDefault, MaterialsData.create)
-    ..a/*<FlagsDescriptor>*/(22, 'flags', PbFieldType.OM, FlagsDescriptor.getDefault, FlagsDescriptor.create)
-    ..a/*<ProductPricing>*/(23, 'pricing', PbFieldType.OM, ProductPricing.getDefault, ProductPricing.create)
-    ..hasRequiredFields = false
-  ;
-
-  Flower() : super();
-  Flower.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Flower.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Flower clone() => new Flower()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Flower create() => new Flower();
-  static PbList<Flower> createRepeated() => new PbList<Flower>();
-  static Flower getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFlower();
-    return _defaultInstance;
-  }
-  static Flower _defaultInstance;
-  static void $checkItem(Flower v) {
-    if (v is! Flower) checkItemFailed(v, 'Flower');
-  }
-
-  ProductKey get key => $_get(0, 1, null);
-  set key(ProductKey v) { setField(1, v); }
-  bool hasKey() => $_has(0, 1);
-  void clearKey() => clearField(1);
-
-  ProductContent get productData => $_get(1, 20, null);
-  set productData(ProductContent v) { setField(20, v); }
-  bool hasProductData() => $_has(1, 20);
-  void clearProductData() => clearField(20);
-
-  MaterialsData get materialData => $_get(2, 21, null);
-  set materialData(MaterialsData v) { setField(21, v); }
-  bool hasMaterialData() => $_has(2, 21);
-  void clearMaterialData() => clearField(21);
-
-  FlagsDescriptor get flags => $_get(3, 22, null);
-  set flags(FlagsDescriptor v) { setField(22, v); }
-  bool hasFlags() => $_has(3, 22);
-  void clearFlags() => clearField(22);
-
-  ProductPricing get pricing => $_get(4, 23, null);
-  set pricing(ProductPricing v) { setField(23, v); }
-  bool hasPricing() => $_has(4, 23);
-  void clearPricing() => clearField(23);
-}
-
-class _ReadonlyFlower extends Flower with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/products/Flower.pbenum.dart b/languages/dart/products/Flower.pbenum.dart
deleted file mode 100644
index 57cbf6d..0000000
--- a/languages/dart/products/Flower.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Flower_pbenum;
-
diff --git a/languages/dart/products/Flower.pbjson.dart b/languages/dart/products/Flower.pbjson.dart
deleted file mode 100644
index cace0ec..0000000
--- a/languages/dart/products/Flower.pbjson.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Flower_pbjson;
-
-const Flower$json = const {
-  '1': 'Flower',
-  '2': const [
-    const {'1': 'key', '3': 1, '4': 1, '5': 11, '6': '.ProductKey', '10': 'key'},
-    const {'1': 'product_data', '3': 20, '4': 1, '5': 11, '6': '.ProductContent', '10': 'productData'},
-    const {'1': 'material_data', '3': 21, '4': 1, '5': 11, '6': '.MaterialsData', '10': 'materialData'},
-    const {'1': 'flags', '3': 22, '4': 1, '5': 11, '6': '.FlagsDescriptor', '10': 'flags'},
-    const {'1': 'pricing', '3': 23, '4': 1, '5': 11, '6': '.ProductPricing', '10': 'pricing'},
-  ],
-};
-
diff --git a/languages/dart/products/Flower.pbserver.dart b/languages/dart/products/Flower.pbserver.dart
deleted file mode 100644
index 392f79b..0000000
--- a/languages/dart/products/Flower.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Flower_pbserver;
-
-export 'Flower.pb.dart';
-
diff --git a/languages/dart/structs/FlagsDescriptor.pb.dart b/languages/dart/structs/FlagsDescriptor.pb.dart
deleted file mode 100644
index 623b589..0000000
--- a/languages/dart/structs/FlagsDescriptor.pb.dart
+++ /dev/null
@@ -1,133 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library FlagsDescriptor;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'FlagsDescriptor.pbenum.dart';
-
-export 'FlagsDescriptor.pbenum.dart';
-
-class ProductFlagValue extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ProductFlagValue')
-    ..e/*<ProductFlag>*/(1, 'type', PbFieldType.OE, ProductFlag.VISIBLE, ProductFlag.valueOf)
-    ..a/*<bool>*/(2, 'value', PbFieldType.OB)
-    ..hasRequiredFields = false
-  ;
-
-  ProductFlagValue() : super();
-  ProductFlagValue.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ProductFlagValue.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ProductFlagValue clone() => new ProductFlagValue()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ProductFlagValue create() => new ProductFlagValue();
-  static PbList<ProductFlagValue> createRepeated() => new PbList<ProductFlagValue>();
-  static ProductFlagValue getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProductFlagValue();
-    return _defaultInstance;
-  }
-  static ProductFlagValue _defaultInstance;
-  static void $checkItem(ProductFlagValue v) {
-    if (v is! ProductFlagValue) checkItemFailed(v, 'ProductFlagValue');
-  }
-
-  ProductFlag get type => $_get(0, 1, null);
-  set type(ProductFlag v) { setField(1, v); }
-  bool hasType() => $_has(0, 1);
-  void clearType() => clearField(1);
-
-  bool get value => $_get(1, 2, false);
-  set value(bool v) { $_setBool(1, 2, v); }
-  bool hasValue() => $_has(1, 2);
-  void clearValue() => clearField(2);
-}
-
-class _ReadonlyProductFlagValue extends ProductFlagValue with ReadonlyMessageMixin {}
-
-class ProductFlagset extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ProductFlagset')
-    ..pp/*<ProductFlagValue>*/(1, 'flags', PbFieldType.PM, ProductFlagValue.$checkItem, ProductFlagValue.create)
-    ..hasRequiredFields = false
-  ;
-
-  ProductFlagset() : super();
-  ProductFlagset.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ProductFlagset.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ProductFlagset clone() => new ProductFlagset()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ProductFlagset create() => new ProductFlagset();
-  static PbList<ProductFlagset> createRepeated() => new PbList<ProductFlagset>();
-  static ProductFlagset getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProductFlagset();
-    return _defaultInstance;
-  }
-  static ProductFlagset _defaultInstance;
-  static void $checkItem(ProductFlagset v) {
-    if (v is! ProductFlagset) checkItemFailed(v, 'ProductFlagset');
-  }
-
-  List<ProductFlagValue> get flags => $_get(0, 1, null);
-}
-
-class _ReadonlyProductFlagset extends ProductFlagset with ReadonlyMessageMixin {}
-
-class FlagsDescriptor extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('FlagsDescriptor')
-    ..a/*<bool>*/(1, 'visible', PbFieldType.OB)
-    ..a/*<bool>*/(2, 'premium', PbFieldType.OB)
-    ..a/*<bool>*/(3, 'featured', PbFieldType.OB)
-    ..a/*<bool>*/(4, 'lastchance', PbFieldType.OB)
-    ..a/*<bool>*/(5, 'inhouse', PbFieldType.OB)
-    ..hasRequiredFields = false
-  ;
-
-  FlagsDescriptor() : super();
-  FlagsDescriptor.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FlagsDescriptor.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  FlagsDescriptor clone() => new FlagsDescriptor()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static FlagsDescriptor create() => new FlagsDescriptor();
-  static PbList<FlagsDescriptor> createRepeated() => new PbList<FlagsDescriptor>();
-  static FlagsDescriptor getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFlagsDescriptor();
-    return _defaultInstance;
-  }
-  static FlagsDescriptor _defaultInstance;
-  static void $checkItem(FlagsDescriptor v) {
-    if (v is! FlagsDescriptor) checkItemFailed(v, 'FlagsDescriptor');
-  }
-
-  bool get visible => $_get(0, 1, false);
-  set visible(bool v) { $_setBool(0, 1, v); }
-  bool hasVisible() => $_has(0, 1);
-  void clearVisible() => clearField(1);
-
-  bool get premium => $_get(1, 2, false);
-  set premium(bool v) { $_setBool(1, 2, v); }
-  bool hasPremium() => $_has(1, 2);
-  void clearPremium() => clearField(2);
-
-  bool get featured => $_get(2, 3, false);
-  set featured(bool v) { $_setBool(2, 3, v); }
-  bool hasFeatured() => $_has(2, 3);
-  void clearFeatured() => clearField(3);
-
-  bool get lastchance => $_get(3, 4, false);
-  set lastchance(bool v) { $_setBool(3, 4, v); }
-  bool hasLastchance() => $_has(3, 4);
-  void clearLastchance() => clearField(4);
-
-  bool get inhouse => $_get(4, 5, false);
-  set inhouse(bool v) { $_setBool(4, 5, v); }
-  bool hasInhouse() => $_has(4, 5);
-  void clearInhouse() => clearField(5);
-}
-
-class _ReadonlyFlagsDescriptor extends FlagsDescriptor with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/structs/FlagsDescriptor.pbenum.dart b/languages/dart/structs/FlagsDescriptor.pbenum.dart
deleted file mode 100644
index c8a1321..0000000
--- a/languages/dart/structs/FlagsDescriptor.pbenum.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library FlagsDescriptor_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class ProductFlag extends ProtobufEnum {
-  static const ProductFlag VISIBLE = const ProductFlag._(0, 'VISIBLE');
-  static const ProductFlag PREMIUM = const ProductFlag._(1, 'PREMIUM');
-  static const ProductFlag FEATURED = const ProductFlag._(2, 'FEATURED');
-  static const ProductFlag LASTCHANCE = const ProductFlag._(3, 'LASTCHANCE');
-  static const ProductFlag INHOUSE = const ProductFlag._(4, 'INHOUSE');
-
-  static const List<ProductFlag> values = const <ProductFlag> [
-    VISIBLE,
-    PREMIUM,
-    FEATURED,
-    LASTCHANCE,
-    INHOUSE,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static ProductFlag valueOf(int value) => _byValue[value] as ProductFlag;
-  static void $checkItem(ProductFlag v) {
-    if (v is! ProductFlag) checkItemFailed(v, 'ProductFlag');
-  }
-
-  const ProductFlag._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/structs/FlagsDescriptor.pbjson.dart b/languages/dart/structs/FlagsDescriptor.pbjson.dart
deleted file mode 100644
index 976e209..0000000
--- a/languages/dart/structs/FlagsDescriptor.pbjson.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library FlagsDescriptor_pbjson;
-
-const ProductFlag$json = const {
-  '1': 'ProductFlag',
-  '2': const [
-    const {'1': 'VISIBLE', '2': 0},
-    const {'1': 'PREMIUM', '2': 1},
-    const {'1': 'FEATURED', '2': 2},
-    const {'1': 'LASTCHANCE', '2': 3},
-    const {'1': 'INHOUSE', '2': 4},
-  ],
-};
-
-const ProductFlagValue$json = const {
-  '1': 'ProductFlagValue',
-  '2': const [
-    const {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.ProductFlag', '10': 'type'},
-    const {'1': 'value', '3': 2, '4': 1, '5': 8, '10': 'value'},
-  ],
-};
-
-const ProductFlagset$json = const {
-  '1': 'ProductFlagset',
-  '2': const [
-    const {'1': 'flags', '3': 1, '4': 3, '5': 11, '6': '.ProductFlagValue', '10': 'flags'},
-  ],
-};
-
-const FlagsDescriptor$json = const {
-  '1': 'FlagsDescriptor',
-  '2': const [
-    const {'1': 'visible', '3': 1, '4': 1, '5': 8, '10': 'visible'},
-    const {'1': 'premium', '3': 2, '4': 1, '5': 8, '10': 'premium'},
-    const {'1': 'featured', '3': 3, '4': 1, '5': 8, '10': 'featured'},
-    const {'1': 'lastchance', '3': 4, '4': 1, '5': 8, '10': 'lastchance'},
-    const {'1': 'inhouse', '3': 5, '4': 1, '5': 8, '10': 'inhouse'},
-  ],
-};
-
diff --git a/languages/dart/structs/FlagsDescriptor.pbserver.dart b/languages/dart/structs/FlagsDescriptor.pbserver.dart
deleted file mode 100644
index ce0de6a..0000000
--- a/languages/dart/structs/FlagsDescriptor.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library FlagsDescriptor_pbserver;
-
-export 'FlagsDescriptor.pb.dart';
-
diff --git a/languages/dart/structs/Genetics.pb.dart b/languages/dart/structs/Genetics.pb.dart
deleted file mode 100644
index 9a2fe49..0000000
--- a/languages/dart/structs/Genetics.pb.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Genetics;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import '../content/Name.pb.dart';
-
-class Genetics extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('Genetics')
-    ..a/*<Name>*/(1, 'male', PbFieldType.OM, Name.getDefault, Name.create)
-    ..a/*<Name>*/(2, 'female', PbFieldType.OM, Name.getDefault, Name.create)
-    ..hasRequiredFields = false
-  ;
-
-  Genetics() : super();
-  Genetics.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Genetics.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  Genetics clone() => new Genetics()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static Genetics create() => new Genetics();
-  static PbList<Genetics> createRepeated() => new PbList<Genetics>();
-  static Genetics getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyGenetics();
-    return _defaultInstance;
-  }
-  static Genetics _defaultInstance;
-  static void $checkItem(Genetics v) {
-    if (v is! Genetics) checkItemFailed(v, 'Genetics');
-  }
-
-  Name get male => $_get(0, 1, null);
-  set male(Name v) { setField(1, v); }
-  bool hasMale() => $_has(0, 1);
-  void clearMale() => clearField(1);
-
-  Name get female => $_get(1, 2, null);
-  set female(Name v) { setField(2, v); }
-  bool hasFemale() => $_has(1, 2);
-  void clearFemale() => clearField(2);
-}
-
-class _ReadonlyGenetics extends Genetics with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/structs/Genetics.pbenum.dart b/languages/dart/structs/Genetics.pbenum.dart
deleted file mode 100644
index 54161ca..0000000
--- a/languages/dart/structs/Genetics.pbenum.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Genetics_pbenum;
-
diff --git a/languages/dart/structs/Genetics.pbjson.dart b/languages/dart/structs/Genetics.pbjson.dart
deleted file mode 100644
index df65e74..0000000
--- a/languages/dart/structs/Genetics.pbjson.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Genetics_pbjson;
-
-const Genetics$json = const {
-  '1': 'Genetics',
-  '2': const [
-    const {'1': 'male', '3': 1, '4': 1, '5': 11, '6': '.Name', '10': 'male'},
-    const {'1': 'female', '3': 2, '4': 1, '5': 11, '6': '.Name', '10': 'female'},
-  ],
-};
-
diff --git a/languages/dart/structs/Genetics.pbserver.dart b/languages/dart/structs/Genetics.pbserver.dart
deleted file mode 100644
index a2b9d4e..0000000
--- a/languages/dart/structs/Genetics.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Genetics_pbserver;
-
-export 'Genetics.pb.dart';
-
diff --git a/languages/dart/structs/Grow.pb.dart b/languages/dart/structs/Grow.pb.dart
deleted file mode 100644
index 5c31384..0000000
--- a/languages/dart/structs/Grow.pb.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Grow;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-export 'Grow.pbenum.dart';
-
diff --git a/languages/dart/structs/Grow.pbenum.dart b/languages/dart/structs/Grow.pbenum.dart
deleted file mode 100644
index 72f061a..0000000
--- a/languages/dart/structs/Grow.pbenum.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Grow_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class Grow extends ProtobufEnum {
-  static const Grow GENERIC = const Grow._(0, 'GENERIC');
-  static const Grow INDOOR = const Grow._(1, 'INDOOR');
-  static const Grow GREENHOUSE = const Grow._(2, 'GREENHOUSE');
-  static const Grow OUTDOOR = const Grow._(3, 'OUTDOOR');
-
-  static const List<Grow> values = const <Grow> [
-    GENERIC,
-    INDOOR,
-    GREENHOUSE,
-    OUTDOOR,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static Grow valueOf(int value) => _byValue[value] as Grow;
-  static void $checkItem(Grow v) {
-    if (v is! Grow) checkItemFailed(v, 'Grow');
-  }
-
-  const Grow._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/structs/Grow.pbjson.dart b/languages/dart/structs/Grow.pbjson.dart
deleted file mode 100644
index 2123077..0000000
--- a/languages/dart/structs/Grow.pbjson.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Grow_pbjson;
-
-const Grow$json = const {
-  '1': 'Grow',
-  '2': const [
-    const {'1': 'GENERIC', '2': 0},
-    const {'1': 'INDOOR', '2': 1},
-    const {'1': 'GREENHOUSE', '2': 2},
-    const {'1': 'OUTDOOR', '2': 3},
-  ],
-};
-
diff --git a/languages/dart/structs/Grow.pbserver.dart b/languages/dart/structs/Grow.pbserver.dart
deleted file mode 100644
index b7f0714..0000000
--- a/languages/dart/structs/Grow.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Grow_pbserver;
-
-export 'Grow.pb.dart';
-
diff --git a/languages/dart/structs/Species.pb.dart b/languages/dart/structs/Species.pb.dart
deleted file mode 100644
index ea57db7..0000000
--- a/languages/dart/structs/Species.pb.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Species;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-export 'Species.pbenum.dart';
-
diff --git a/languages/dart/structs/Species.pbenum.dart b/languages/dart/structs/Species.pbenum.dart
deleted file mode 100644
index fea942e..0000000
--- a/languages/dart/structs/Species.pbenum.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Species_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class Species extends ProtobufEnum {
-  static const Species UNSPECIFIED = const Species._(0, 'UNSPECIFIED');
-  static const Species SATIVA = const Species._(1, 'SATIVA');
-  static const Species HYBRID_SATIVA = const Species._(2, 'HYBRID_SATIVA');
-  static const Species HYBRID = const Species._(3, 'HYBRID');
-  static const Species HYBRID_INDICA = const Species._(4, 'HYBRID_INDICA');
-  static const Species INDICA = const Species._(5, 'INDICA');
-
-  static const List<Species> values = const <Species> [
-    UNSPECIFIED,
-    SATIVA,
-    HYBRID_SATIVA,
-    HYBRID,
-    HYBRID_INDICA,
-    INDICA,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static Species valueOf(int value) => _byValue[value] as Species;
-  static void $checkItem(Species v) {
-    if (v is! Species) checkItemFailed(v, 'Species');
-  }
-
-  const Species._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/structs/Species.pbjson.dart b/languages/dart/structs/Species.pbjson.dart
deleted file mode 100644
index 6c5bd0d..0000000
--- a/languages/dart/structs/Species.pbjson.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Species_pbjson;
-
-const Species$json = const {
-  '1': 'Species',
-  '2': const [
-    const {'1': 'UNSPECIFIED', '2': 0},
-    const {'1': 'SATIVA', '2': 1},
-    const {'1': 'HYBRID_SATIVA', '2': 2},
-    const {'1': 'HYBRID', '2': 3},
-    const {'1': 'HYBRID_INDICA', '2': 4},
-    const {'1': 'INDICA', '2': 5},
-  ],
-};
-
diff --git a/languages/dart/structs/Species.pbserver.dart b/languages/dart/structs/Species.pbserver.dart
deleted file mode 100644
index 31120fa..0000000
--- a/languages/dart/structs/Species.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library Species_pbserver;
-
-export 'Species.pb.dart';
-
diff --git a/languages/dart/structs/pricing/PricingDescriptor.pb.dart b/languages/dart/structs/pricing/PricingDescriptor.pb.dart
deleted file mode 100644
index d1c7c2a..0000000
--- a/languages/dart/structs/pricing/PricingDescriptor.pb.dart
+++ /dev/null
@@ -1,237 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library PricingDescriptor;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:protobuf/protobuf.dart';
-
-import 'SaleDescriptor.pb.dart';
-
-import 'PricingDescriptor.pbenum.dart';
-
-export 'PricingDescriptor.pbenum.dart';
-
-class PricingTierAvailability extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('PricingTierAvailability')
-    ..a/*<bool>*/(1, 'offered', PbFieldType.OB)
-    ..a/*<bool>*/(2, 'available', PbFieldType.OB)
-    ..hasRequiredFields = false
-  ;
-
-  PricingTierAvailability() : super();
-  PricingTierAvailability.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  PricingTierAvailability.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  PricingTierAvailability clone() => new PricingTierAvailability()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static PricingTierAvailability create() => new PricingTierAvailability();
-  static PbList<PricingTierAvailability> createRepeated() => new PbList<PricingTierAvailability>();
-  static PricingTierAvailability getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyPricingTierAvailability();
-    return _defaultInstance;
-  }
-  static PricingTierAvailability _defaultInstance;
-  static void $checkItem(PricingTierAvailability v) {
-    if (v is! PricingTierAvailability) checkItemFailed(v, 'PricingTierAvailability');
-  }
-
-  bool get offered => $_get(0, 1, false);
-  set offered(bool v) { $_setBool(0, 1, v); }
-  bool hasOffered() => $_has(0, 1);
-  void clearOffered() => clearField(1);
-
-  bool get available => $_get(1, 2, false);
-  set available(bool v) { $_setBool(1, 2, v); }
-  bool hasAvailable() => $_has(1, 2);
-  void clearAvailable() => clearField(2);
-}
-
-class _ReadonlyPricingTierAvailability extends PricingTierAvailability with ReadonlyMessageMixin {}
-
-class UnitPricingDescriptor extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('UnitPricingDescriptor')
-    ..a/*<double>*/(1, 'priceValue', PbFieldType.OF)
-    ..a/*<PricingTierAvailability>*/(2, 'status', PbFieldType.OM, PricingTierAvailability.getDefault, PricingTierAvailability.create)
-    ..pp/*<SaleDescriptor>*/(3, 'discounts', PbFieldType.PM, SaleDescriptor.$checkItem, SaleDescriptor.create)
-    ..hasRequiredFields = false
-  ;
-
-  UnitPricingDescriptor() : super();
-  UnitPricingDescriptor.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  UnitPricingDescriptor.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  UnitPricingDescriptor clone() => new UnitPricingDescriptor()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static UnitPricingDescriptor create() => new UnitPricingDescriptor();
-  static PbList<UnitPricingDescriptor> createRepeated() => new PbList<UnitPricingDescriptor>();
-  static UnitPricingDescriptor getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyUnitPricingDescriptor();
-    return _defaultInstance;
-  }
-  static UnitPricingDescriptor _defaultInstance;
-  static void $checkItem(UnitPricingDescriptor v) {
-    if (v is! UnitPricingDescriptor) checkItemFailed(v, 'UnitPricingDescriptor');
-  }
-
-  double get priceValue => $_get(0, 1, null);
-  set priceValue(double v) { $_setFloat(0, 1, v); }
-  bool hasPriceValue() => $_has(0, 1);
-  void clearPriceValue() => clearField(1);
-
-  PricingTierAvailability get status => $_get(1, 2, null);
-  set status(PricingTierAvailability v) { setField(2, v); }
-  bool hasStatus() => $_has(1, 2);
-  void clearStatus() => clearField(2);
-
-  List<SaleDescriptor> get discounts => $_get(2, 3, null);
-}
-
-class _ReadonlyUnitPricingDescriptor extends UnitPricingDescriptor with ReadonlyMessageMixin {}
-
-class WeightedPricingDescriptor extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('WeightedPricingDescriptor')
-    ..e/*<PricingWeightTier>*/(1, 'weight', PbFieldType.OE, PricingWeightTier.OTHER, PricingWeightTier.valueOf)
-    ..a/*<UnitPricingDescriptor>*/(2, 'tier', PbFieldType.OM, UnitPricingDescriptor.getDefault, UnitPricingDescriptor.create)
-    ..a/*<double>*/(3, 'weightInGrams', PbFieldType.OF)
-    ..hasRequiredFields = false
-  ;
-
-  WeightedPricingDescriptor() : super();
-  WeightedPricingDescriptor.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  WeightedPricingDescriptor.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  WeightedPricingDescriptor clone() => new WeightedPricingDescriptor()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static WeightedPricingDescriptor create() => new WeightedPricingDescriptor();
-  static PbList<WeightedPricingDescriptor> createRepeated() => new PbList<WeightedPricingDescriptor>();
-  static WeightedPricingDescriptor getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyWeightedPricingDescriptor();
-    return _defaultInstance;
-  }
-  static WeightedPricingDescriptor _defaultInstance;
-  static void $checkItem(WeightedPricingDescriptor v) {
-    if (v is! WeightedPricingDescriptor) checkItemFailed(v, 'WeightedPricingDescriptor');
-  }
-
-  PricingWeightTier get weight => $_get(0, 1, null);
-  set weight(PricingWeightTier v) { setField(1, v); }
-  bool hasWeight() => $_has(0, 1);
-  void clearWeight() => clearField(1);
-
-  UnitPricingDescriptor get tier => $_get(1, 2, null);
-  set tier(UnitPricingDescriptor v) { setField(2, v); }
-  bool hasTier() => $_has(1, 2);
-  void clearTier() => clearField(2);
-
-  double get weightInGrams => $_get(2, 3, null);
-  set weightInGrams(double v) { $_setFloat(2, 3, v); }
-  bool hasWeightInGrams() => $_has(2, 3);
-  void clearWeightInGrams() => clearField(3);
-}
-
-class _ReadonlyWeightedPricingDescriptor extends WeightedPricingDescriptor with ReadonlyMessageMixin {}
-
-class FreebiePricingDescriptor extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('FreebiePricingDescriptor')
-    ..hasRequiredFields = false
-  ;
-
-  FreebiePricingDescriptor() : super();
-  FreebiePricingDescriptor.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FreebiePricingDescriptor.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  FreebiePricingDescriptor clone() => new FreebiePricingDescriptor()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static FreebiePricingDescriptor create() => new FreebiePricingDescriptor();
-  static PbList<FreebiePricingDescriptor> createRepeated() => new PbList<FreebiePricingDescriptor>();
-  static FreebiePricingDescriptor getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFreebiePricingDescriptor();
-    return _defaultInstance;
-  }
-  static FreebiePricingDescriptor _defaultInstance;
-  static void $checkItem(FreebiePricingDescriptor v) {
-    if (v is! FreebiePricingDescriptor) checkItemFailed(v, 'FreebiePricingDescriptor');
-  }
-}
-
-class _ReadonlyFreebiePricingDescriptor extends FreebiePricingDescriptor with ReadonlyMessageMixin {}
-
-class PricingDescriptor extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('PricingDescriptor')
-    ..e/*<PricingType>*/(1, 'type', PbFieldType.OE, PricingType.UNIT, PricingType.valueOf)
-    ..a/*<UnitPricingDescriptor>*/(20, 'unit', PbFieldType.OM, UnitPricingDescriptor.getDefault, UnitPricingDescriptor.create)
-    ..a/*<WeightedPricingDescriptor>*/(21, 'weighted', PbFieldType.OM, WeightedPricingDescriptor.getDefault, WeightedPricingDescriptor.create)
-    ..a/*<FreebiePricingDescriptor>*/(22, 'freebie', PbFieldType.OM, FreebiePricingDescriptor.getDefault, FreebiePricingDescriptor.create)
-    ..hasRequiredFields = false
-  ;
-
-  PricingDescriptor() : super();
-  PricingDescriptor.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  PricingDescriptor.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  PricingDescriptor clone() => new PricingDescriptor()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static PricingDescriptor create() => new PricingDescriptor();
-  static PbList<PricingDescriptor> createRepeated() => new PbList<PricingDescriptor>();
-  static PricingDescriptor getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyPricingDescriptor();
-    return _defaultInstance;
-  }
-  static PricingDescriptor _defaultInstance;
-  static void $checkItem(PricingDescriptor v) {
-    if (v is! PricingDescriptor) checkItemFailed(v, 'PricingDescriptor');
-  }
-
-  PricingType get type => $_get(0, 1, null);
-  set type(PricingType v) { setField(1, v); }
-  bool hasType() => $_has(0, 1);
-  void clearType() => clearField(1);
-
-  UnitPricingDescriptor get unit => $_get(1, 20, null);
-  set unit(UnitPricingDescriptor v) { setField(20, v); }
-  bool hasUnit() => $_has(1, 20);
-  void clearUnit() => clearField(20);
-
-  WeightedPricingDescriptor get weighted => $_get(2, 21, null);
-  set weighted(WeightedPricingDescriptor v) { setField(21, v); }
-  bool hasWeighted() => $_has(2, 21);
-  void clearWeighted() => clearField(21);
-
-  FreebiePricingDescriptor get freebie => $_get(3, 22, null);
-  set freebie(FreebiePricingDescriptor v) { setField(22, v); }
-  bool hasFreebie() => $_has(3, 22);
-  void clearFreebie() => clearField(22);
-}
-
-class _ReadonlyPricingDescriptor extends PricingDescriptor with ReadonlyMessageMixin {}
-
-class ProductPricing extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('ProductPricing')
-    ..pp/*<SaleDescriptor>*/(1, 'discounts', PbFieldType.PM, SaleDescriptor.$checkItem, SaleDescriptor.create)
-    ..pp/*<PricingDescriptor>*/(2, 'manifest', PbFieldType.PM, PricingDescriptor.$checkItem, PricingDescriptor.create)
-    ..hasRequiredFields = false
-  ;
-
-  ProductPricing() : super();
-  ProductPricing.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ProductPricing.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ProductPricing clone() => new ProductPricing()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static ProductPricing create() => new ProductPricing();
-  static PbList<ProductPricing> createRepeated() => new PbList<ProductPricing>();
-  static ProductPricing getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyProductPricing();
-    return _defaultInstance;
-  }
-  static ProductPricing _defaultInstance;
-  static void $checkItem(ProductPricing v) {
-    if (v is! ProductPricing) checkItemFailed(v, 'ProductPricing');
-  }
-
-  List<SaleDescriptor> get discounts => $_get(0, 1, null);
-
-  List<PricingDescriptor> get manifest => $_get(1, 2, null);
-}
-
-class _ReadonlyProductPricing extends ProductPricing with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/structs/pricing/PricingDescriptor.pbenum.dart b/languages/dart/structs/pricing/PricingDescriptor.pbenum.dart
deleted file mode 100644
index 04d39a9..0000000
--- a/languages/dart/structs/pricing/PricingDescriptor.pbenum.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library PricingDescriptor_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class PricingType extends ProtobufEnum {
-  static const PricingType UNIT = const PricingType._(0, 'UNIT');
-  static const PricingType WEIGHTED = const PricingType._(1, 'WEIGHTED');
-  static const PricingType FREEBIE = const PricingType._(2, 'FREEBIE');
-
-  static const List<PricingType> values = const <PricingType> [
-    UNIT,
-    WEIGHTED,
-    FREEBIE,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static PricingType valueOf(int value) => _byValue[value] as PricingType;
-  static void $checkItem(PricingType v) {
-    if (v is! PricingType) checkItemFailed(v, 'PricingType');
-  }
-
-  const PricingType._(int v, String n) : super(v, n);
-}
-
-class PricingWeightTier extends ProtobufEnum {
-  static const PricingWeightTier OTHER = const PricingWeightTier._(0, 'OTHER');
-  static const PricingWeightTier GRAM = const PricingWeightTier._(1, 'GRAM');
-  static const PricingWeightTier HALFGRAM = const PricingWeightTier._(2, 'HALFGRAM');
-  static const PricingWeightTier QUARTERGRAM = const PricingWeightTier._(3, 'QUARTERGRAM');
-  static const PricingWeightTier DUB = const PricingWeightTier._(4, 'DUB');
-  static const PricingWeightTier EIGHTH = const PricingWeightTier._(5, 'EIGHTH');
-  static const PricingWeightTier QUARTER = const PricingWeightTier._(6, 'QUARTER');
-  static const PricingWeightTier HALF = const PricingWeightTier._(7, 'HALF');
-  static const PricingWeightTier OUNCE = const PricingWeightTier._(8, 'OUNCE');
-  static const PricingWeightTier POUND = const PricingWeightTier._(9, 'POUND');
-
-  static const List<PricingWeightTier> values = const <PricingWeightTier> [
-    OTHER,
-    GRAM,
-    HALFGRAM,
-    QUARTERGRAM,
-    DUB,
-    EIGHTH,
-    QUARTER,
-    HALF,
-    OUNCE,
-    POUND,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static PricingWeightTier valueOf(int value) => _byValue[value] as PricingWeightTier;
-  static void $checkItem(PricingWeightTier v) {
-    if (v is! PricingWeightTier) checkItemFailed(v, 'PricingWeightTier');
-  }
-
-  const PricingWeightTier._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/structs/pricing/PricingDescriptor.pbjson.dart b/languages/dart/structs/pricing/PricingDescriptor.pbjson.dart
deleted file mode 100644
index 247efc7..0000000
--- a/languages/dart/structs/pricing/PricingDescriptor.pbjson.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library PricingDescriptor_pbjson;
-
-const PricingType$json = const {
-  '1': 'PricingType',
-  '2': const [
-    const {'1': 'UNIT', '2': 0},
-    const {'1': 'WEIGHTED', '2': 1},
-    const {'1': 'FREEBIE', '2': 2},
-  ],
-};
-
-const PricingWeightTier$json = const {
-  '1': 'PricingWeightTier',
-  '2': const [
-    const {'1': 'OTHER', '2': 0},
-    const {'1': 'GRAM', '2': 1},
-    const {'1': 'HALFGRAM', '2': 2},
-    const {'1': 'QUARTERGRAM', '2': 3},
-    const {'1': 'DUB', '2': 4},
-    const {'1': 'EIGHTH', '2': 5},
-    const {'1': 'QUARTER', '2': 6},
-    const {'1': 'HALF', '2': 7},
-    const {'1': 'OUNCE', '2': 8},
-    const {'1': 'POUND', '2': 9},
-  ],
-};
-
-const PricingTierAvailability$json = const {
-  '1': 'PricingTierAvailability',
-  '2': const [
-    const {'1': 'offered', '3': 1, '4': 1, '5': 8, '10': 'offered'},
-    const {'1': 'available', '3': 2, '4': 1, '5': 8, '10': 'available'},
-  ],
-};
-
-const UnitPricingDescriptor$json = const {
-  '1': 'UnitPricingDescriptor',
-  '2': const [
-    const {'1': 'price_value', '3': 1, '4': 1, '5': 2, '10': 'priceValue'},
-    const {'1': 'status', '3': 2, '4': 1, '5': 11, '6': '.PricingTierAvailability', '10': 'status'},
-    const {'1': 'discounts', '3': 3, '4': 3, '5': 11, '6': '.SaleDescriptor', '10': 'discounts'},
-  ],
-};
-
-const WeightedPricingDescriptor$json = const {
-  '1': 'WeightedPricingDescriptor',
-  '2': const [
-    const {'1': 'weight', '3': 1, '4': 1, '5': 14, '6': '.PricingWeightTier', '10': 'weight'},
-    const {'1': 'tier', '3': 2, '4': 1, '5': 11, '6': '.UnitPricingDescriptor', '10': 'tier'},
-    const {'1': 'weightInGrams', '3': 3, '4': 1, '5': 2, '10': 'weightInGrams'},
-  ],
-};
-
-const FreebiePricingDescriptor$json = const {
-  '1': 'FreebiePricingDescriptor',
-};
-
-const PricingDescriptor$json = const {
-  '1': 'PricingDescriptor',
-  '2': const [
-    const {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.PricingType', '10': 'type'},
-    const {'1': 'unit', '3': 20, '4': 1, '5': 11, '6': '.UnitPricingDescriptor', '10': 'unit'},
-    const {'1': 'weighted', '3': 21, '4': 1, '5': 11, '6': '.WeightedPricingDescriptor', '10': 'weighted'},
-    const {'1': 'freebie', '3': 22, '4': 1, '5': 11, '6': '.FreebiePricingDescriptor', '10': 'freebie'},
-  ],
-};
-
-const ProductPricing$json = const {
-  '1': 'ProductPricing',
-  '2': const [
-    const {'1': 'discounts', '3': 1, '4': 3, '5': 11, '6': '.SaleDescriptor', '10': 'discounts'},
-    const {'1': 'manifest', '3': 2, '4': 3, '5': 11, '6': '.PricingDescriptor', '10': 'manifest'},
-  ],
-};
-
diff --git a/languages/dart/structs/pricing/PricingDescriptor.pbserver.dart b/languages/dart/structs/pricing/PricingDescriptor.pbserver.dart
deleted file mode 100644
index a95e001..0000000
--- a/languages/dart/structs/pricing/PricingDescriptor.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library PricingDescriptor_pbserver;
-
-export 'PricingDescriptor.pb.dart';
-
diff --git a/languages/dart/structs/pricing/SaleDescriptor.pb.dart b/languages/dart/structs/pricing/SaleDescriptor.pb.dart
deleted file mode 100644
index b117c11..0000000
--- a/languages/dart/structs/pricing/SaleDescriptor.pb.dart
+++ /dev/null
@@ -1,89 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library SaleDescriptor;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, bool, double, String, List, override;
-
-import 'package:fixnum/fixnum.dart';
-import 'package:protobuf/protobuf.dart';
-
-import 'SaleDescriptor.pbenum.dart';
-
-export 'SaleDescriptor.pbenum.dart';
-
-class SaleDescriptor extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('SaleDescriptor')
-    ..e/*<SaleType>*/(1, 'type', PbFieldType.OE, SaleType.PERCENTAGE, SaleType.valueOf)
-    ..a/*<Int64>*/(2, 'effective', PbFieldType.OU6, Int64.ZERO)
-    ..a/*<Int64>*/(3, 'expiration', PbFieldType.OU6, Int64.ZERO)
-    ..a/*<int>*/(20, 'percentageAmount', PbFieldType.OU3)
-    ..a/*<int>*/(21, 'bogoTrigger', PbFieldType.OU3)
-    ..a/*<int>*/(22, 'bogoReward', PbFieldType.OU3)
-    ..a/*<int>*/(23, 'loyaltyTrigger', PbFieldType.OU3)
-    ..a/*<int>*/(24, 'loyaltyReward', PbFieldType.OU3)
-    ..hasRequiredFields = false
-  ;
-
-  SaleDescriptor() : super();
-  SaleDescriptor.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  SaleDescriptor.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  SaleDescriptor clone() => new SaleDescriptor()..mergeFromMessage(this);
-  BuilderInfo get info_ => _i;
-  static SaleDescriptor create() => new SaleDescriptor();
-  static PbList<SaleDescriptor> createRepeated() => new PbList<SaleDescriptor>();
-  static SaleDescriptor getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlySaleDescriptor();
-    return _defaultInstance;
-  }
-  static SaleDescriptor _defaultInstance;
-  static void $checkItem(SaleDescriptor v) {
-    if (v is! SaleDescriptor) checkItemFailed(v, 'SaleDescriptor');
-  }
-
-  SaleType get type => $_get(0, 1, null);
-  set type(SaleType v) { setField(1, v); }
-  bool hasType() => $_has(0, 1);
-  void clearType() => clearField(1);
-
-  Int64 get effective => $_get(1, 2, null);
-  set effective(Int64 v) { $_setInt64(1, 2, v); }
-  bool hasEffective() => $_has(1, 2);
-  void clearEffective() => clearField(2);
-
-  Int64 get expiration => $_get(2, 3, null);
-  set expiration(Int64 v) { $_setInt64(2, 3, v); }
-  bool hasExpiration() => $_has(2, 3);
-  void clearExpiration() => clearField(3);
-
-  int get percentageAmount => $_get(3, 20, 0);
-  set percentageAmount(int v) { $_setUnsignedInt32(3, 20, v); }
-  bool hasPercentageAmount() => $_has(3, 20);
-  void clearPercentageAmount() => clearField(20);
-
-  int get bogoTrigger => $_get(4, 21, 0);
-  set bogoTrigger(int v) { $_setUnsignedInt32(4, 21, v); }
-  bool hasBogoTrigger() => $_has(4, 21);
-  void clearBogoTrigger() => clearField(21);
-
-  int get bogoReward => $_get(5, 22, 0);
-  set bogoReward(int v) { $_setUnsignedInt32(5, 22, v); }
-  bool hasBogoReward() => $_has(5, 22);
-  void clearBogoReward() => clearField(22);
-
-  int get loyaltyTrigger => $_get(6, 23, 0);
-  set loyaltyTrigger(int v) { $_setUnsignedInt32(6, 23, v); }
-  bool hasLoyaltyTrigger() => $_has(6, 23);
-  void clearLoyaltyTrigger() => clearField(23);
-
-  int get loyaltyReward => $_get(7, 24, 0);
-  set loyaltyReward(int v) { $_setUnsignedInt32(7, 24, v); }
-  bool hasLoyaltyReward() => $_has(7, 24);
-  void clearLoyaltyReward() => clearField(24);
-}
-
-class _ReadonlySaleDescriptor extends SaleDescriptor with ReadonlyMessageMixin {}
-
diff --git a/languages/dart/structs/pricing/SaleDescriptor.pbenum.dart b/languages/dart/structs/pricing/SaleDescriptor.pbenum.dart
deleted file mode 100644
index 1ad141b..0000000
--- a/languages/dart/structs/pricing/SaleDescriptor.pbenum.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library SaleDescriptor_pbenum;
-
-// ignore: UNUSED_SHOWN_NAME
-import 'dart:core' show int, dynamic, String, List, Map;
-import 'package:protobuf/protobuf.dart';
-
-class SaleType extends ProtobufEnum {
-  static const SaleType PERCENTAGE = const SaleType._(0, 'PERCENTAGE');
-  static const SaleType BOGO = const SaleType._(1, 'BOGO');
-  static const SaleType LOYALTY = const SaleType._(2, 'LOYALTY');
-
-  static const List<SaleType> values = const <SaleType> [
-    PERCENTAGE,
-    BOGO,
-    LOYALTY,
-  ];
-
-  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static SaleType valueOf(int value) => _byValue[value] as SaleType;
-  static void $checkItem(SaleType v) {
-    if (v is! SaleType) checkItemFailed(v, 'SaleType');
-  }
-
-  const SaleType._(int v, String n) : super(v, n);
-}
-
diff --git a/languages/dart/structs/pricing/SaleDescriptor.pbjson.dart b/languages/dart/structs/pricing/SaleDescriptor.pbjson.dart
deleted file mode 100644
index 29fd2c9..0000000
--- a/languages/dart/structs/pricing/SaleDescriptor.pbjson.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library SaleDescriptor_pbjson;
-
-const SaleType$json = const {
-  '1': 'SaleType',
-  '2': const [
-    const {'1': 'PERCENTAGE', '2': 0},
-    const {'1': 'BOGO', '2': 1},
-    const {'1': 'LOYALTY', '2': 2},
-  ],
-};
-
-const SaleDescriptor$json = const {
-  '1': 'SaleDescriptor',
-  '2': const [
-    const {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.SaleType', '10': 'type'},
-    const {'1': 'effective', '3': 2, '4': 1, '5': 4, '10': 'effective'},
-    const {'1': 'expiration', '3': 3, '4': 1, '5': 4, '10': 'expiration'},
-    const {'1': 'percentage_amount', '3': 20, '4': 1, '5': 13, '10': 'percentageAmount'},
-    const {'1': 'bogo_trigger', '3': 21, '4': 1, '5': 13, '10': 'bogoTrigger'},
-    const {'1': 'bogo_reward', '3': 22, '4': 1, '5': 13, '10': 'bogoReward'},
-    const {'1': 'loyalty_trigger', '3': 23, '4': 1, '5': 13, '10': 'loyaltyTrigger'},
-    const {'1': 'loyalty_reward', '3': 24, '4': 1, '5': 13, '10': 'loyaltyReward'},
-  ],
-};
-
diff --git a/languages/dart/structs/pricing/SaleDescriptor.pbserver.dart b/languages/dart/structs/pricing/SaleDescriptor.pbserver.dart
deleted file mode 100644
index 9129908..0000000
--- a/languages/dart/structs/pricing/SaleDescriptor.pbserver.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-///
-//  Generated code. Do not modify.
-///
-// ignore_for_file: non_constant_identifier_names
-// ignore_for_file: library_prefixes
-library SaleDescriptor_pbserver;
-
-export 'SaleDescriptor.pb.dart';
-
diff --git a/languages/go/Product.pb.go b/languages/go/Product.pb.go
deleted file mode 100644
index 2ff61b1..0000000
--- a/languages/go/Product.pb.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: Product.proto
-
-/*
-Package schema is a generated protocol buffer package.
-
-It is generated from these files:
-	Product.proto
-	base/Compression.proto
-	base/Language.proto
-	base/ProductKey.proto
-	base/ProductKind.proto
-	base/ProductType.proto
-	content/Brand.proto
-	content/Content.proto
-	content/MaterialsData.proto
-	content/Name.proto
-	content/ProductContent.proto
-	geo/Address.proto
-	media/MediaItem.proto
-	media/MediaKey.proto
-	media/MediaType.proto
-	products/Flower.proto
-	structs/FlagsDescriptor.proto
-	structs/Genetics.proto
-	structs/Grow.proto
-	structs/Species.proto
-	structs/pricing/PricingDescriptor.proto
-	structs/pricing/SaleDescriptor.proto
-
-It has these top-level messages:
-	Product
-	Compression
-	ProductKey
-	ProductType
-	Brand
-	Content
-	MaterialsData
-	Name
-	ProductContent
-	Address
-	MediaItem
-	MediaKey
-	MediaType
-	ImageType
-	DocumentType
-	VideoType
-	Flower
-	ProductFlagValue
-	ProductFlagset
-	FlagsDescriptor
-	Genetics
-	PricingTierAvailability
-	UnitPricingDescriptor
-	WeightedPricingDescriptor
-	FreebiePricingDescriptor
-	PricingDescriptor
-	ProductPricing
-	SaleDescriptor
-*/
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// -- Product Type: Top-level -- //
-type Product struct {
-	Key  *ProductKey          `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Type *ProductType         `protobuf:"bytes,2,opt,name=type" json:"type,omitempty"`
-	Data *google_protobuf.Any `protobuf:"bytes,3,opt,name=data" json:"data,omitempty"`
-}
-
-func (m *Product) Reset()                    { *m = Product{} }
-func (m *Product) String() string            { return proto.CompactTextString(m) }
-func (*Product) ProtoMessage()               {}
-func (*Product) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Product) GetKey() *ProductKey {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *Product) GetType() *ProductType {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *Product) GetData() *google_protobuf.Any {
-	if m != nil {
-		return m.Data
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Product)(nil), "Product")
-}
-
-func init() { proto.RegisterFile("Product.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 197 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x0d, 0x28, 0xca, 0x4f,
-	0x29, 0x4d, 0x2e, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x97, 0x12, 0x4d, 0x4a, 0x2c, 0x4e, 0xd5,
-	0x87, 0x8a, 0x79, 0xa7, 0x56, 0x42, 0x85, 0xc5, 0x90, 0x85, 0x43, 0x2a, 0x0b, 0x52, 0xa1, 0xe2,
-	0x92, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0xfa, 0x60, 0x5e, 0x52, 0x69, 0x9a, 0x7e, 0x62, 0x1e,
-	0x54, 0x8b, 0x52, 0x09, 0x17, 0x3b, 0x54, 0xbd, 0x90, 0x2c, 0x17, 0x73, 0x76, 0x6a, 0xa5, 0x04,
-	0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x11, 0xb7, 0x1e, 0xc2, 0xf4, 0x20, 0x90, 0xb8, 0x90, 0x02, 0x17,
-	0x4b, 0x49, 0x65, 0x41, 0xaa, 0x04, 0x13, 0x58, 0x9e, 0x47, 0x0f, 0xc9, 0x9a, 0x20, 0xb0, 0x8c,
-	0x90, 0x06, 0x17, 0x4b, 0x4a, 0x62, 0x49, 0xa2, 0x04, 0x33, 0x58, 0x85, 0x88, 0x1e, 0xc4, 0x56,
-	0x3d, 0x98, 0xad, 0x7a, 0x8e, 0x79, 0x95, 0x41, 0x60, 0x15, 0x4e, 0xba, 0x5c, 0xe2, 0x99, 0xf9,
-	0x7a, 0x49, 0x39, 0xf9, 0xf9, 0xb9, 0x49, 0xf9, 0x15, 0x7a, 0xc5, 0xc9, 0x19, 0xa9, 0xb9, 0x89,
-	0x7a, 0x20, 0xd7, 0x3b, 0x71, 0x3b, 0x25, 0x16, 0xa7, 0x42, 0xcd, 0xf6, 0x60, 0x0c, 0x60, 0xfc,
-	0xc1, 0xc8, 0x98, 0xc4, 0x06, 0x36, 0xc2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x07, 0x9e,
-	0xcf, 0x06, 0x01, 0x00, 0x00,
-}
diff --git a/languages/go/base/Compression.pb.go b/languages/go/base/Compression.pb.go
deleted file mode 100644
index b92dda1..0000000
--- a/languages/go/base/Compression.pb.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: base/Compression.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Compression_Type int32
-
-const (
-	Compression_GZIP Compression_Type = 0
-)
-
-var Compression_Type_name = map[int32]string{
-	0: "GZIP",
-}
-var Compression_Type_value = map[string]int32{
-	"GZIP": 0,
-}
-
-func (x Compression_Type) String() string {
-	return proto.EnumName(Compression_Type_name, int32(x))
-}
-func (Compression_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
-
-type Compression struct {
-	Enabled bool             `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
-	Type    Compression_Type `protobuf:"varint,2,opt,name=type,enum=Compression_Type" json:"type,omitempty"`
-}
-
-func (m *Compression) Reset()                    { *m = Compression{} }
-func (m *Compression) String() string            { return proto.CompactTextString(m) }
-func (*Compression) ProtoMessage()               {}
-func (*Compression) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *Compression) GetEnabled() bool {
-	if m != nil {
-		return m.Enabled
-	}
-	return false
-}
-
-func (m *Compression) GetType() Compression_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Compression_GZIP
-}
-
-func init() {
-	proto.RegisterType((*Compression)(nil), "Compression")
-	proto.RegisterEnum("Compression_Type", Compression_Type_name, Compression_Type_value)
-}
-
-func init() { proto.RegisterFile("base/Compression.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 162 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0x4a, 0x2c, 0x4e,
-	0xd5, 0x77, 0xce, 0xcf, 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0xce, 0xcc, 0xcf, 0xd3, 0x2b, 0x28, 0xca,
-	0x2f, 0xc9, 0x57, 0x4a, 0xe0, 0xe2, 0x46, 0x12, 0x14, 0x92, 0xe0, 0x62, 0x4f, 0xcd, 0x4b, 0x4c,
-	0xca, 0x49, 0x4d, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x08, 0x82, 0x71, 0x85, 0x54, 0xb9, 0x58,
-	0x4a, 0x2a, 0x0b, 0x52, 0x25, 0x98, 0x14, 0x18, 0x35, 0xf8, 0x8c, 0x04, 0xf5, 0x90, 0x8d, 0x0a,
-	0xa9, 0x2c, 0x48, 0x0d, 0x02, 0x4b, 0x2b, 0x09, 0x70, 0xb1, 0x80, 0x78, 0x42, 0x1c, 0x5c, 0x2c,
-	0xee, 0x51, 0x9e, 0x01, 0x02, 0x0c, 0x4e, 0x86, 0x5c, 0xe2, 0x99, 0xf9, 0x7a, 0x49, 0x39, 0xf9,
-	0xf9, 0xb9, 0x49, 0xf9, 0x15, 0x7a, 0xc5, 0xc9, 0x19, 0xa9, 0xb9, 0x89, 0x7a, 0x20, 0xe7, 0x38,
-	0xf1, 0x3b, 0x25, 0x16, 0xa7, 0x22, 0x19, 0xe4, 0xc1, 0x18, 0xc0, 0xf8, 0x83, 0x91, 0x31, 0x89,
-	0x0d, 0xec, 0x36, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0x4a, 0x09, 0x25, 0xb5, 0x00,
-	0x00, 0x00,
-}
diff --git a/languages/go/base/Language.pb.go b/languages/go/base/Language.pb.go
deleted file mode 100644
index 4a6b0d8..0000000
--- a/languages/go/base/Language.pb.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: base/Language.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Language int32
-
-const (
-	Language_ENGLISH Language = 0
-	Language_SPANISH Language = 1
-	Language_FRENCH  Language = 2
-)
-
-var Language_name = map[int32]string{
-	0: "ENGLISH",
-	1: "SPANISH",
-	2: "FRENCH",
-}
-var Language_value = map[string]int32{
-	"ENGLISH": 0,
-	"SPANISH": 1,
-	"FRENCH":  2,
-}
-
-func (x Language) String() string {
-	return proto.EnumName(Language_name, int32(x))
-}
-func (Language) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
-
-func init() {
-	proto.RegisterEnum("Language", Language_name, Language_value)
-}
-
-func init() { proto.RegisterFile("base/Language.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 130 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0x4a, 0x2c, 0x4e,
-	0xd5, 0xf7, 0x49, 0xcc, 0x4b, 0x2f, 0x4d, 0x4c, 0x4f, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0xd7,
-	0x32, 0xe0, 0xe2, 0x80, 0x89, 0x08, 0x71, 0x73, 0xb1, 0xbb, 0xfa, 0xb9, 0xfb, 0x78, 0x06, 0x7b,
-	0x08, 0x30, 0x80, 0x38, 0xc1, 0x01, 0x8e, 0x7e, 0x20, 0x0e, 0xa3, 0x10, 0x17, 0x17, 0x9b, 0x5b,
-	0x90, 0xab, 0x9f, 0xb3, 0x87, 0x00, 0x93, 0x93, 0x1e, 0x97, 0x78, 0x66, 0xbe, 0x5e, 0x52, 0x4e,
-	0x7e, 0x7e, 0x6e, 0x52, 0x7e, 0x85, 0x5e, 0x71, 0x72, 0x46, 0x6a, 0x6e, 0xa2, 0x1e, 0xc8, 0x6c,
-	0x27, 0x1e, 0xa7, 0xc4, 0xe2, 0x54, 0x98, 0x71, 0x1e, 0x8c, 0x01, 0x8c, 0x3f, 0x18, 0x19, 0x93,
-	0xd8, 0xc0, 0x16, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xb9, 0xdf, 0x99, 0x7f, 0x00,
-	0x00, 0x00,
-}
diff --git a/languages/go/base/ProductKey.pb.go b/languages/go/base/ProductKey.pb.go
deleted file mode 100644
index aec584b..0000000
--- a/languages/go/base/ProductKey.pb.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: base/ProductKey.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type ProductKey struct {
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
-}
-
-func (m *ProductKey) Reset()                    { *m = ProductKey{} }
-func (m *ProductKey) String() string            { return proto.CompactTextString(m) }
-func (*ProductKey) ProtoMessage()               {}
-func (*ProductKey) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
-
-func (m *ProductKey) GetId() string {
-	if m != nil {
-		return m.Id
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*ProductKey)(nil), "ProductKey")
-}
-
-func init() { proto.RegisterFile("base/ProductKey.proto", fileDescriptor3) }
-
-var fileDescriptor3 = []byte{
-	// 114 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4d, 0x4a, 0x2c, 0x4e,
-	0xd5, 0x0f, 0x28, 0xca, 0x4f, 0x29, 0x4d, 0x2e, 0xf1, 0x4e, 0xad, 0xd4, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0x57, 0x92, 0xe1, 0xe2, 0x42, 0x88, 0x09, 0xf1, 0x71, 0x31, 0x65, 0xa6, 0x48, 0x30, 0x2a,
-	0x30, 0x6a, 0x70, 0x06, 0x31, 0x65, 0xa6, 0x38, 0x19, 0x70, 0x89, 0x67, 0xe6, 0xeb, 0x25, 0xe5,
-	0xe4, 0xe7, 0xe7, 0x26, 0xe5, 0x57, 0xe8, 0x15, 0x27, 0x67, 0xa4, 0xe6, 0x26, 0xea, 0x81, 0x4c,
-	0x72, 0xe2, 0x73, 0x4a, 0x2c, 0x4e, 0x45, 0x68, 0xf5, 0x60, 0x0c, 0x60, 0xfc, 0xc1, 0xc8, 0x98,
-	0xc4, 0x06, 0x36, 0xd6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x80, 0xdd, 0x1a, 0x7d, 0x6f, 0x00,
-	0x00, 0x00,
-}
diff --git a/languages/go/base/ProductKind.pb.go b/languages/go/base/ProductKind.pb.go
deleted file mode 100644
index 6061fc8..0000000
--- a/languages/go/base/ProductKind.pb.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: base/ProductKind.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type ProductKind int32
-
-const (
-	ProductKind_FLOWERS     ProductKind = 0
-	ProductKind_EDIBLES     ProductKind = 1
-	ProductKind_EXTRACTS    ProductKind = 2
-	ProductKind_PREROLLS    ProductKind = 3
-	ProductKind_APOTHECARY  ProductKind = 4
-	ProductKind_CARTRIDGES  ProductKind = 5
-	ProductKind_PLANTS      ProductKind = 6
-	ProductKind_MERCHANDISE ProductKind = 7
-)
-
-var ProductKind_name = map[int32]string{
-	0: "FLOWERS",
-	1: "EDIBLES",
-	2: "EXTRACTS",
-	3: "PREROLLS",
-	4: "APOTHECARY",
-	5: "CARTRIDGES",
-	6: "PLANTS",
-	7: "MERCHANDISE",
-}
-var ProductKind_value = map[string]int32{
-	"FLOWERS":     0,
-	"EDIBLES":     1,
-	"EXTRACTS":    2,
-	"PREROLLS":    3,
-	"APOTHECARY":  4,
-	"CARTRIDGES":  5,
-	"PLANTS":      6,
-	"MERCHANDISE": 7,
-}
-
-func (x ProductKind) String() string {
-	return proto.EnumName(ProductKind_name, int32(x))
-}
-func (ProductKind) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
-
-func init() {
-	proto.RegisterEnum("ProductKind", ProductKind_name, ProductKind_value)
-}
-
-func init() { proto.RegisterFile("base/ProductKind.proto", fileDescriptor4) }
-
-var fileDescriptor4 = []byte{
-	// 206 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0xce, 0xcf, 0x4a, 0x03, 0x31,
-	0x10, 0x80, 0x71, 0xe3, 0x9f, 0xad, 0xcc, 0x8a, 0x1d, 0x72, 0xd0, 0x77, 0xf0, 0x10, 0x11, 0x9f,
-	0x20, 0xc9, 0x8e, 0xee, 0x62, 0xec, 0x86, 0x49, 0x40, 0x3d, 0x6e, 0xda, 0x05, 0x0b, 0xd6, 0x48,
-	0xb7, 0x82, 0x47, 0x1f, 0xdb, 0xa3, 0xa4, 0xa7, 0x1e, 0xbf, 0xef, 0xf4, 0x83, 0xab, 0x34, 0x4c,
-	0xe3, 0xad, 0xdf, 0xe6, 0xd5, 0xf7, 0x72, 0xf7, 0xb4, 0xfe, 0x5c, 0xa9, 0xaf, 0x6d, 0xde, 0xe5,
-	0x9b, 0x5f, 0x01, 0xf5, 0xc1, 0x95, 0x35, 0xcc, 0x1e, 0x5c, 0xff, 0x42, 0x1c, 0xf0, 0xa8, 0x04,
-	0x35, 0x9d, 0x71, 0x14, 0x50, 0xc8, 0x0b, 0x38, 0xa7, 0xd7, 0xc8, 0xda, 0xc6, 0x80, 0xc7, 0xa5,
-	0x3c, 0x13, 0xf7, 0xce, 0x05, 0x3c, 0x91, 0x97, 0x00, 0xda, 0xf7, 0xb1, 0x25, 0xab, 0xf9, 0x0d,
-	0x4f, 0x4b, 0x5b, 0xcd, 0x91, 0xbb, 0xe6, 0x91, 0x02, 0x9e, 0x49, 0x80, 0xca, 0x3b, 0xbd, 0x88,
-	0x01, 0x2b, 0x39, 0x87, 0xfa, 0x99, 0xd8, 0xb6, 0x7a, 0xd1, 0x74, 0x81, 0x70, 0x66, 0xee, 0xe0,
-	0x7a, 0x9d, 0x55, 0xfa, 0xc8, 0x79, 0x93, 0xf2, 0x8f, 0x9a, 0x96, 0xef, 0xe3, 0x66, 0x50, 0xc5,
-	0x6b, 0xe6, 0x66, 0x98, 0xc6, 0x03, 0x5e, 0x2b, 0xbc, 0xf8, 0x13, 0x22, 0x55, 0x7b, 0xfc, 0xfd,
-	0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x25, 0x68, 0xb0, 0xbc, 0xd6, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/base/ProductType.pb.go b/languages/go/base/ProductType.pb.go
deleted file mode 100644
index 5ffebdd..0000000
--- a/languages/go/base/ProductType.pb.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: base/ProductType.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// -- Product Type: Top-level -- //
-type ProductType struct {
-	Kind ProductKind `protobuf:"varint,1,opt,name=kind,enum=ProductKind" json:"kind,omitempty"`
-}
-
-func (m *ProductType) Reset()                    { *m = ProductType{} }
-func (m *ProductType) String() string            { return proto.CompactTextString(m) }
-func (*ProductType) ProtoMessage()               {}
-func (*ProductType) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
-
-func (m *ProductType) GetKind() ProductKind {
-	if m != nil {
-		return m.Kind
-	}
-	return ProductKind_FLOWERS
-}
-
-func init() {
-	proto.RegisterType((*ProductType)(nil), "ProductType")
-}
-
-func init() { proto.RegisterFile("base/ProductType.proto", fileDescriptor5) }
-
-var fileDescriptor5 = []byte{
-	// 131 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0x4a, 0x2c, 0x4e,
-	0xd5, 0x0f, 0x28, 0xca, 0x4f, 0x29, 0x4d, 0x2e, 0x09, 0xa9, 0x2c, 0x48, 0xd5, 0x2b, 0x28, 0xca,
-	0x2f, 0xc9, 0x97, 0x42, 0x11, 0xf7, 0xce, 0xcc, 0x4b, 0x81, 0x88, 0x2b, 0xe9, 0x73, 0x71, 0x23,
-	0x29, 0x16, 0x52, 0xe0, 0x62, 0xc9, 0xce, 0xcc, 0x4b, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x33,
-	0xe2, 0xd1, 0x43, 0xd2, 0x10, 0x04, 0x96, 0x71, 0x32, 0xe4, 0x12, 0xcf, 0xcc, 0xd7, 0x4b, 0xca,
-	0xc9, 0xcf, 0xcf, 0x4d, 0xca, 0xaf, 0xd0, 0x2b, 0x4e, 0xce, 0x48, 0xcd, 0x4d, 0xd4, 0x03, 0x99,
-	0xee, 0xc4, 0xef, 0x94, 0x58, 0x9c, 0x8a, 0x64, 0x9a, 0x07, 0x63, 0x00, 0xe3, 0x0f, 0x46, 0xc6,
-	0x24, 0x36, 0xb0, 0x55, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x07, 0x6f, 0x10, 0x9c,
-	0x00, 0x00, 0x00,
-}
diff --git a/languages/go/content/Brand.pb.go b/languages/go/content/Brand.pb.go
deleted file mode 100644
index 4926b4a..0000000
--- a/languages/go/content/Brand.pb.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: content/Brand.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Brand struct {
-	// -- Basic Properties
-	Name    *Name    `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Parent  *Brand   `protobuf:"bytes,2,opt,name=parent" json:"parent,omitempty"`
-	Summary *Content `protobuf:"bytes,3,opt,name=summary" json:"summary,omitempty"`
-	// -- Media
-	Media []*MediaItem `protobuf:"bytes,20,rep,name=media" json:"media,omitempty"`
-}
-
-func (m *Brand) Reset()                    { *m = Brand{} }
-func (m *Brand) String() string            { return proto.CompactTextString(m) }
-func (*Brand) ProtoMessage()               {}
-func (*Brand) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
-
-func (m *Brand) GetName() *Name {
-	if m != nil {
-		return m.Name
-	}
-	return nil
-}
-
-func (m *Brand) GetParent() *Brand {
-	if m != nil {
-		return m.Parent
-	}
-	return nil
-}
-
-func (m *Brand) GetSummary() *Content {
-	if m != nil {
-		return m.Summary
-	}
-	return nil
-}
-
-func (m *Brand) GetMedia() []*MediaItem {
-	if m != nil {
-		return m.Media
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Brand)(nil), "Brand")
-}
-
-func init() { proto.RegisterFile("content/Brand.proto", fileDescriptor6) }
-
-var fileDescriptor6 = []byte{
-	// 212 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x8f, 0x4f, 0x4a, 0xc4, 0x30,
-	0x14, 0xc6, 0x89, 0x63, 0xab, 0xbc, 0x71, 0x15, 0x15, 0xe2, 0x2c, 0xa4, 0xcc, 0xaa, 0xab, 0x57,
-	0xac, 0x37, 0xa8, 0x1b, 0x5d, 0x28, 0x92, 0x1b, 0xa4, 0x6d, 0xc0, 0x82, 0x2f, 0x29, 0x69, 0x04,
-	0xbd, 0x81, 0x47, 0x76, 0x29, 0x7d, 0x4d, 0x66, 0x93, 0xc0, 0xef, 0x4b, 0xbe, 0x3f, 0x70, 0x3d,
-	0x78, 0x17, 0xad, 0x8b, 0x4d, 0x17, 0x8c, 0x1b, 0x71, 0x0e, 0x3e, 0xfa, 0x83, 0xcc, 0xf0, 0xcd,
-	0x90, 0x4d, 0xec, 0x36, 0xb3, 0xa7, 0xed, 0xce, 0x98, 0xec, 0x38, 0x99, 0xe6, 0x75, 0x3d, 0x5f,
-	0xa2, 0xa5, 0x0d, 0x1f, 0x7f, 0x05, 0x14, 0xec, 0x28, 0xef, 0xe0, 0xdc, 0x19, 0xb2, 0x4a, 0x54,
-	0xa2, 0xde, 0xb7, 0x05, 0xae, 0x96, 0x9a, 0x91, 0xbc, 0x87, 0x72, 0x36, 0xc1, 0xba, 0xa8, 0xce,
-	0x58, 0x2c, 0x91, 0xbf, 0xe8, 0x44, 0xe5, 0x11, 0x2e, 0x96, 0x2f, 0x22, 0x13, 0x7e, 0xd4, 0x8e,
-	0x1f, 0x5c, 0x62, 0x0a, 0xd7, 0x59, 0x90, 0x15, 0x14, 0xdc, 0x40, 0xdd, 0x54, 0xbb, 0x7a, 0xdf,
-	0x02, 0x9e, 0x9a, 0xe8, 0x4d, 0xe8, 0x1e, 0xe0, 0x30, 0x79, 0xec, 0x3f, 0xbd, 0xa7, 0xde, 0x7f,
-	0xe3, 0x32, 0x7c, 0x58, 0x32, 0x98, 0xd6, 0x74, 0x57, 0x1c, 0x99, 0x6c, 0x9f, 0xc5, 0xbb, 0xf8,
-	0x13, 0xa2, 0x2f, 0x79, 0xc4, 0xe3, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0xa1, 0x1b, 0xf3,
-	0x1d, 0x01, 0x00, 0x00,
-}
diff --git a/languages/go/content/Content.pb.go b/languages/go/content/Content.pb.go
deleted file mode 100644
index f22510d..0000000
--- a/languages/go/content/Content.pb.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: content/Content.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Content_Type int32
-
-const (
-	Content_TEXT     Content_Type = 0
-	Content_MARKDOWN Content_Type = 1
-	Content_HTML     Content_Type = 2
-)
-
-var Content_Type_name = map[int32]string{
-	0: "TEXT",
-	1: "MARKDOWN",
-	2: "HTML",
-}
-var Content_Type_value = map[string]int32{
-	"TEXT":     0,
-	"MARKDOWN": 1,
-	"HTML":     2,
-}
-
-func (x Content_Type) String() string {
-	return proto.EnumName(Content_Type_name, int32(x))
-}
-func (Content_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor7, []int{0, 0} }
-
-type Content_Encoding int32
-
-const (
-	Content_UTF8 Content_Encoding = 0
-)
-
-var Content_Encoding_name = map[int32]string{
-	0: "UTF8",
-}
-var Content_Encoding_value = map[string]int32{
-	"UTF8": 0,
-}
-
-func (x Content_Encoding) String() string {
-	return proto.EnumName(Content_Encoding_name, int32(x))
-}
-func (Content_Encoding) EnumDescriptor() ([]byte, []int) { return fileDescriptor7, []int{0, 1} }
-
-type Content struct {
-	Type        Content_Type     `protobuf:"varint,1,opt,name=type,enum=Content_Type" json:"type,omitempty"`
-	Encoding    Content_Encoding `protobuf:"varint,2,opt,name=encoding,enum=Content_Encoding" json:"encoding,omitempty"`
-	Content     []byte           `protobuf:"bytes,3,opt,name=content,proto3" json:"content,omitempty"`
-	Language    Language         `protobuf:"varint,4,opt,name=language,enum=Language" json:"language,omitempty"`
-	Compression *Compression     `protobuf:"bytes,5,opt,name=compression" json:"compression,omitempty"`
-}
-
-func (m *Content) Reset()                    { *m = Content{} }
-func (m *Content) String() string            { return proto.CompactTextString(m) }
-func (*Content) ProtoMessage()               {}
-func (*Content) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
-
-func (m *Content) GetType() Content_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Content_TEXT
-}
-
-func (m *Content) GetEncoding() Content_Encoding {
-	if m != nil {
-		return m.Encoding
-	}
-	return Content_UTF8
-}
-
-func (m *Content) GetContent() []byte {
-	if m != nil {
-		return m.Content
-	}
-	return nil
-}
-
-func (m *Content) GetLanguage() Language {
-	if m != nil {
-		return m.Language
-	}
-	return Language_ENGLISH
-}
-
-func (m *Content) GetCompression() *Compression {
-	if m != nil {
-		return m.Compression
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Content)(nil), "Content")
-	proto.RegisterEnum("Content_Type", Content_Type_name, Content_Type_value)
-	proto.RegisterEnum("Content_Encoding", Content_Encoding_name, Content_Encoding_value)
-}
-
-func init() { proto.RegisterFile("content/Content.proto", fileDescriptor7) }
-
-var fileDescriptor7 = []byte{
-	// 286 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x5f, 0x4f, 0xb3, 0x30,
-	0x14, 0xc6, 0x57, 0x5e, 0x5e, 0x87, 0x67, 0xb8, 0x60, 0xfd, 0x93, 0x66, 0x57, 0x48, 0x62, 0xc2,
-	0x8d, 0x5d, 0xb2, 0xdd, 0x78, 0xeb, 0xe6, 0x74, 0x89, 0x9b, 0x9a, 0x06, 0xa3, 0xb7, 0x80, 0x0d,
-	0x92, 0x8c, 0x1e, 0x02, 0x98, 0xb8, 0xef, 0xe0, 0x07, 0xf6, 0xd2, 0xc0, 0x0a, 0xee, 0xaa, 0xe9,
-	0xef, 0x79, 0x7a, 0xf2, 0x3b, 0x85, 0xb3, 0x18, 0x55, 0x25, 0x55, 0x35, 0x9e, 0xef, 0x4e, 0x9e,
-	0x17, 0x58, 0xe1, 0xe8, 0x24, 0x0a, 0x4b, 0x39, 0x5e, 0x85, 0x2a, 0xf9, 0x0c, 0x13, 0xa9, 0xe1,
-	0x79, 0x03, 0xe7, 0x98, 0xe5, 0x85, 0x2c, 0xcb, 0x14, 0xd5, 0x8e, 0x7b, 0xdf, 0x06, 0xf4, 0xf5,
-	0x73, 0x7a, 0x01, 0x66, 0xb5, 0xcd, 0x25, 0x23, 0x2e, 0xf1, 0x87, 0x93, 0x23, 0xde, 0x8e, 0x0d,
-	0xb6, 0xb9, 0x14, 0x4d, 0x44, 0xaf, 0xc0, 0x92, 0x2a, 0xc6, 0xf7, 0x54, 0x25, 0xcc, 0x68, 0x6a,
-	0xc7, 0x5d, 0x6d, 0xa1, 0x03, 0xd1, 0x55, 0x28, 0x83, 0xbe, 0x76, 0x64, 0xff, 0x5c, 0xe2, 0xdb,
-	0xa2, 0xbd, 0xd2, 0x4b, 0xb0, 0x36, 0xda, 0x90, 0x99, 0xcd, 0xa0, 0x43, 0xde, 0x2a, 0x8b, 0x2e,
-	0xa2, 0x1c, 0x06, 0xf1, 0x9f, 0x33, 0xfb, 0xef, 0x12, 0x7f, 0x30, 0xb1, 0xf9, 0xde, 0x1e, 0x62,
-	0xbf, 0xe0, 0xf9, 0x60, 0xd6, 0xb6, 0xd4, 0x02, 0x33, 0x58, 0xbc, 0x05, 0x4e, 0x8f, 0xda, 0x60,
-	0xad, 0x6f, 0xc4, 0xc3, 0xed, 0xd3, 0xeb, 0xa3, 0x43, 0x6a, 0xbe, 0x0c, 0xd6, 0x2b, 0xc7, 0xf0,
-	0x4e, 0xc1, 0x6a, 0x85, 0x6b, 0xfa, 0x12, 0xdc, 0x5d, 0x3b, 0xbd, 0xd9, 0x14, 0x46, 0x29, 0xf2,
-	0x68, 0x83, 0x98, 0x45, 0xf8, 0xc5, 0xcb, 0xf8, 0x43, 0x66, 0x21, 0xd7, 0xd2, 0xb3, 0xe1, 0xbd,
-	0x54, 0xb2, 0x48, 0x63, 0xbd, 0xf1, 0x92, 0x3c, 0x93, 0x1f, 0x42, 0xa2, 0x83, 0xe6, 0x2b, 0xa7,
-	0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x2f, 0xc0, 0xf7, 0x90, 0x01, 0x00, 0x00,
-}
diff --git a/languages/go/content/MaterialsData.pb.go b/languages/go/content/MaterialsData.pb.go
deleted file mode 100644
index 04a48f8..0000000
--- a/languages/go/content/MaterialsData.pb.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: content/MaterialsData.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type MaterialsData struct {
-	Ingredients []string  `protobuf:"bytes,1,rep,name=ingredients" json:"ingredients,omitempty"`
-	Grow        Grow      `protobuf:"varint,2,opt,name=grow,enum=Grow" json:"grow,omitempty"`
-	Species     Species   `protobuf:"varint,3,opt,name=species,enum=Species" json:"species,omitempty"`
-	Genetics    *Genetics `protobuf:"bytes,4,opt,name=genetics" json:"genetics,omitempty"`
-}
-
-func (m *MaterialsData) Reset()                    { *m = MaterialsData{} }
-func (m *MaterialsData) String() string            { return proto.CompactTextString(m) }
-func (*MaterialsData) ProtoMessage()               {}
-func (*MaterialsData) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} }
-
-func (m *MaterialsData) GetIngredients() []string {
-	if m != nil {
-		return m.Ingredients
-	}
-	return nil
-}
-
-func (m *MaterialsData) GetGrow() Grow {
-	if m != nil {
-		return m.Grow
-	}
-	return Grow_GENERIC
-}
-
-func (m *MaterialsData) GetSpecies() Species {
-	if m != nil {
-		return m.Species
-	}
-	return Species_UNSPECIFIED
-}
-
-func (m *MaterialsData) GetGenetics() *Genetics {
-	if m != nil {
-		return m.Genetics
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*MaterialsData)(nil), "MaterialsData")
-}
-
-func init() { proto.RegisterFile("content/MaterialsData.proto", fileDescriptor8) }
-
-var fileDescriptor8 = []byte{
-	// 227 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xc1, 0x4a, 0x03, 0x31,
-	0x10, 0x86, 0x19, 0x5b, 0xb5, 0x4d, 0x51, 0x24, 0xa0, 0xc4, 0x7a, 0x09, 0x05, 0x61, 0x4f, 0x29,
-	0x54, 0x7c, 0x81, 0x2a, 0xe8, 0x45, 0x90, 0xf8, 0x04, 0xd9, 0x38, 0xac, 0x81, 0x36, 0x53, 0x92,
-	0x91, 0xfa, 0x26, 0xbe, 0xaa, 0x47, 0x71, 0x37, 0xbb, 0xd8, 0xeb, 0xf7, 0x0f, 0xf3, 0x7f, 0x33,
-	0xe2, 0xc6, 0x53, 0x64, 0x8c, 0xbc, 0x7c, 0x71, 0x8c, 0x29, 0xb8, 0x4d, 0x7e, 0x74, 0xec, 0xcc,
-	0x2e, 0x11, 0xd3, 0x5c, 0x66, 0x4e, 0x9f, 0x9e, 0xf3, 0xf2, 0x29, 0xd1, 0xbe, 0xb0, 0xcb, 0x9e,
-	0xbd, 0xed, 0xd0, 0x07, 0xcc, 0x05, 0x5f, 0x0d, 0xa3, 0x18, 0x91, 0x83, 0x2f, 0x7c, 0xf1, 0x0d,
-	0xe2, 0xec, 0x60, 0xb5, 0xd4, 0x62, 0x16, 0x62, 0x93, 0xf0, 0x3d, 0x60, 0xe4, 0xac, 0x40, 0x8f,
-	0xaa, 0xa9, 0xfd, 0x8f, 0xe4, 0xb5, 0x18, 0x37, 0x89, 0xf6, 0xea, 0x48, 0x43, 0x75, 0xbe, 0x3a,
-	0x36, 0x7f, 0xed, 0xb6, 0x45, 0x72, 0x21, 0x4e, 0x73, 0xd7, 0xab, 0x46, 0x6d, 0x3a, 0x31, 0xc5,
-	0xc3, 0xf6, 0x81, 0xbc, 0x15, 0x93, 0xa6, 0x48, 0xa8, 0xb1, 0x86, 0x6a, 0xb6, 0x9a, 0x9a, 0xde,
-	0xca, 0x0e, 0xd1, 0xfa, 0x5e, 0xcc, 0x03, 0x99, 0x7a, 0x43, 0xb4, 0xad, 0xe9, 0xcb, 0x64, 0xff,
-	0x81, 0x5b, 0x67, 0xca, 0x3b, 0xd6, 0x17, 0x83, 0xf4, 0x43, 0x47, 0x9e, 0xe1, 0x15, 0x7e, 0x00,
-	0xea, 0x93, 0xf6, 0xae, 0xbb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd7, 0xa2, 0x7d, 0x39, 0x39,
-	0x01, 0x00, 0x00,
-}
diff --git a/languages/go/content/Name.pb.go b/languages/go/content/Name.pb.go
deleted file mode 100644
index bc071a9..0000000
--- a/languages/go/content/Name.pb.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: content/Name.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Name struct {
-	Primary string `protobuf:"bytes,1,opt,name=primary" json:"primary,omitempty"`
-	Display string `protobuf:"bytes,2,opt,name=display" json:"display,omitempty"`
-}
-
-func (m *Name) Reset()                    { *m = Name{} }
-func (m *Name) String() string            { return proto.CompactTextString(m) }
-func (*Name) ProtoMessage()               {}
-func (*Name) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
-
-func (m *Name) GetPrimary() string {
-	if m != nil {
-		return m.Primary
-	}
-	return ""
-}
-
-func (m *Name) GetDisplay() string {
-	if m != nil {
-		return m.Display
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Name)(nil), "Name")
-}
-
-func init() { proto.RegisterFile("content/Name.proto", fileDescriptor9) }
-
-var fileDescriptor9 = []byte{
-	// 128 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4a, 0xce, 0xcf, 0x2b,
-	0x49, 0xcd, 0x2b, 0xd1, 0xf7, 0x4b, 0xcc, 0x4d, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x57, 0xb2,
-	0xe2, 0x62, 0x01, 0xf1, 0x84, 0x24, 0xb8, 0xd8, 0x0b, 0x8a, 0x32, 0x73, 0x13, 0x8b, 0x2a, 0x25,
-	0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x60, 0x5c, 0x90, 0x4c, 0x4a, 0x66, 0x71, 0x41, 0x4e, 0x62,
-	0xa5, 0x04, 0x13, 0x44, 0x06, 0xca, 0x75, 0x32, 0xe0, 0x92, 0xca, 0xcc, 0xd7, 0x4b, 0xca, 0xc9,
-	0xcf, 0xcf, 0x4d, 0xca, 0xaf, 0xd0, 0x2b, 0x4e, 0xce, 0x48, 0xcd, 0x4d, 0xd4, 0x83, 0x5a, 0xe2,
-	0xc4, 0x0d, 0x32, 0xd7, 0x19, 0xc2, 0xf1, 0x60, 0x0c, 0x60, 0xfc, 0xc1, 0xc8, 0x98, 0xc4, 0x06,
-	0xb6, 0xd4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x67, 0x0e, 0x3b, 0x8a, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/content/ProductContent.pb.go b/languages/go/content/ProductContent.pb.go
deleted file mode 100644
index 746f580..0000000
--- a/languages/go/content/ProductContent.pb.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: content/ProductContent.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type ProductContent struct {
-	// -- Basic Properties
-	Name    *Name    `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Summary *Content `protobuf:"bytes,2,opt,name=summary" json:"summary,omitempty"`
-	Brand   *Brand   `protobuf:"bytes,3,opt,name=brand" json:"brand,omitempty"`
-	// -- Media
-	Media []*MediaItem `protobuf:"bytes,20,rep,name=media" json:"media,omitempty"`
-	// -- Extended Attributes
-	Usage  *Content `protobuf:"bytes,30,opt,name=usage" json:"usage,omitempty"`
-	Dosage *Content `protobuf:"bytes,31,opt,name=dosage" json:"dosage,omitempty"`
-	Advice *Content `protobuf:"bytes,32,opt,name=advice" json:"advice,omitempty"`
-}
-
-func (m *ProductContent) Reset()                    { *m = ProductContent{} }
-func (m *ProductContent) String() string            { return proto.CompactTextString(m) }
-func (*ProductContent) ProtoMessage()               {}
-func (*ProductContent) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} }
-
-func (m *ProductContent) GetName() *Name {
-	if m != nil {
-		return m.Name
-	}
-	return nil
-}
-
-func (m *ProductContent) GetSummary() *Content {
-	if m != nil {
-		return m.Summary
-	}
-	return nil
-}
-
-func (m *ProductContent) GetBrand() *Brand {
-	if m != nil {
-		return m.Brand
-	}
-	return nil
-}
-
-func (m *ProductContent) GetMedia() []*MediaItem {
-	if m != nil {
-		return m.Media
-	}
-	return nil
-}
-
-func (m *ProductContent) GetUsage() *Content {
-	if m != nil {
-		return m.Usage
-	}
-	return nil
-}
-
-func (m *ProductContent) GetDosage() *Content {
-	if m != nil {
-		return m.Dosage
-	}
-	return nil
-}
-
-func (m *ProductContent) GetAdvice() *Content {
-	if m != nil {
-		return m.Advice
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*ProductContent)(nil), "ProductContent")
-}
-
-func init() { proto.RegisterFile("content/ProductContent.proto", fileDescriptor10) }
-
-var fileDescriptor10 = []byte{
-	// 260 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xdf, 0x4a, 0xc3, 0x30,
-	0x14, 0xc6, 0x89, 0xb3, 0x55, 0xce, 0x40, 0x21, 0x2a, 0xc4, 0x31, 0x66, 0xd8, 0xd5, 0xae, 0x32,
-	0x98, 0xbe, 0x80, 0xf5, 0x46, 0x2f, 0x94, 0xd1, 0x37, 0x48, 0x93, 0xe0, 0x0a, 0xa6, 0x47, 0xda,
-	0x54, 0xf4, 0xb9, 0xbd, 0xf1, 0x52, 0x9a, 0x3f, 0x83, 0xf6, 0x26, 0x90, 0xdf, 0xf7, 0x3b, 0x7c,
-	0x87, 0x03, 0x4b, 0x85, 0x8d, 0x33, 0x8d, 0xdb, 0xee, 0x5b, 0xd4, 0xbd, 0x72, 0x4f, 0xe1, 0x2b,
-	0x3e, 0x5b, 0x74, 0xb8, 0xa0, 0x29, 0x7d, 0x93, 0xd6, 0x44, 0x76, 0x93, 0xd8, 0x58, 0xbd, 0x4a,
-	0xb8, 0x68, 0x65, 0xa3, 0x93, 0x6b, 0x8d, 0xae, 0xe5, 0xf6, 0x75, 0x78, 0x5f, 0x9c, 0xb1, 0x01,
-	0xaf, 0x7f, 0x09, 0x5c, 0x8c, 0xfb, 0xe8, 0x2d, 0x9c, 0x36, 0xd2, 0x1a, 0x46, 0x38, 0xd9, 0xcc,
-	0x77, 0x99, 0x18, 0x0a, 0x4b, 0x8f, 0xe8, 0x1a, 0xce, 0xba, 0xde, 0x5a, 0xd9, 0xfe, 0xb0, 0x13,
-	0x9f, 0x9e, 0x8b, 0x38, 0x55, 0xa6, 0x80, 0x2e, 0x21, 0xab, 0x86, 0x5e, 0x36, 0xf3, 0x46, 0x2e,
-	0xfc, 0x16, 0x65, 0x80, 0x94, 0x43, 0xe6, 0x17, 0x61, 0xd7, 0x7c, 0xb6, 0x99, 0xef, 0x40, 0x1c,
-	0x17, 0x2a, 0x43, 0x40, 0x57, 0x90, 0xf5, 0x9d, 0x7c, 0x37, 0x6c, 0x35, 0x69, 0x08, 0x98, 0x72,
-	0xc8, 0x35, 0x7a, 0xe1, 0x6e, 0x22, 0x44, 0x3e, 0x18, 0x52, 0x7f, 0xd5, 0xca, 0x30, 0x3e, 0x35,
-	0x02, 0x2f, 0x1e, 0x60, 0x51, 0xa3, 0xa8, 0x3e, 0x10, 0x6d, 0x85, 0xdf, 0xa2, 0x53, 0x07, 0x63,
-	0xa5, 0x88, 0x67, 0x2b, 0x2e, 0x1f, 0x9d, 0x93, 0xea, 0x60, 0x74, 0x1c, 0x7b, 0x26, 0x7b, 0xf2,
-	0x47, 0x48, 0x95, 0xfb, 0x93, 0xdd, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2b, 0xf8, 0xa8, 0x82,
-	0xa9, 0x01, 0x00, 0x00,
-}
diff --git a/languages/go/geo/Address.pb.go b/languages/go/geo/Address.pb.go
deleted file mode 100644
index 663d4a4..0000000
--- a/languages/go/geo/Address.pb.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: geo/Address.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Address struct {
-	FirstLine  string `protobuf:"bytes,1,opt,name=first_line,json=firstLine" json:"first_line,omitempty"`
-	SecondLine string `protobuf:"bytes,2,opt,name=second_line,json=secondLine" json:"second_line,omitempty"`
-	City       string `protobuf:"bytes,3,opt,name=city" json:"city,omitempty"`
-	State      string `protobuf:"bytes,4,opt,name=state" json:"state,omitempty"`
-	Zipcode    string `protobuf:"bytes,5,opt,name=zipcode" json:"zipcode,omitempty"`
-	Country    string `protobuf:"bytes,6,opt,name=country" json:"country,omitempty"`
-}
-
-func (m *Address) Reset()                    { *m = Address{} }
-func (m *Address) String() string            { return proto.CompactTextString(m) }
-func (*Address) ProtoMessage()               {}
-func (*Address) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} }
-
-func (m *Address) GetFirstLine() string {
-	if m != nil {
-		return m.FirstLine
-	}
-	return ""
-}
-
-func (m *Address) GetSecondLine() string {
-	if m != nil {
-		return m.SecondLine
-	}
-	return ""
-}
-
-func (m *Address) GetCity() string {
-	if m != nil {
-		return m.City
-	}
-	return ""
-}
-
-func (m *Address) GetState() string {
-	if m != nil {
-		return m.State
-	}
-	return ""
-}
-
-func (m *Address) GetZipcode() string {
-	if m != nil {
-		return m.Zipcode
-	}
-	return ""
-}
-
-func (m *Address) GetCountry() string {
-	if m != nil {
-		return m.Country
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Address)(nil), "Address")
-}
-
-func init() { proto.RegisterFile("geo/Address.proto", fileDescriptor11) }
-
-var fileDescriptor11 = []byte{
-	// 190 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x34, 0x8f, 0xbf, 0x4e, 0xc3, 0x30,
-	0x10, 0x87, 0x65, 0xc8, 0x1f, 0xe5, 0x98, 0xb0, 0x10, 0xf2, 0x00, 0x02, 0x31, 0x31, 0x99, 0x81,
-	0x27, 0x80, 0xa9, 0x43, 0x87, 0xaa, 0x2f, 0x50, 0x25, 0xf6, 0x35, 0xb5, 0x94, 0xf8, 0x22, 0xdb,
-	0x95, 0x9a, 0xbe, 0x50, 0x5f, 0xb3, 0xea, 0x39, 0xdd, 0xee, 0xfb, 0xbe, 0x5b, 0x7e, 0xf0, 0xdc,
-	0x23, 0xfd, 0xfc, 0x59, 0x1b, 0x30, 0x46, 0x3d, 0x05, 0x4a, 0xf4, 0x75, 0x11, 0x50, 0x2f, 0x46,
-	0xbe, 0x03, 0xec, 0x5d, 0x88, 0x69, 0x37, 0x38, 0x8f, 0x4a, 0x7c, 0x8a, 0xef, 0x66, 0xdb, 0xb0,
-	0x59, 0x3b, 0x8f, 0xf2, 0x03, 0x9e, 0x22, 0x1a, 0xf2, 0x36, 0xf7, 0x07, 0xee, 0x90, 0x15, 0x3f,
-	0x48, 0x28, 0x8c, 0x4b, 0xb3, 0x7a, 0xe4, 0xc2, 0xb7, 0x7c, 0x81, 0x32, 0xa6, 0x36, 0xa1, 0x2a,
-	0x58, 0x66, 0x90, 0x0a, 0xea, 0xb3, 0x9b, 0x0c, 0x59, 0x54, 0x25, 0xfb, 0x3b, 0xde, 0x8a, 0xa1,
-	0xa3, 0x4f, 0x61, 0x56, 0x55, 0x2e, 0x0b, 0xfe, 0xbf, 0xc1, 0xab, 0x23, 0xdd, 0x0d, 0x44, 0x63,
-	0x47, 0x27, 0x1d, 0xcd, 0x01, 0xc7, 0x56, 0xf7, 0x48, 0x2b, 0xb1, 0x11, 0x5d, 0xc5, 0x73, 0x7e,
-	0xaf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9d, 0xc3, 0x6f, 0x10, 0xe3, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/media/MediaItem.pb.go b/languages/go/media/MediaItem.pb.go
deleted file mode 100644
index 8980143..0000000
--- a/languages/go/media/MediaItem.pb.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: media/MediaItem.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type MediaItem struct {
-	Key  *MediaKey  `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Type *MediaType `protobuf:"bytes,2,opt,name=type" json:"type,omitempty"`
-	Name string     `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *MediaItem) Reset()                    { *m = MediaItem{} }
-func (m *MediaItem) String() string            { return proto.CompactTextString(m) }
-func (*MediaItem) ProtoMessage()               {}
-func (*MediaItem) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} }
-
-func (m *MediaItem) GetKey() *MediaKey {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *MediaItem) GetType() *MediaType {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *MediaItem) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*MediaItem)(nil), "MediaItem")
-}
-
-func init() { proto.RegisterFile("media/MediaItem.proto", fileDescriptor12) }
-
-var fileDescriptor12 = []byte{
-	// 174 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0x4d, 0x4d, 0xc9,
-	0x4c, 0xd4, 0xf7, 0x05, 0x91, 0x9e, 0x25, 0xa9, 0xb9, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x52,
-	0x22, 0x48, 0xc2, 0xde, 0xa9, 0x95, 0x50, 0x51, 0x64, 0xc5, 0x21, 0x95, 0x05, 0xa9, 0x10, 0x61,
-	0xa5, 0x18, 0x2e, 0x4e, 0xb8, 0x7e, 0x21, 0x69, 0x2e, 0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05,
-	0x46, 0x0d, 0x6e, 0x23, 0x4e, 0x3d, 0x98, 0x09, 0x41, 0x20, 0x51, 0x21, 0x39, 0x2e, 0x96, 0x92,
-	0xca, 0x82, 0x54, 0x09, 0x26, 0xb0, 0x2c, 0x97, 0x1e, 0xdc, 0xa4, 0x20, 0xb0, 0xb8, 0x90, 0x10,
-	0x17, 0x4b, 0x5e, 0x62, 0x6e, 0xaa, 0x04, 0xb3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x98, 0xed, 0x64,
-	0xc0, 0x25, 0x91, 0x99, 0xaf, 0x97, 0x94, 0x93, 0x9f, 0x9f, 0x9b, 0x94, 0x5f, 0xa1, 0x57, 0x9c,
-	0x9c, 0x91, 0x9a, 0x9b, 0xa8, 0x07, 0x76, 0x89, 0x13, 0xaf, 0x63, 0x49, 0x49, 0x62, 0x72, 0x46,
-	0x6a, 0x0a, 0xd8, 0x20, 0x0f, 0xc6, 0x00, 0xc6, 0x1f, 0x8c, 0x8c, 0x49, 0x6c, 0x60, 0x67, 0x19,
-	0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xeb, 0xf4, 0x23, 0xa2, 0xdc, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/media/MediaKey.pb.go b/languages/go/media/MediaKey.pb.go
deleted file mode 100644
index 796025e..0000000
--- a/languages/go/media/MediaKey.pb.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: media/MediaKey.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type MediaKey struct {
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
-}
-
-func (m *MediaKey) Reset()                    { *m = MediaKey{} }
-func (m *MediaKey) String() string            { return proto.CompactTextString(m) }
-func (*MediaKey) ProtoMessage()               {}
-func (*MediaKey) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{0} }
-
-func (m *MediaKey) GetId() string {
-	if m != nil {
-		return m.Id
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*MediaKey)(nil), "MediaKey")
-}
-
-func init() { proto.RegisterFile("media/MediaKey.proto", fileDescriptor13) }
-
-var fileDescriptor13 = []byte{
-	// 114 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc9, 0x4d, 0x4d, 0xc9,
-	0x4c, 0xd4, 0xf7, 0x05, 0x91, 0xde, 0xa9, 0x95, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x4a, 0x52,
-	0x5c, 0x1c, 0x30, 0x11, 0x21, 0x3e, 0x2e, 0xa6, 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce,
-	0x20, 0xa6, 0xcc, 0x14, 0x27, 0x7d, 0x2e, 0x89, 0xcc, 0x7c, 0xbd, 0xa4, 0x9c, 0xfc, 0xfc, 0xdc,
-	0xa4, 0xfc, 0x0a, 0xbd, 0xe2, 0xe4, 0x8c, 0xd4, 0xdc, 0x44, 0x3d, 0xb0, 0x31, 0x4e, 0x3c, 0x60,
-	0x5d, 0x9e, 0x25, 0xa9, 0xb9, 0xde, 0xa9, 0x95, 0x1e, 0x8c, 0x01, 0x8c, 0x3f, 0x18, 0x19, 0x93,
-	0xd8, 0xc0, 0x66, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x17, 0x47, 0xd1, 0xd1, 0x6b, 0x00,
-	0x00, 0x00,
-}
diff --git a/languages/go/media/MediaType.pb.go b/languages/go/media/MediaType.pb.go
deleted file mode 100644
index 91240b5..0000000
--- a/languages/go/media/MediaType.pb.go
+++ /dev/null
@@ -1,267 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: media/MediaType.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type MediaType_Kind int32
-
-const (
-	MediaType_LINK     MediaType_Kind = 0
-	MediaType_IMAGE    MediaType_Kind = 1
-	MediaType_DOCUMENT MediaType_Kind = 2
-	MediaType_VIDEO    MediaType_Kind = 3
-)
-
-var MediaType_Kind_name = map[int32]string{
-	0: "LINK",
-	1: "IMAGE",
-	2: "DOCUMENT",
-	3: "VIDEO",
-}
-var MediaType_Kind_value = map[string]int32{
-	"LINK":     0,
-	"IMAGE":    1,
-	"DOCUMENT": 2,
-	"VIDEO":    3,
-}
-
-func (x MediaType_Kind) String() string {
-	return proto.EnumName(MediaType_Kind_name, int32(x))
-}
-func (MediaType_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor14, []int{0, 0} }
-
-type ImageType_ImageKind int32
-
-const (
-	ImageType_PNG  ImageType_ImageKind = 0
-	ImageType_JPG  ImageType_ImageKind = 1
-	ImageType_GIF  ImageType_ImageKind = 2
-	ImageType_SVG  ImageType_ImageKind = 3
-	ImageType_WEBP ImageType_ImageKind = 4
-)
-
-var ImageType_ImageKind_name = map[int32]string{
-	0: "PNG",
-	1: "JPG",
-	2: "GIF",
-	3: "SVG",
-	4: "WEBP",
-}
-var ImageType_ImageKind_value = map[string]int32{
-	"PNG":  0,
-	"JPG":  1,
-	"GIF":  2,
-	"SVG":  3,
-	"WEBP": 4,
-}
-
-func (x ImageType_ImageKind) String() string {
-	return proto.EnumName(ImageType_ImageKind_name, int32(x))
-}
-func (ImageType_ImageKind) EnumDescriptor() ([]byte, []int) { return fileDescriptor14, []int{1, 0} }
-
-type DocumentType_DocumentKind int32
-
-const (
-	DocumentType_TXT      DocumentType_DocumentKind = 0
-	DocumentType_HTML     DocumentType_DocumentKind = 1
-	DocumentType_PDF      DocumentType_DocumentKind = 2
-	DocumentType_MARKDOWN DocumentType_DocumentKind = 3
-)
-
-var DocumentType_DocumentKind_name = map[int32]string{
-	0: "TXT",
-	1: "HTML",
-	2: "PDF",
-	3: "MARKDOWN",
-}
-var DocumentType_DocumentKind_value = map[string]int32{
-	"TXT":      0,
-	"HTML":     1,
-	"PDF":      2,
-	"MARKDOWN": 3,
-}
-
-func (x DocumentType_DocumentKind) String() string {
-	return proto.EnumName(DocumentType_DocumentKind_name, int32(x))
-}
-func (DocumentType_DocumentKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor14, []int{2, 0}
-}
-
-type VideoType_VideoKind int32
-
-const (
-	VideoType_MP4 VideoType_VideoKind = 0
-	VideoType_FLV VideoType_VideoKind = 1
-	VideoType_HLS VideoType_VideoKind = 2
-)
-
-var VideoType_VideoKind_name = map[int32]string{
-	0: "MP4",
-	1: "FLV",
-	2: "HLS",
-}
-var VideoType_VideoKind_value = map[string]int32{
-	"MP4": 0,
-	"FLV": 1,
-	"HLS": 2,
-}
-
-func (x VideoType_VideoKind) String() string {
-	return proto.EnumName(VideoType_VideoKind_name, int32(x))
-}
-func (VideoType_VideoKind) EnumDescriptor() ([]byte, []int) { return fileDescriptor14, []int{3, 0} }
-
-// -- Media Type: Top-level -- //
-type MediaType struct {
-	Kind         MediaType_Kind `protobuf:"varint,1,opt,name=kind,enum=MediaType_Kind" json:"kind,omitempty"`
-	ImageType    *ImageType     `protobuf:"bytes,101,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
-	DocumentType *DocumentType  `protobuf:"bytes,201,opt,name=document_type,json=documentType" json:"document_type,omitempty"`
-	VideoType    *VideoType     `protobuf:"bytes,301,opt,name=video_type,json=videoType" json:"video_type,omitempty"`
-}
-
-func (m *MediaType) Reset()                    { *m = MediaType{} }
-func (m *MediaType) String() string            { return proto.CompactTextString(m) }
-func (*MediaType) ProtoMessage()               {}
-func (*MediaType) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{0} }
-
-func (m *MediaType) GetKind() MediaType_Kind {
-	if m != nil {
-		return m.Kind
-	}
-	return MediaType_LINK
-}
-
-func (m *MediaType) GetImageType() *ImageType {
-	if m != nil {
-		return m.ImageType
-	}
-	return nil
-}
-
-func (m *MediaType) GetDocumentType() *DocumentType {
-	if m != nil {
-		return m.DocumentType
-	}
-	return nil
-}
-
-func (m *MediaType) GetVideoType() *VideoType {
-	if m != nil {
-		return m.VideoType
-	}
-	return nil
-}
-
-// -- Media Type: Images -- //
-type ImageType struct {
-	Kind ImageType_ImageKind `protobuf:"varint,1,opt,name=kind,enum=ImageType_ImageKind" json:"kind,omitempty"`
-}
-
-func (m *ImageType) Reset()                    { *m = ImageType{} }
-func (m *ImageType) String() string            { return proto.CompactTextString(m) }
-func (*ImageType) ProtoMessage()               {}
-func (*ImageType) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{1} }
-
-func (m *ImageType) GetKind() ImageType_ImageKind {
-	if m != nil {
-		return m.Kind
-	}
-	return ImageType_PNG
-}
-
-// -- Media Type: Document -- //
-type DocumentType struct {
-	Kind       DocumentType_DocumentKind `protobuf:"varint,1,opt,name=kind,enum=DocumentType_DocumentKind" json:"kind,omitempty"`
-	Compressed bool                      `protobuf:"varint,2,opt,name=compressed" json:"compressed,omitempty"`
-}
-
-func (m *DocumentType) Reset()                    { *m = DocumentType{} }
-func (m *DocumentType) String() string            { return proto.CompactTextString(m) }
-func (*DocumentType) ProtoMessage()               {}
-func (*DocumentType) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{2} }
-
-func (m *DocumentType) GetKind() DocumentType_DocumentKind {
-	if m != nil {
-		return m.Kind
-	}
-	return DocumentType_TXT
-}
-
-func (m *DocumentType) GetCompressed() bool {
-	if m != nil {
-		return m.Compressed
-	}
-	return false
-}
-
-// -- Media Type: Video -- //
-type VideoType struct {
-	Kind VideoType_VideoKind `protobuf:"varint,1,opt,name=kind,enum=VideoType_VideoKind" json:"kind,omitempty"`
-}
-
-func (m *VideoType) Reset()                    { *m = VideoType{} }
-func (m *VideoType) String() string            { return proto.CompactTextString(m) }
-func (*VideoType) ProtoMessage()               {}
-func (*VideoType) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{3} }
-
-func (m *VideoType) GetKind() VideoType_VideoKind {
-	if m != nil {
-		return m.Kind
-	}
-	return VideoType_MP4
-}
-
-func init() {
-	proto.RegisterType((*MediaType)(nil), "MediaType")
-	proto.RegisterType((*ImageType)(nil), "ImageType")
-	proto.RegisterType((*DocumentType)(nil), "DocumentType")
-	proto.RegisterType((*VideoType)(nil), "VideoType")
-	proto.RegisterEnum("MediaType_Kind", MediaType_Kind_name, MediaType_Kind_value)
-	proto.RegisterEnum("ImageType_ImageKind", ImageType_ImageKind_name, ImageType_ImageKind_value)
-	proto.RegisterEnum("DocumentType_DocumentKind", DocumentType_DocumentKind_name, DocumentType_DocumentKind_value)
-	proto.RegisterEnum("VideoType_VideoKind", VideoType_VideoKind_name, VideoType_VideoKind_value)
-}
-
-func init() { proto.RegisterFile("media/MediaType.proto", fileDescriptor14) }
-
-var fileDescriptor14 = []byte{
-	// 420 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x4d, 0x8f, 0x94, 0x40,
-	0x10, 0x9d, 0x06, 0x54, 0x28, 0x19, 0xed, 0x74, 0x34, 0x21, 0x1e, 0xcc, 0x06, 0x13, 0x33, 0x7a,
-	0x68, 0xcd, 0xee, 0x1e, 0xf4, 0xb8, 0x23, 0x2c, 0x83, 0x03, 0x0c, 0x61, 0x91, 0xf5, 0x62, 0xcc,
-	0xcc, 0xd0, 0x51, 0xa2, 0x4c, 0x93, 0x1d, 0xdc, 0xb8, 0xff, 0xc4, 0x3f, 0xe1, 0x0f, 0xf1, 0xef,
-	0x78, 0xf2, 0x68, 0x9a, 0xe6, 0x6b, 0xb2, 0x17, 0xf2, 0xfa, 0x55, 0x15, 0xef, 0xd5, 0x4b, 0xc1,
-	0xe3, 0x92, 0xe5, 0xc5, 0xfa, 0x55, 0x28, 0xbe, 0xe9, 0x4d, 0xc5, 0x68, 0x75, 0xc5, 0x6b, 0x6e,
-	0xff, 0x45, 0x60, 0xf4, 0x1c, 0x79, 0x06, 0xda, 0xb7, 0x62, 0x97, 0x5b, 0xe8, 0x08, 0xcd, 0x1e,
-	0x1c, 0x3f, 0xa4, 0x43, 0xf7, 0xb2, 0xd8, 0xe5, 0x49, 0x53, 0x24, 0x2f, 0x00, 0x8a, 0x72, 0xfd,
-	0x85, 0x7d, 0xae, 0x6f, 0x2a, 0x66, 0xb1, 0x23, 0x34, 0xbb, 0x7f, 0x0c, 0xd4, 0x17, 0x94, 0x68,
-	0x4d, 0x8c, 0xa2, 0x83, 0xe4, 0x04, 0xa6, 0x39, 0xdf, 0xfe, 0x28, 0xd9, 0xae, 0x96, 0xdd, 0x7f,
-	0x50, 0xd3, 0x3e, 0xa5, 0x4e, 0x4b, 0x37, 0x13, 0x66, 0x3e, 0x7a, 0x91, 0x97, 0x00, 0xd7, 0x45,
-	0xce, 0xb8, 0x9c, 0xf8, 0xad, 0xb4, 0x02, 0x99, 0xe0, 0xa4, 0xc0, 0x75, 0x07, 0xed, 0x53, 0xd0,
-	0x84, 0x33, 0xa2, 0x83, 0x16, 0xf8, 0xd1, 0x12, 0x4f, 0x88, 0x01, 0x77, 0xfc, 0xf0, 0xcc, 0x73,
-	0x31, 0x22, 0x26, 0xe8, 0xce, 0xea, 0xdd, 0x87, 0xd0, 0x8d, 0x52, 0xac, 0x88, 0x42, 0xe6, 0x3b,
-	0xee, 0x0a, 0xab, 0x76, 0x05, 0x46, 0x6f, 0x97, 0xcc, 0x0e, 0x76, 0x7e, 0x34, 0x2c, 0x22, 0xd1,
-	0xb0, 0xb8, 0xfd, 0xb6, 0x1d, 0x6b, 0x14, 0xef, 0x81, 0x1a, 0x47, 0x1e, 0x9e, 0x08, 0xf0, 0x3e,
-	0xf6, 0x30, 0x12, 0xc0, 0xf3, 0xcf, 0xb1, 0x22, 0xc0, 0x45, 0xe6, 0x61, 0x55, 0xb8, 0xba, 0x74,
-	0xe7, 0x31, 0xd6, 0xec, 0x5f, 0x08, 0xcc, 0xf1, 0xca, 0x84, 0x1e, 0xa8, 0x3e, 0x39, 0xc8, 0xa3,
-	0x7f, 0x8c, 0x42, 0x7f, 0x0a, 0xb0, 0xe5, 0x65, 0x75, 0xc5, 0xf6, 0x7b, 0x96, 0x5b, 0x22, 0x13,
-	0x3d, 0x19, 0x31, 0xf6, 0x9b, 0xe1, 0xff, 0x9d, 0xbd, 0xf4, 0x63, 0x8a, 0x27, 0xc2, 0xc3, 0x22,
-	0x0d, 0x03, 0xe9, 0x2f, 0x76, 0x84, 0x3f, 0x13, 0xf4, 0xf0, 0x2c, 0x59, 0x3a, 0xab, 0xcb, 0x08,
-	0xab, 0xf6, 0x27, 0x30, 0xfa, 0x68, 0x6f, 0x85, 0xd1, 0x57, 0x24, 0x1a, 0x85, 0xf1, 0xbc, 0x1d,
-	0xeb, 0xd4, 0xc2, 0xf8, 0x54, 0x86, 0x71, 0x1e, 0x64, 0x52, 0x6c, 0x11, 0x5c, 0x60, 0x65, 0xfe,
-	0x1a, 0xac, 0x82, 0xd3, 0xcd, 0x77, 0xce, 0xcb, 0x0d, 0xff, 0x49, 0xf7, 0xdb, 0xaf, 0xac, 0x5c,
-	0xd3, 0xe6, 0x18, 0xe7, 0xd3, 0xe6, 0xbe, 0xfc, 0x9a, 0x95, 0x42, 0x62, 0x81, 0x62, 0xf4, 0x0f,
-	0xa1, 0xcd, 0xdd, 0xe6, 0x32, 0x4f, 0xfe, 0x07, 0x00, 0x00, 0xff, 0xff, 0x34, 0xa1, 0xba, 0x36,
-	0xb2, 0x02, 0x00, 0x00,
-}
diff --git a/languages/go/products/Flower.pb.go b/languages/go/products/Flower.pb.go
deleted file mode 100644
index 2dce803..0000000
--- a/languages/go/products/Flower.pb.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: products/Flower.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Flower struct {
-	// -- Object Key
-	Key *ProductKey `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	// -- Basic Product & Materials Data
-	ProductData  *ProductContent `protobuf:"bytes,20,opt,name=product_data,json=productData" json:"product_data,omitempty"`
-	MaterialData *MaterialsData  `protobuf:"bytes,21,opt,name=material_data,json=materialData" json:"material_data,omitempty"`
-	// -- Flags and Pricing
-	Flags   *FlagsDescriptor `protobuf:"bytes,22,opt,name=flags" json:"flags,omitempty"`
-	Pricing *ProductPricing  `protobuf:"bytes,23,opt,name=pricing" json:"pricing,omitempty"`
-}
-
-func (m *Flower) Reset()                    { *m = Flower{} }
-func (m *Flower) String() string            { return proto.CompactTextString(m) }
-func (*Flower) ProtoMessage()               {}
-func (*Flower) Descriptor() ([]byte, []int) { return fileDescriptor15, []int{0} }
-
-func (m *Flower) GetKey() *ProductKey {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *Flower) GetProductData() *ProductContent {
-	if m != nil {
-		return m.ProductData
-	}
-	return nil
-}
-
-func (m *Flower) GetMaterialData() *MaterialsData {
-	if m != nil {
-		return m.MaterialData
-	}
-	return nil
-}
-
-func (m *Flower) GetFlags() *FlagsDescriptor {
-	if m != nil {
-		return m.Flags
-	}
-	return nil
-}
-
-func (m *Flower) GetPricing() *ProductPricing {
-	if m != nil {
-		return m.Pricing
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Flower)(nil), "Flower")
-}
-
-func init() { proto.RegisterFile("products/Flower.proto", fileDescriptor15) }
-
-var fileDescriptor15 = []byte{
-	// 278 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xdf, 0x4a, 0xc3, 0x30,
-	0x14, 0xc6, 0x0d, 0xe2, 0x84, 0x6c, 0x53, 0x29, 0x56, 0xcb, 0x74, 0x20, 0x5e, 0xf8, 0xe7, 0x26,
-	0x85, 0xee, 0x0d, 0xe6, 0x10, 0x41, 0x84, 0x92, 0x17, 0x90, 0x34, 0x8b, 0x33, 0xd8, 0xf6, 0x94,
-	0x24, 0xa2, 0x7b, 0x5e, 0x5f, 0xc2, 0x4b, 0x69, 0x72, 0x82, 0x74, 0x57, 0x21, 0xe7, 0xfb, 0x3e,
-	0xce, 0xf7, 0x3b, 0x34, 0xed, 0x0c, 0xac, 0x3f, 0xa5, 0xb3, 0xf9, 0x63, 0x0d, 0x5f, 0xca, 0xb0,
-	0xce, 0x80, 0x83, 0x59, 0x5a, 0x09, 0xab, 0xf2, 0x32, 0x68, 0xcf, 0x6a, 0x8b, 0xe3, 0x0b, 0x09,
-	0xad, 0x53, 0xad, 0xcb, 0x5f, 0x84, 0x53, 0x46, 0x8b, 0xda, 0xae, 0x84, 0x13, 0x28, 0x5e, 0x46,
-	0x11, 0x63, 0x0f, 0xe1, 0x8b, 0xea, 0xdc, 0x3a, 0x83, 0x7b, 0xc4, 0xc6, 0xae, 0x94, 0x95, 0x46,
-	0x77, 0x0e, 0xe2, 0xc2, 0xdb, 0x28, 0x77, 0x46, 0x4b, 0xdd, 0x6e, 0xf2, 0x32, 0xbc, 0xbb, 0xc6,
-	0xeb, 0x1f, 0x42, 0x47, 0xa1, 0x6a, 0x32, 0xa7, 0xfb, 0x1f, 0x6a, 0x9b, 0x91, 0x2b, 0x72, 0x37,
-	0x2e, 0xc6, 0xec, 0xbf, 0x2d, 0xef, 0xe7, 0x49, 0x41, 0x27, 0x08, 0xf7, 0xba, 0x16, 0x4e, 0x64,
-	0xa7, 0xde, 0x77, 0xcc, 0x86, 0xf5, 0xf8, 0x18, 0x4d, 0x3d, 0x49, 0xb2, 0xa0, 0xd3, 0x06, 0xd1,
-	0x42, 0x28, 0xf5, 0xa1, 0x23, 0x36, 0x00, 0xe6, 0x93, 0x68, 0xf2, 0xa1, 0x1b, 0x7a, 0xf0, 0xd6,
-	0x43, 0x65, 0x67, 0xde, 0x7c, 0xc2, 0x76, 0x10, 0x79, 0x90, 0x93, 0x7b, 0x7a, 0x88, 0x74, 0xd9,
-	0xf9, 0xb0, 0x0b, 0xc2, 0xf2, 0xa8, 0x2f, 0x0b, 0x3a, 0xd3, 0xc0, 0xaa, 0x1a, 0xa0, 0xa9, 0xe0,
-	0x9b, 0x59, 0xf9, 0xae, 0x1a, 0x7f, 0xe7, 0xde, 0xbd, 0x9c, 0x86, 0x03, 0x60, 0xf8, 0x89, 0x94,
-	0x7b, 0xbf, 0x84, 0x54, 0x23, 0x7f, 0xa0, 0xc5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xf9,
-	0xea, 0x90, 0xd3, 0x01, 0x00, 0x00,
-}
diff --git a/languages/go/structs/FlagsDescriptor.pb.go b/languages/go/structs/FlagsDescriptor.pb.go
deleted file mode 100644
index 757a4a5..0000000
--- a/languages/go/structs/FlagsDescriptor.pb.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: structs/FlagsDescriptor.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type ProductFlag int32
-
-const (
-	ProductFlag_VISIBLE    ProductFlag = 0
-	ProductFlag_PREMIUM    ProductFlag = 1
-	ProductFlag_FEATURED   ProductFlag = 2
-	ProductFlag_LASTCHANCE ProductFlag = 3
-	ProductFlag_INHOUSE    ProductFlag = 4
-)
-
-var ProductFlag_name = map[int32]string{
-	0: "VISIBLE",
-	1: "PREMIUM",
-	2: "FEATURED",
-	3: "LASTCHANCE",
-	4: "INHOUSE",
-}
-var ProductFlag_value = map[string]int32{
-	"VISIBLE":    0,
-	"PREMIUM":    1,
-	"FEATURED":   2,
-	"LASTCHANCE": 3,
-	"INHOUSE":    4,
-}
-
-func (x ProductFlag) String() string {
-	return proto.EnumName(ProductFlag_name, int32(x))
-}
-func (ProductFlag) EnumDescriptor() ([]byte, []int) { return fileDescriptor16, []int{0} }
-
-type ProductFlagValue struct {
-	Type  ProductFlag `protobuf:"varint,1,opt,name=type,enum=ProductFlag" json:"type,omitempty"`
-	Value bool        `protobuf:"varint,2,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *ProductFlagValue) Reset()                    { *m = ProductFlagValue{} }
-func (m *ProductFlagValue) String() string            { return proto.CompactTextString(m) }
-func (*ProductFlagValue) ProtoMessage()               {}
-func (*ProductFlagValue) Descriptor() ([]byte, []int) { return fileDescriptor16, []int{0} }
-
-func (m *ProductFlagValue) GetType() ProductFlag {
-	if m != nil {
-		return m.Type
-	}
-	return ProductFlag_VISIBLE
-}
-
-func (m *ProductFlagValue) GetValue() bool {
-	if m != nil {
-		return m.Value
-	}
-	return false
-}
-
-type ProductFlagset struct {
-	Flags []*ProductFlagValue `protobuf:"bytes,1,rep,name=flags" json:"flags,omitempty"`
-}
-
-func (m *ProductFlagset) Reset()                    { *m = ProductFlagset{} }
-func (m *ProductFlagset) String() string            { return proto.CompactTextString(m) }
-func (*ProductFlagset) ProtoMessage()               {}
-func (*ProductFlagset) Descriptor() ([]byte, []int) { return fileDescriptor16, []int{1} }
-
-func (m *ProductFlagset) GetFlags() []*ProductFlagValue {
-	if m != nil {
-		return m.Flags
-	}
-	return nil
-}
-
-type FlagsDescriptor struct {
-	Visible    bool `protobuf:"varint,1,opt,name=visible" json:"visible,omitempty"`
-	Premium    bool `protobuf:"varint,2,opt,name=premium" json:"premium,omitempty"`
-	Featured   bool `protobuf:"varint,3,opt,name=featured" json:"featured,omitempty"`
-	Lastchance bool `protobuf:"varint,4,opt,name=lastchance" json:"lastchance,omitempty"`
-	Inhouse    bool `protobuf:"varint,5,opt,name=inhouse" json:"inhouse,omitempty"`
-}
-
-func (m *FlagsDescriptor) Reset()                    { *m = FlagsDescriptor{} }
-func (m *FlagsDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*FlagsDescriptor) ProtoMessage()               {}
-func (*FlagsDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor16, []int{2} }
-
-func (m *FlagsDescriptor) GetVisible() bool {
-	if m != nil {
-		return m.Visible
-	}
-	return false
-}
-
-func (m *FlagsDescriptor) GetPremium() bool {
-	if m != nil {
-		return m.Premium
-	}
-	return false
-}
-
-func (m *FlagsDescriptor) GetFeatured() bool {
-	if m != nil {
-		return m.Featured
-	}
-	return false
-}
-
-func (m *FlagsDescriptor) GetLastchance() bool {
-	if m != nil {
-		return m.Lastchance
-	}
-	return false
-}
-
-func (m *FlagsDescriptor) GetInhouse() bool {
-	if m != nil {
-		return m.Inhouse
-	}
-	return false
-}
-
-func init() {
-	proto.RegisterType((*ProductFlagValue)(nil), "ProductFlagValue")
-	proto.RegisterType((*ProductFlagset)(nil), "ProductFlagset")
-	proto.RegisterType((*FlagsDescriptor)(nil), "FlagsDescriptor")
-	proto.RegisterEnum("ProductFlag", ProductFlag_name, ProductFlag_value)
-}
-
-func init() { proto.RegisterFile("structs/FlagsDescriptor.proto", fileDescriptor16) }
-
-var fileDescriptor16 = []byte{
-	// 333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0x4f, 0x4f, 0xc2, 0x30,
-	0x18, 0xc6, 0x2d, 0x7f, 0x64, 0x79, 0x47, 0x70, 0x36, 0x1e, 0x16, 0x13, 0xcd, 0xe4, 0x22, 0xf1,
-	0x30, 0x13, 0x3c, 0x18, 0x8f, 0x0c, 0x46, 0x98, 0x01, 0x24, 0x1b, 0x70, 0xef, 0x46, 0x91, 0x25,
-	0x1b, 0x5d, 0xda, 0x8e, 0xe8, 0x67, 0xf1, 0x8b, 0x7a, 0x34, 0xdd, 0xc0, 0x2c, 0xdc, 0xf6, 0xdb,
-	0xef, 0x49, 0xdf, 0x27, 0x79, 0xe0, 0x4e, 0x48, 0x9e, 0x47, 0x52, 0x3c, 0x8f, 0x13, 0xf2, 0x29,
-	0x46, 0x54, 0x44, 0x3c, 0xce, 0x24, 0xe3, 0x76, 0xc6, 0x99, 0x64, 0xdd, 0x77, 0x30, 0x16, 0x9c,
-	0x6d, 0xf2, 0x48, 0x2a, 0xbf, 0x26, 0x49, 0x4e, 0xb1, 0x05, 0x0d, 0xf9, 0x9d, 0x51, 0x13, 0x59,
-	0xa8, 0xd7, 0xe9, 0xb7, 0xed, 0x4a, 0xc0, 0x2f, 0x0c, 0xbe, 0x81, 0xe6, 0x41, 0x45, 0xcd, 0x9a,
-	0x85, 0x7a, 0x9a, 0x5f, 0x42, 0xf7, 0x0d, 0x3a, 0x95, 0xa8, 0xa0, 0x12, 0x3f, 0x42, 0x73, 0xab,
-	0x3e, 0x4d, 0x64, 0xd5, 0x7b, 0x7a, 0xff, 0xda, 0x3e, 0xbf, 0xe5, 0x97, 0xbe, 0xfb, 0x83, 0xe0,
-	0xea, 0xac, 0x20, 0x36, 0xa1, 0x75, 0x88, 0x45, 0x1c, 0x26, 0x65, 0x13, 0xcd, 0x3f, 0xa1, 0x32,
-	0x19, 0xa7, 0x69, 0x9c, 0xa7, 0xc7, 0x02, 0x27, 0xc4, 0xb7, 0xa0, 0x6d, 0x29, 0x91, 0x39, 0xa7,
-	0x1b, 0xb3, 0x5e, 0xa8, 0x7f, 0xc6, 0xf7, 0x00, 0x09, 0x11, 0x32, 0xda, 0x91, 0x7d, 0x44, 0xcd,
-	0x46, 0x61, 0x2b, 0x7f, 0xd4, 0xab, 0xf1, 0x7e, 0xc7, 0x72, 0x41, 0xcd, 0x66, 0xf9, 0xea, 0x11,
-	0x9f, 0x7c, 0xd0, 0x2b, 0xc5, 0xb1, 0x0e, 0xad, 0xb5, 0x17, 0x78, 0xce, 0xd4, 0x35, 0x2e, 0x14,
-	0x2c, 0x7c, 0x77, 0xe6, 0xad, 0x66, 0x06, 0xc2, 0x6d, 0xd0, 0xc6, 0xee, 0x60, 0xb9, 0xf2, 0xdd,
-	0x91, 0x51, 0xc3, 0x1d, 0x80, 0xe9, 0x20, 0x58, 0x0e, 0x27, 0x83, 0xf9, 0xd0, 0x35, 0xea, 0x2a,
-	0xea, 0xcd, 0x27, 0x1f, 0xab, 0xc0, 0x35, 0x1a, 0xce, 0x2b, 0x3c, 0xc4, 0xcc, 0x0e, 0x13, 0xc6,
-	0xd2, 0x90, 0x7d, 0xd9, 0x22, 0xda, 0xd1, 0x94, 0xa8, 0x51, 0xd4, 0x19, 0xbb, 0x1c, 0xcd, 0xd1,
-	0x1d, 0x22, 0x68, 0x50, 0x0e, 0x38, 0x41, 0x0b, 0xf4, 0x8b, 0x50, 0x78, 0x59, 0x0c, 0xf7, 0xf2,
-	0x17, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x4e, 0x00, 0x49, 0xd9, 0x01, 0x00, 0x00,
-}
diff --git a/languages/go/structs/Genetics.pb.go b/languages/go/structs/Genetics.pb.go
deleted file mode 100644
index 8b3b142..0000000
--- a/languages/go/structs/Genetics.pb.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: structs/Genetics.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Genetics struct {
-	Male   *Name `protobuf:"bytes,1,opt,name=male" json:"male,omitempty"`
-	Female *Name `protobuf:"bytes,2,opt,name=female" json:"female,omitempty"`
-}
-
-func (m *Genetics) Reset()                    { *m = Genetics{} }
-func (m *Genetics) String() string            { return proto.CompactTextString(m) }
-func (*Genetics) ProtoMessage()               {}
-func (*Genetics) Descriptor() ([]byte, []int) { return fileDescriptor17, []int{0} }
-
-func (m *Genetics) GetMale() *Name {
-	if m != nil {
-		return m.Male
-	}
-	return nil
-}
-
-func (m *Genetics) GetFemale() *Name {
-	if m != nil {
-		return m.Female
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Genetics)(nil), "Genetics")
-}
-
-func init() { proto.RegisterFile("structs/Genetics.proto", fileDescriptor17) }
-
-var fileDescriptor17 = []byte{
-	// 156 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2b, 0x2e, 0x29, 0x2a,
-	0x4d, 0x2e, 0x29, 0xd6, 0x77, 0x4f, 0xcd, 0x4b, 0x2d, 0xc9, 0x4c, 0x2e, 0xd6, 0x2b, 0x28, 0xca,
-	0x2f, 0xc9, 0x97, 0x12, 0x4a, 0xce, 0xcf, 0x2b, 0x49, 0xcd, 0x2b, 0xd1, 0xf7, 0x4b, 0xcc, 0x4d,
-	0x85, 0x88, 0x29, 0xb9, 0x70, 0x71, 0xc0, 0x54, 0x09, 0x49, 0x72, 0xb1, 0xe4, 0x26, 0xe6, 0xa4,
-	0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0xb1, 0xea, 0x81, 0x94, 0x05, 0x81, 0x85, 0x84, 0x64,
-	0xb9, 0xd8, 0xd2, 0x52, 0xc1, 0x92, 0x4c, 0xc8, 0x92, 0x50, 0x41, 0x27, 0x6b, 0x2e, 0xc5, 0xcc,
-	0x7c, 0xbd, 0xa4, 0x9c, 0xfc, 0xfc, 0xdc, 0xa4, 0xfc, 0x0a, 0xbd, 0xe2, 0xe4, 0x8c, 0xd4, 0xdc,
-	0x44, 0x90, 0x0d, 0x29, 0xa5, 0xc9, 0x25, 0x7a, 0x10, 0xe7, 0x38, 0xf1, 0xc3, 0x2c, 0x0a, 0x86,
-	0x38, 0xcf, 0x83, 0x31, 0x80, 0xf1, 0x07, 0x23, 0x63, 0x12, 0x1b, 0xd8, 0x25, 0xc6, 0x80, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xbf, 0xbb, 0x50, 0x68, 0xb7, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/structs/Grow.pb.go b/languages/go/structs/Grow.pb.go
deleted file mode 100644
index 43e4f59..0000000
--- a/languages/go/structs/Grow.pb.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: structs/Grow.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Grow int32
-
-const (
-	Grow_GENERIC    Grow = 0
-	Grow_INDOOR     Grow = 1
-	Grow_GREENHOUSE Grow = 2
-	Grow_OUTDOOR    Grow = 3
-)
-
-var Grow_name = map[int32]string{
-	0: "GENERIC",
-	1: "INDOOR",
-	2: "GREENHOUSE",
-	3: "OUTDOOR",
-}
-var Grow_value = map[string]int32{
-	"GENERIC":    0,
-	"INDOOR":     1,
-	"GREENHOUSE": 2,
-	"OUTDOOR":    3,
-}
-
-func (x Grow) String() string {
-	return proto.EnumName(Grow_name, int32(x))
-}
-func (Grow) EnumDescriptor() ([]byte, []int) { return fileDescriptor18, []int{0} }
-
-func init() {
-	proto.RegisterEnum("Grow", Grow_name, Grow_value)
-}
-
-func init() { proto.RegisterFile("structs/Grow.proto", fileDescriptor18) }
-
-var fileDescriptor18 = []byte{
-	// 154 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x2e, 0x29, 0x2a,
-	0x4d, 0x2e, 0x29, 0xd6, 0x77, 0x2f, 0xca, 0x2f, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0xb2,
-	0xe1, 0x62, 0x01, 0xf1, 0x84, 0xb8, 0xb9, 0xd8, 0xdd, 0x5d, 0xfd, 0x5c, 0x83, 0x3c, 0x9d, 0x05,
-	0x18, 0x84, 0xb8, 0xb8, 0xd8, 0x3c, 0xfd, 0x5c, 0xfc, 0xfd, 0x83, 0x04, 0x18, 0x85, 0xf8, 0xb8,
-	0xb8, 0xdc, 0x83, 0x5c, 0x5d, 0xfd, 0x3c, 0xfc, 0x43, 0x83, 0x5d, 0x05, 0x98, 0x40, 0x0a, 0xfd,
-	0x43, 0x43, 0xc0, 0x92, 0xcc, 0x4e, 0x16, 0x5c, 0x8a, 0x99, 0xf9, 0x7a, 0x49, 0x39, 0xf9, 0xf9,
-	0xb9, 0x49, 0xf9, 0x15, 0x7a, 0xc5, 0xc9, 0x19, 0xa9, 0xb9, 0x89, 0x20, 0x93, 0x53, 0x4a, 0x93,
-	0x4b, 0xf4, 0x20, 0xd6, 0x39, 0xf1, 0xf8, 0x26, 0x96, 0xa4, 0x16, 0x65, 0x26, 0xe6, 0x80, 0x2c,
-	0xf2, 0x60, 0x0c, 0x60, 0xfc, 0xc1, 0xc8, 0x98, 0xc4, 0x06, 0xb6, 0xde, 0x18, 0x10, 0x00, 0x00,
-	0xff, 0xff, 0x8f, 0x73, 0x40, 0xa9, 0x94, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/structs/Species.pb.go b/languages/go/structs/Species.pb.go
deleted file mode 100644
index cf45a03..0000000
--- a/languages/go/structs/Species.pb.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: structs/Species.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Species int32
-
-const (
-	Species_UNSPECIFIED   Species = 0
-	Species_SATIVA        Species = 1
-	Species_HYBRID_SATIVA Species = 2
-	Species_HYBRID        Species = 3
-	Species_HYBRID_INDICA Species = 4
-	Species_INDICA        Species = 5
-)
-
-var Species_name = map[int32]string{
-	0: "UNSPECIFIED",
-	1: "SATIVA",
-	2: "HYBRID_SATIVA",
-	3: "HYBRID",
-	4: "HYBRID_INDICA",
-	5: "INDICA",
-}
-var Species_value = map[string]int32{
-	"UNSPECIFIED":   0,
-	"SATIVA":        1,
-	"HYBRID_SATIVA": 2,
-	"HYBRID":        3,
-	"HYBRID_INDICA": 4,
-	"INDICA":        5,
-}
-
-func (x Species) String() string {
-	return proto.EnumName(Species_name, int32(x))
-}
-func (Species) EnumDescriptor() ([]byte, []int) { return fileDescriptor19, []int{0} }
-
-func init() {
-	proto.RegisterEnum("Species", Species_name, Species_value)
-}
-
-func init() { proto.RegisterFile("structs/Species.proto", fileDescriptor19) }
-
-var fileDescriptor19 = []byte{
-	// 172 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x2e, 0x29, 0x2a,
-	0x4d, 0x2e, 0x29, 0xd6, 0x0f, 0x2e, 0x48, 0x4d, 0xce, 0x4c, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0xd7, 0x4a, 0xe1, 0x62, 0x87, 0x0a, 0x08, 0xf1, 0x73, 0x71, 0x87, 0xfa, 0x05, 0x07, 0xb8,
-	0x3a, 0x7b, 0xba, 0x79, 0xba, 0xba, 0x08, 0x30, 0x08, 0x71, 0x71, 0xb1, 0x05, 0x3b, 0x86, 0x78,
-	0x86, 0x39, 0x0a, 0x30, 0x0a, 0x09, 0x72, 0xf1, 0x7a, 0x44, 0x3a, 0x05, 0x79, 0xba, 0xc4, 0x43,
-	0x85, 0x98, 0x40, 0xd2, 0x10, 0x21, 0x01, 0x66, 0x24, 0x69, 0x4f, 0x3f, 0x17, 0x4f, 0x67, 0x47,
-	0x01, 0x16, 0x90, 0x34, 0x94, 0xcd, 0xea, 0x64, 0xcd, 0xa5, 0x98, 0x99, 0xaf, 0x97, 0x94, 0x93,
-	0x9f, 0x9f, 0x9b, 0x94, 0x5f, 0xa1, 0x57, 0x9c, 0x9c, 0x91, 0x9a, 0x9b, 0x08, 0x72, 0x41, 0x4a,
-	0x69, 0x72, 0x89, 0x1e, 0xc4, 0x65, 0x4e, 0xfc, 0xbe, 0x89, 0x25, 0xa9, 0x45, 0x99, 0x89, 0x39,
-	0x50, 0x07, 0x79, 0x30, 0x06, 0x30, 0xfe, 0x60, 0x64, 0x4c, 0x62, 0x03, 0xbb, 0xd4, 0x18, 0x10,
-	0x00, 0x00, 0xff, 0xff, 0x54, 0x18, 0xe4, 0x93, 0xc2, 0x00, 0x00, 0x00,
-}
diff --git a/languages/go/structs/pricing/PricingDescriptor.pb.go b/languages/go/structs/pricing/PricingDescriptor.pb.go
deleted file mode 100644
index 1c5a056..0000000
--- a/languages/go/structs/pricing/PricingDescriptor.pb.go
+++ /dev/null
@@ -1,299 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: structs/pricing/PricingDescriptor.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// -- Pricing: Objects
-type PricingType int32
-
-const (
-	PricingType_UNIT     PricingType = 0
-	PricingType_WEIGHTED PricingType = 1
-	PricingType_FREEBIE  PricingType = 2
-)
-
-var PricingType_name = map[int32]string{
-	0: "UNIT",
-	1: "WEIGHTED",
-	2: "FREEBIE",
-}
-var PricingType_value = map[string]int32{
-	"UNIT":     0,
-	"WEIGHTED": 1,
-	"FREEBIE":  2,
-}
-
-func (x PricingType) String() string {
-	return proto.EnumName(PricingType_name, int32(x))
-}
-func (PricingType) EnumDescriptor() ([]byte, []int) { return fileDescriptor20, []int{0} }
-
-type PricingWeightTier int32
-
-const (
-	PricingWeightTier_OTHER       PricingWeightTier = 0
-	PricingWeightTier_GRAM        PricingWeightTier = 1
-	PricingWeightTier_HALFGRAM    PricingWeightTier = 2
-	PricingWeightTier_QUARTERGRAM PricingWeightTier = 3
-	PricingWeightTier_DUB         PricingWeightTier = 4
-	PricingWeightTier_EIGHTH      PricingWeightTier = 5
-	PricingWeightTier_QUARTER     PricingWeightTier = 6
-	PricingWeightTier_HALF        PricingWeightTier = 7
-	PricingWeightTier_OUNCE       PricingWeightTier = 8
-	PricingWeightTier_POUND       PricingWeightTier = 9
-)
-
-var PricingWeightTier_name = map[int32]string{
-	0: "OTHER",
-	1: "GRAM",
-	2: "HALFGRAM",
-	3: "QUARTERGRAM",
-	4: "DUB",
-	5: "EIGHTH",
-	6: "QUARTER",
-	7: "HALF",
-	8: "OUNCE",
-	9: "POUND",
-}
-var PricingWeightTier_value = map[string]int32{
-	"OTHER":       0,
-	"GRAM":        1,
-	"HALFGRAM":    2,
-	"QUARTERGRAM": 3,
-	"DUB":         4,
-	"EIGHTH":      5,
-	"QUARTER":     6,
-	"HALF":        7,
-	"OUNCE":       8,
-	"POUND":       9,
-}
-
-func (x PricingWeightTier) String() string {
-	return proto.EnumName(PricingWeightTier_name, int32(x))
-}
-func (PricingWeightTier) EnumDescriptor() ([]byte, []int) { return fileDescriptor20, []int{1} }
-
-type PricingTierAvailability struct {
-	Offered   bool `protobuf:"varint,1,opt,name=offered" json:"offered,omitempty"`
-	Available bool `protobuf:"varint,2,opt,name=available" json:"available,omitempty"`
-}
-
-func (m *PricingTierAvailability) Reset()                    { *m = PricingTierAvailability{} }
-func (m *PricingTierAvailability) String() string            { return proto.CompactTextString(m) }
-func (*PricingTierAvailability) ProtoMessage()               {}
-func (*PricingTierAvailability) Descriptor() ([]byte, []int) { return fileDescriptor20, []int{0} }
-
-func (m *PricingTierAvailability) GetOffered() bool {
-	if m != nil {
-		return m.Offered
-	}
-	return false
-}
-
-func (m *PricingTierAvailability) GetAvailable() bool {
-	if m != nil {
-		return m.Available
-	}
-	return false
-}
-
-// -- Pricing: Typed Descriptors
-type UnitPricingDescriptor struct {
-	PriceValue float32                  `protobuf:"fixed32,1,opt,name=price_value,json=priceValue" json:"price_value,omitempty"`
-	Status     *PricingTierAvailability `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
-	Discounts  []*SaleDescriptor        `protobuf:"bytes,3,rep,name=discounts" json:"discounts,omitempty"`
-}
-
-func (m *UnitPricingDescriptor) Reset()                    { *m = UnitPricingDescriptor{} }
-func (m *UnitPricingDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*UnitPricingDescriptor) ProtoMessage()               {}
-func (*UnitPricingDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor20, []int{1} }
-
-func (m *UnitPricingDescriptor) GetPriceValue() float32 {
-	if m != nil {
-		return m.PriceValue
-	}
-	return 0
-}
-
-func (m *UnitPricingDescriptor) GetStatus() *PricingTierAvailability {
-	if m != nil {
-		return m.Status
-	}
-	return nil
-}
-
-func (m *UnitPricingDescriptor) GetDiscounts() []*SaleDescriptor {
-	if m != nil {
-		return m.Discounts
-	}
-	return nil
-}
-
-type WeightedPricingDescriptor struct {
-	Weight        PricingWeightTier      `protobuf:"varint,1,opt,name=weight,enum=PricingWeightTier" json:"weight,omitempty"`
-	Tier          *UnitPricingDescriptor `protobuf:"bytes,2,opt,name=tier" json:"tier,omitempty"`
-	WeightInGrams float32                `protobuf:"fixed32,3,opt,name=weightInGrams" json:"weightInGrams,omitempty"`
-}
-
-func (m *WeightedPricingDescriptor) Reset()                    { *m = WeightedPricingDescriptor{} }
-func (m *WeightedPricingDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*WeightedPricingDescriptor) ProtoMessage()               {}
-func (*WeightedPricingDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor20, []int{2} }
-
-func (m *WeightedPricingDescriptor) GetWeight() PricingWeightTier {
-	if m != nil {
-		return m.Weight
-	}
-	return PricingWeightTier_OTHER
-}
-
-func (m *WeightedPricingDescriptor) GetTier() *UnitPricingDescriptor {
-	if m != nil {
-		return m.Tier
-	}
-	return nil
-}
-
-func (m *WeightedPricingDescriptor) GetWeightInGrams() float32 {
-	if m != nil {
-		return m.WeightInGrams
-	}
-	return 0
-}
-
-type FreebiePricingDescriptor struct {
-}
-
-func (m *FreebiePricingDescriptor) Reset()                    { *m = FreebiePricingDescriptor{} }
-func (m *FreebiePricingDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*FreebiePricingDescriptor) ProtoMessage()               {}
-func (*FreebiePricingDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor20, []int{3} }
-
-// -- Pricing: Main Descriptor
-type PricingDescriptor struct {
-	Type PricingType `protobuf:"varint,1,opt,name=type,enum=PricingType" json:"type,omitempty"`
-	// -- descriptors
-	Unit     *UnitPricingDescriptor     `protobuf:"bytes,20,opt,name=unit" json:"unit,omitempty"`
-	Weighted *WeightedPricingDescriptor `protobuf:"bytes,21,opt,name=weighted" json:"weighted,omitempty"`
-	Freebie  *FreebiePricingDescriptor  `protobuf:"bytes,22,opt,name=freebie" json:"freebie,omitempty"`
-}
-
-func (m *PricingDescriptor) Reset()                    { *m = PricingDescriptor{} }
-func (m *PricingDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*PricingDescriptor) ProtoMessage()               {}
-func (*PricingDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor20, []int{4} }
-
-func (m *PricingDescriptor) GetType() PricingType {
-	if m != nil {
-		return m.Type
-	}
-	return PricingType_UNIT
-}
-
-func (m *PricingDescriptor) GetUnit() *UnitPricingDescriptor {
-	if m != nil {
-		return m.Unit
-	}
-	return nil
-}
-
-func (m *PricingDescriptor) GetWeighted() *WeightedPricingDescriptor {
-	if m != nil {
-		return m.Weighted
-	}
-	return nil
-}
-
-func (m *PricingDescriptor) GetFreebie() *FreebiePricingDescriptor {
-	if m != nil {
-		return m.Freebie
-	}
-	return nil
-}
-
-// -- Pricing: Product-level Object
-type ProductPricing struct {
-	Discounts []*SaleDescriptor    `protobuf:"bytes,1,rep,name=discounts" json:"discounts,omitempty"`
-	Manifest  []*PricingDescriptor `protobuf:"bytes,2,rep,name=manifest" json:"manifest,omitempty"`
-}
-
-func (m *ProductPricing) Reset()                    { *m = ProductPricing{} }
-func (m *ProductPricing) String() string            { return proto.CompactTextString(m) }
-func (*ProductPricing) ProtoMessage()               {}
-func (*ProductPricing) Descriptor() ([]byte, []int) { return fileDescriptor20, []int{5} }
-
-func (m *ProductPricing) GetDiscounts() []*SaleDescriptor {
-	if m != nil {
-		return m.Discounts
-	}
-	return nil
-}
-
-func (m *ProductPricing) GetManifest() []*PricingDescriptor {
-	if m != nil {
-		return m.Manifest
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*PricingTierAvailability)(nil), "PricingTierAvailability")
-	proto.RegisterType((*UnitPricingDescriptor)(nil), "UnitPricingDescriptor")
-	proto.RegisterType((*WeightedPricingDescriptor)(nil), "WeightedPricingDescriptor")
-	proto.RegisterType((*FreebiePricingDescriptor)(nil), "FreebiePricingDescriptor")
-	proto.RegisterType((*PricingDescriptor)(nil), "PricingDescriptor")
-	proto.RegisterType((*ProductPricing)(nil), "ProductPricing")
-	proto.RegisterEnum("PricingType", PricingType_name, PricingType_value)
-	proto.RegisterEnum("PricingWeightTier", PricingWeightTier_name, PricingWeightTier_value)
-}
-
-func init() { proto.RegisterFile("structs/pricing/PricingDescriptor.proto", fileDescriptor20) }
-
-var fileDescriptor20 = []byte{
-	// 557 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x6e, 0xda, 0x30,
-	0x14, 0x86, 0x1b, 0xa0, 0x10, 0x4e, 0xba, 0xd6, 0xb3, 0xd6, 0x2e, 0xad, 0x26, 0xad, 0x43, 0x95,
-	0x56, 0x21, 0x2d, 0x9d, 0xa8, 0xb4, 0xcb, 0x49, 0x30, 0x52, 0x40, 0xda, 0x28, 0x75, 0xc9, 0x7a,
-	0x39, 0x85, 0x60, 0x5a, 0x4b, 0x21, 0x8e, 0x1c, 0xa7, 0x1d, 0x8f, 0xb0, 0x47, 0xd8, 0x4b, 0xed,
-	0x79, 0x76, 0x39, 0xd9, 0x09, 0x50, 0xca, 0xd8, 0xae, 0xc0, 0xc7, 0x9f, 0x7f, 0x7f, 0x3e, 0x8e,
-	0xe1, 0x6d, 0x22, 0x45, 0x1a, 0xc8, 0xe4, 0x2c, 0x16, 0x2c, 0x60, 0xd1, 0xed, 0xd9, 0x20, 0xfb,
-	0x6d, 0xd3, 0x24, 0x10, 0x2c, 0x96, 0x5c, 0x38, 0xb1, 0xe0, 0x92, 0x1f, 0x9d, 0x3c, 0x05, 0xaf,
-	0xfd, 0x90, 0x3e, 0xa5, 0x6a, 0x57, 0xf0, 0x32, 0x0f, 0x18, 0x32, 0x2a, 0x9a, 0xf7, 0x3e, 0x0b,
-	0xfd, 0x11, 0x0b, 0x99, 0x9c, 0x61, 0x1b, 0x2a, 0x7c, 0x32, 0xa1, 0x82, 0x8e, 0x6d, 0xe3, 0xd8,
-	0x38, 0x35, 0xc9, 0x7c, 0x88, 0x5f, 0x41, 0xd5, 0xcf, 0xc8, 0x90, 0xda, 0x05, 0x3d, 0xb7, 0x2c,
-	0xd4, 0x7e, 0x1a, 0xb0, 0xef, 0x45, 0x4c, 0xae, 0x89, 0xe1, 0xd7, 0x60, 0x29, 0x19, 0xfa, 0xed,
-	0xde, 0x0f, 0x53, 0xaa, 0x53, 0x0b, 0x04, 0x74, 0xe9, 0xab, 0xaa, 0xe0, 0xf7, 0x50, 0x4e, 0xa4,
-	0x2f, 0xd3, 0x44, 0xa7, 0x5a, 0x0d, 0xdb, 0xd9, 0x20, 0x47, 0x72, 0x0e, 0xbf, 0x83, 0xea, 0x98,
-	0x25, 0x01, 0x4f, 0x23, 0x99, 0xd8, 0xc5, 0xe3, 0xe2, 0xa9, 0xd5, 0xd8, 0x73, 0x56, 0x4f, 0x4a,
-	0x96, 0x84, 0x72, 0x3b, 0xbc, 0xa1, 0xec, 0xf6, 0x4e, 0xd2, 0xf1, 0xba, 0x5f, 0x1d, 0xca, 0x0f,
-	0x7a, 0x52, 0xab, 0xed, 0x36, 0xf0, 0x7c, 0xfb, 0x6c, 0x89, 0x92, 0x20, 0x39, 0x81, 0xeb, 0x50,
-	0x92, 0x8c, 0x8a, 0x5c, 0xf4, 0xc0, 0xf9, 0xeb, 0x89, 0x89, 0x66, 0xf0, 0x09, 0x3c, 0xcb, 0x56,
-	0xf5, 0xa2, 0x8e, 0xf0, 0xa7, 0x4a, 0x54, 0x9d, 0x7c, 0xb5, 0x58, 0x3b, 0x02, 0xfb, 0x42, 0x50,
-	0x3a, 0x62, 0x74, 0x2d, 0xa7, 0xf6, 0xcb, 0x80, 0xe7, 0xeb, 0xbe, 0xc7, 0x50, 0x92, 0xb3, 0x98,
-	0xe6, 0xb6, 0x3b, 0x8b, 0x66, 0xcd, 0x62, 0x4a, 0xf4, 0x8c, 0xb2, 0x4c, 0x23, 0x26, 0xed, 0x17,
-	0xff, 0xb6, 0x54, 0x0c, 0xfe, 0x00, 0xe6, 0x43, 0xde, 0x1a, 0x7b, 0x5f, 0xf3, 0x47, 0xce, 0xc6,
-	0x5e, 0x91, 0x05, 0x8b, 0xcf, 0xa1, 0x32, 0xc9, 0xbc, 0xed, 0x03, 0xbd, 0xec, 0xd0, 0xd9, 0x74,
-	0x0e, 0x32, 0x27, 0x6b, 0x1c, 0x76, 0x07, 0x82, 0x8f, 0xd3, 0x60, 0xae, 0xb3, 0x7a, 0x93, 0xc6,
-	0xff, 0x6e, 0x12, 0x3b, 0x60, 0x4e, 0xfd, 0x88, 0x4d, 0x68, 0x22, 0xed, 0x82, 0xa6, 0x17, 0xb7,
-	0xf5, 0xd8, 0x72, 0xce, 0xd4, 0x1b, 0x60, 0x3d, 0x6a, 0x0f, 0x36, 0xa1, 0xe4, 0xf5, 0x7b, 0x43,
-	0xb4, 0x85, 0x77, 0xc0, 0xbc, 0x71, 0x7b, 0x9d, 0xee, 0xd0, 0x6d, 0x23, 0x03, 0x5b, 0x50, 0xb9,
-	0x20, 0xae, 0xdb, 0xea, 0xb9, 0xa8, 0x50, 0xff, 0xb1, 0xec, 0xfa, 0xf2, 0x0b, 0xc0, 0x55, 0xd8,
-	0xbe, 0x1c, 0x76, 0x5d, 0x82, 0xb6, 0x54, 0x4a, 0x87, 0x34, 0xbf, 0x20, 0x43, 0xa5, 0x74, 0x9b,
-	0x9f, 0x2f, 0xf4, 0xa8, 0x80, 0xf7, 0xc0, 0xba, 0xf2, 0x9a, 0x64, 0xe8, 0x12, 0x5d, 0x28, 0xe2,
-	0x0a, 0x14, 0xdb, 0x5e, 0x0b, 0x95, 0x30, 0x40, 0x59, 0x6f, 0xd6, 0x45, 0xdb, 0x6a, 0xaf, 0x9c,
-	0x42, 0x65, 0x15, 0xa5, 0x02, 0x50, 0x45, 0xe7, 0x7b, 0xfd, 0x4f, 0x2e, 0x32, 0xd5, 0xdf, 0xc1,
-	0xa5, 0xd7, 0x6f, 0xa3, 0x6a, 0xeb, 0x23, 0xbc, 0x61, 0xdc, 0x19, 0x85, 0x9c, 0x4f, 0x47, 0xfc,
-	0xbb, 0x93, 0x04, 0x77, 0x74, 0xea, 0xab, 0x47, 0xac, 0x7a, 0xe8, 0x64, 0x6f, 0xbd, 0x85, 0x57,
-	0x7b, 0x7a, 0x1d, 0xd3, 0xa0, 0x6b, 0x0c, 0x8c, 0xdf, 0x86, 0x31, 0x2a, 0xeb, 0xf7, 0x7e, 0xfe,
-	0x27, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x66, 0x91, 0x75, 0x40, 0x04, 0x00, 0x00,
-}
diff --git a/languages/go/structs/pricing/SaleDescriptor.pb.go b/languages/go/structs/pricing/SaleDescriptor.pb.go
deleted file mode 100644
index 63278f6..0000000
--- a/languages/go/structs/pricing/SaleDescriptor.pb.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: structs/pricing/SaleDescriptor.proto
-
-package schema
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type SaleType int32
-
-const (
-	SaleType_PERCENTAGE SaleType = 0
-	SaleType_BOGO       SaleType = 1
-	SaleType_LOYALTY    SaleType = 2
-)
-
-var SaleType_name = map[int32]string{
-	0: "PERCENTAGE",
-	1: "BOGO",
-	2: "LOYALTY",
-}
-var SaleType_value = map[string]int32{
-	"PERCENTAGE": 0,
-	"BOGO":       1,
-	"LOYALTY":    2,
-}
-
-func (x SaleType) String() string {
-	return proto.EnumName(SaleType_name, int32(x))
-}
-func (SaleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor21, []int{0} }
-
-type SaleDescriptor struct {
-	// sale metadata
-	Type       SaleType `protobuf:"varint,1,opt,name=type,enum=SaleType" json:"type,omitempty"`
-	Effective  uint64   `protobuf:"varint,2,opt,name=effective" json:"effective,omitempty"`
-	Expiration uint64   `protobuf:"varint,3,opt,name=expiration" json:"expiration,omitempty"`
-	// sale amount and trigger properties
-	PercentageAmount uint32 `protobuf:"varint,20,opt,name=percentage_amount,json=percentageAmount" json:"percentage_amount,omitempty"`
-	BogoTrigger      uint32 `protobuf:"varint,21,opt,name=bogo_trigger,json=bogoTrigger" json:"bogo_trigger,omitempty"`
-	BogoReward       uint32 `protobuf:"varint,22,opt,name=bogo_reward,json=bogoReward" json:"bogo_reward,omitempty"`
-	LoyaltyTrigger   uint32 `protobuf:"varint,23,opt,name=loyalty_trigger,json=loyaltyTrigger" json:"loyalty_trigger,omitempty"`
-	LoyaltyReward    uint32 `protobuf:"varint,24,opt,name=loyalty_reward,json=loyaltyReward" json:"loyalty_reward,omitempty"`
-}
-
-func (m *SaleDescriptor) Reset()                    { *m = SaleDescriptor{} }
-func (m *SaleDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*SaleDescriptor) ProtoMessage()               {}
-func (*SaleDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor21, []int{0} }
-
-func (m *SaleDescriptor) GetType() SaleType {
-	if m != nil {
-		return m.Type
-	}
-	return SaleType_PERCENTAGE
-}
-
-func (m *SaleDescriptor) GetEffective() uint64 {
-	if m != nil {
-		return m.Effective
-	}
-	return 0
-}
-
-func (m *SaleDescriptor) GetExpiration() uint64 {
-	if m != nil {
-		return m.Expiration
-	}
-	return 0
-}
-
-func (m *SaleDescriptor) GetPercentageAmount() uint32 {
-	if m != nil {
-		return m.PercentageAmount
-	}
-	return 0
-}
-
-func (m *SaleDescriptor) GetBogoTrigger() uint32 {
-	if m != nil {
-		return m.BogoTrigger
-	}
-	return 0
-}
-
-func (m *SaleDescriptor) GetBogoReward() uint32 {
-	if m != nil {
-		return m.BogoReward
-	}
-	return 0
-}
-
-func (m *SaleDescriptor) GetLoyaltyTrigger() uint32 {
-	if m != nil {
-		return m.LoyaltyTrigger
-	}
-	return 0
-}
-
-func (m *SaleDescriptor) GetLoyaltyReward() uint32 {
-	if m != nil {
-		return m.LoyaltyReward
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*SaleDescriptor)(nil), "SaleDescriptor")
-	proto.RegisterEnum("SaleType", SaleType_name, SaleType_value)
-}
-
-func init() { proto.RegisterFile("structs/pricing/SaleDescriptor.proto", fileDescriptor21) }
-
-var fileDescriptor21 = []byte{
-	// 333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd1, 0x4f, 0x4f, 0xfa, 0x30,
-	0x1c, 0x06, 0xf0, 0x5f, 0xf9, 0x11, 0x85, 0x2f, 0x32, 0x66, 0xe3, 0x9f, 0x1d, 0xfc, 0x03, 0x46,
-	0x23, 0xd1, 0x64, 0x44, 0x3d, 0x7a, 0x02, 0x21, 0x78, 0x20, 0x42, 0xe6, 0x2e, 0x9c, 0xc8, 0x56,
-	0xbe, 0xcc, 0x26, 0x63, 0x5d, 0xba, 0xa2, 0xec, 0x4d, 0xf9, 0xfa, 0x3c, 0x9a, 0x75, 0x4c, 0xf4,
-	0xd8, 0xcf, 0xf3, 0xe4, 0x49, 0xda, 0xc2, 0x65, 0xa2, 0xe4, 0x8a, 0xa9, 0xa4, 0x13, 0x4b, 0xce,
-	0x78, 0x14, 0x74, 0x5e, 0xbd, 0x10, 0xfb, 0x98, 0x30, 0xc9, 0x63, 0x25, 0xa4, 0x1d, 0x4b, 0xa1,
-	0xc4, 0xc5, 0x67, 0x09, 0x8c, 0xbf, 0x01, 0x3d, 0x85, 0xb2, 0x4a, 0x63, 0xb4, 0x48, 0x93, 0xb4,
-	0x8d, 0xfb, 0xaa, 0x9d, 0xc5, 0x6e, 0x1a, 0xa3, 0xa3, 0x99, 0x9e, 0x40, 0x15, 0x17, 0x0b, 0x64,
-	0x8a, 0xbf, 0xa3, 0x55, 0x6a, 0x92, 0x76, 0xd9, 0xd9, 0x02, 0x3d, 0x03, 0xc0, 0x75, 0xcc, 0xa5,
-	0xa7, 0xb8, 0x88, 0xac, 0xff, 0x3a, 0xfe, 0x25, 0xf4, 0x16, 0xf6, 0x63, 0x94, 0x0c, 0x23, 0xe5,
-	0x05, 0x38, 0xf3, 0x96, 0x62, 0x15, 0x29, 0xeb, 0xa0, 0x49, 0xda, 0x75, 0xc7, 0xdc, 0x06, 0x5d,
-	0xed, 0xb4, 0x05, 0x7b, 0xbe, 0x08, 0xc4, 0x4c, 0x49, 0x1e, 0x04, 0x28, 0xad, 0x43, 0xdd, 0xab,
-	0x65, 0xe6, 0xe6, 0x44, 0xcf, 0x41, 0x1f, 0x67, 0x12, 0x3f, 0x3c, 0x39, 0xb7, 0x8e, 0x74, 0x03,
-	0x32, 0x72, 0xb4, 0xd0, 0x6b, 0x68, 0x84, 0x22, 0xf5, 0x42, 0x95, 0xfe, 0xcc, 0x1c, 0xeb, 0x92,
-	0xb1, 0xe1, 0x62, 0xe9, 0x0a, 0x0a, 0x29, 0xc6, 0x2c, 0xdd, 0xab, 0x6f, 0x34, 0xdf, 0xbb, 0xb9,
-	0x83, 0x4a, 0xf1, 0x20, 0xd4, 0x00, 0x98, 0x0c, 0x9c, 0xa7, 0xc1, 0x8b, 0xdb, 0x1d, 0x0e, 0xcc,
-	0x7f, 0xb4, 0x02, 0xe5, 0xde, 0x78, 0x38, 0x36, 0x09, 0xad, 0xc1, 0xee, 0x68, 0x3c, 0xed, 0x8e,
-	0xdc, 0xa9, 0x59, 0xea, 0x3d, 0x42, 0x8b, 0x0b, 0xdb, 0x0f, 0x85, 0x58, 0xfa, 0x62, 0x6d, 0x27,
-	0xec, 0x0d, 0x97, 0x5e, 0xf6, 0xfe, 0xf3, 0x15, 0x53, 0x76, 0xfe, 0x4d, 0xbd, 0xc6, 0x24, 0x3f,
-	0xf7, 0x79, 0xc2, 0xb2, 0xcb, 0x3f, 0x93, 0x09, 0xf9, 0x22, 0xc4, 0xdf, 0xd1, 0xff, 0xf4, 0xf0,
-	0x1d, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xc8, 0xd6, 0x12, 0xcf, 0x01, 0x00, 0x00,
-}
diff --git a/languages/java/io/bloombox/schema/base/BaseCompression.java b/languages/java/io/bloombox/schema/base/BaseCompression.java
deleted file mode 100644
index 9d4d2ae..0000000
--- a/languages/java/io/bloombox/schema/base/BaseCompression.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-package io.bloombox.schema.base;
-
-public final class BaseCompression {
-  private BaseCompression() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Compression_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Compression_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026base/Compression.proto\"Q\n\013Compression\022" +
-      "\017\n\007enabled\030\001 \001(\010\022\037\n\004type\030\002 \001(\0162\021.Compres" +
-      "sion.Type\"\020\n\004Type\022\010\n\004GZIP\020\000B1\n\027io.bloomb" +
-      "ox.schema.baseB\017BaseCompressionH\001P\001\370\001\001b\006" +
-      "proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_Compression_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Compression_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Compression_descriptor,
-        new java.lang.String[] { "Enabled", "Type", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/BaseLanguage.java b/languages/java/io/bloombox/schema/base/BaseLanguage.java
deleted file mode 100644
index c111d88..0000000
--- a/languages/java/io/bloombox/schema/base/BaseLanguage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-package io.bloombox.schema.base;
-
-public final class BaseLanguage {
-  private BaseLanguage() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\023base/Language.proto*0\n\010Language\022\013\n\007ENG" +
-      "LISH\020\000\022\013\n\007SPANISH\020\001\022\n\n\006FRENCH\020\002B.\n\027io.bl" +
-      "oombox.schema.baseB\014BaseLanguageH\001P\001\370\001\001b" +
-      "\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/BaseProduct.java b/languages/java/io/bloombox/schema/base/BaseProduct.java
deleted file mode 100644
index 22c4a0e..0000000
--- a/languages/java/io/bloombox/schema/base/BaseProduct.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-package io.bloombox.schema.base;
-
-public final class BaseProduct {
-  private BaseProduct() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Product_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Product_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\rProduct.proto\032\025base/ProductKey.proto\032\026" +
-      "base/ProductType.proto\032\031google/protobuf/" +
-      "any.proto\"c\n\007Product\022\030\n\003key\030\001 \001(\0132\013.Prod" +
-      "uctKey\022\032\n\004type\030\002 \001(\0132\014.ProductType\022\"\n\004da" +
-      "ta\030\003 \001(\0132\024.google.protobuf.AnyB-\n\027io.blo" +
-      "ombox.schema.baseB\013BaseProductH\001P\001\370\001\001b\006p" +
-      "roto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.BaseProductKey.getDescriptor(),
-          io.bloombox.schema.base.BaseProductType.getDescriptor(),
-          com.google.protobuf.AnyProto.getDescriptor(),
-        }, assigner);
-    internal_static_Product_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Product_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Product_descriptor,
-        new java.lang.String[] { "Key", "Type", "Data", });
-    io.bloombox.schema.base.BaseProductKey.getDescriptor();
-    io.bloombox.schema.base.BaseProductType.getDescriptor();
-    com.google.protobuf.AnyProto.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/BaseProductKey.java b/languages/java/io/bloombox/schema/base/BaseProductKey.java
deleted file mode 100644
index 6105da9..0000000
--- a/languages/java/io/bloombox/schema/base/BaseProductKey.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-package io.bloombox.schema.base;
-
-public final class BaseProductKey {
-  private BaseProductKey() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductKey_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025base/ProductKey.proto\"\030\n\nProductKey\022\n\n" +
-      "\002id\030\001 \001(\tB0\n\027io.bloombox.schema.baseB\016Ba" +
-      "seProductKeyH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_ProductKey_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductKey_descriptor,
-        new java.lang.String[] { "Id", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/BaseProductKind.java b/languages/java/io/bloombox/schema/base/BaseProductKind.java
deleted file mode 100644
index 0c93192..0000000
--- a/languages/java/io/bloombox/schema/base/BaseProductKind.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-package io.bloombox.schema.base;
-
-public final class BaseProductKind {
-  private BaseProductKind() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026base/ProductKind.proto*\200\001\n\013ProductKind" +
-      "\022\013\n\007FLOWERS\020\000\022\013\n\007EDIBLES\020\001\022\014\n\010EXTRACTS\020\002" +
-      "\022\014\n\010PREROLLS\020\003\022\016\n\nAPOTHECARY\020\004\022\016\n\nCARTRI" +
-      "DGES\020\005\022\n\n\006PLANTS\020\006\022\017\n\013MERCHANDISE\020\007B1\n\027i" +
-      "o.bloombox.schema.baseB\017BaseProductKindH" +
-      "\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/BaseProductType.java b/languages/java/io/bloombox/schema/base/BaseProductType.java
deleted file mode 100644
index 13be6fe..0000000
--- a/languages/java/io/bloombox/schema/base/BaseProductType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-package io.bloombox.schema.base;
-
-public final class BaseProductType {
-  private BaseProductType() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductType_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026base/ProductType.proto\032\026base/ProductKi" +
-      "nd.proto\")\n\013ProductType\022\032\n\004kind\030\001 \001(\0162\014." +
-      "ProductKindB1\n\027io.bloombox.schema.baseB\017" +
-      "BaseProductTypeH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.BaseProductKind.getDescriptor(),
-        }, assigner);
-    internal_static_ProductType_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductType_descriptor,
-        new java.lang.String[] { "Kind", });
-    io.bloombox.schema.base.BaseProductKind.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/Compression.java b/languages/java/io/bloombox/schema/base/Compression.java
deleted file mode 100644
index eda8b63..0000000
--- a/languages/java/io/bloombox/schema/base/Compression.java
+++ /dev/null
@@ -1,617 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-package io.bloombox.schema.base;
-
-/**
- * Protobuf type {@code Compression}
- */
-public  final class Compression extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Compression)
-    CompressionOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Compression.newBuilder() to construct.
-  private Compression(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Compression() {
-    enabled_ = false;
-    type_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Compression(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            enabled_ = input.readBool();
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
-
-            type_ = rawValue;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.base.BaseCompression.internal_static_Compression_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.base.BaseCompression.internal_static_Compression_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.base.Compression.class, io.bloombox.schema.base.Compression.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code Compression.Type}
-   */
-  public enum Type
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>GZIP = 0;</code>
-     */
-    GZIP(0),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>GZIP = 0;</code>
-     */
-    public static final int GZIP_VALUE = 0;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static Type valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static Type forNumber(int value) {
-      switch (value) {
-        case 0: return GZIP;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<Type>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Type> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<Type>() {
-            public Type findValueByNumber(int number) {
-              return Type.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.base.Compression.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final Type[] VALUES = values();
-
-    public static Type valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private Type(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:Compression.Type)
-  }
-
-  public static final int ENABLED_FIELD_NUMBER = 1;
-  private boolean enabled_;
-  /**
-   * <code>bool enabled = 1;</code>
-   */
-  public boolean getEnabled() {
-    return enabled_;
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 2;
-  private int type_;
-  /**
-   * <code>.Compression.Type type = 2;</code>
-   */
-  public int getTypeValue() {
-    return type_;
-  }
-  /**
-   * <code>.Compression.Type type = 2;</code>
-   */
-  public io.bloombox.schema.base.Compression.Type getType() {
-    io.bloombox.schema.base.Compression.Type result = io.bloombox.schema.base.Compression.Type.valueOf(type_);
-    return result == null ? io.bloombox.schema.base.Compression.Type.UNRECOGNIZED : result;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (enabled_ != false) {
-      output.writeBool(1, enabled_);
-    }
-    if (type_ != io.bloombox.schema.base.Compression.Type.GZIP.getNumber()) {
-      output.writeEnum(2, type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (enabled_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(1, enabled_);
-    }
-    if (type_ != io.bloombox.schema.base.Compression.Type.GZIP.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.base.Compression)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.base.Compression other = (io.bloombox.schema.base.Compression) obj;
-
-    boolean result = true;
-    result = result && (getEnabled()
-        == other.getEnabled());
-    result = result && type_ == other.type_;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + ENABLED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getEnabled());
-    hash = (37 * hash) + TYPE_FIELD_NUMBER;
-    hash = (53 * hash) + type_;
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.base.Compression parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Compression parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.Compression parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.Compression parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.base.Compression prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code Compression}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Compression)
-      io.bloombox.schema.base.CompressionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.base.BaseCompression.internal_static_Compression_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.base.BaseCompression.internal_static_Compression_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.base.Compression.class, io.bloombox.schema.base.Compression.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.base.Compression.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      enabled_ = false;
-
-      type_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.base.BaseCompression.internal_static_Compression_descriptor;
-    }
-
-    public io.bloombox.schema.base.Compression getDefaultInstanceForType() {
-      return io.bloombox.schema.base.Compression.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.base.Compression build() {
-      io.bloombox.schema.base.Compression result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.base.Compression buildPartial() {
-      io.bloombox.schema.base.Compression result = new io.bloombox.schema.base.Compression(this);
-      result.enabled_ = enabled_;
-      result.type_ = type_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.base.Compression) {
-        return mergeFrom((io.bloombox.schema.base.Compression)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.base.Compression other) {
-      if (other == io.bloombox.schema.base.Compression.getDefaultInstance()) return this;
-      if (other.getEnabled() != false) {
-        setEnabled(other.getEnabled());
-      }
-      if (other.type_ != 0) {
-        setTypeValue(other.getTypeValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.base.Compression parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.base.Compression) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private boolean enabled_ ;
-    /**
-     * <code>bool enabled = 1;</code>
-     */
-    public boolean getEnabled() {
-      return enabled_;
-    }
-    /**
-     * <code>bool enabled = 1;</code>
-     */
-    public Builder setEnabled(boolean value) {
-      
-      enabled_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool enabled = 1;</code>
-     */
-    public Builder clearEnabled() {
-      
-      enabled_ = false;
-      onChanged();
-      return this;
-    }
-
-    private int type_ = 0;
-    /**
-     * <code>.Compression.Type type = 2;</code>
-     */
-    public int getTypeValue() {
-      return type_;
-    }
-    /**
-     * <code>.Compression.Type type = 2;</code>
-     */
-    public Builder setTypeValue(int value) {
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Compression.Type type = 2;</code>
-     */
-    public io.bloombox.schema.base.Compression.Type getType() {
-      io.bloombox.schema.base.Compression.Type result = io.bloombox.schema.base.Compression.Type.valueOf(type_);
-      return result == null ? io.bloombox.schema.base.Compression.Type.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.Compression.Type type = 2;</code>
-     */
-    public Builder setType(io.bloombox.schema.base.Compression.Type value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      type_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Compression.Type type = 2;</code>
-     */
-    public Builder clearType() {
-      
-      type_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Compression)
-  }
-
-  // @@protoc_insertion_point(class_scope:Compression)
-  private static final io.bloombox.schema.base.Compression DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.base.Compression();
-  }
-
-  public static io.bloombox.schema.base.Compression getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Compression>
-      PARSER = new com.google.protobuf.AbstractParser<Compression>() {
-    public Compression parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Compression(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Compression> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Compression> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.base.Compression getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/base/CompressionOrBuilder.java b/languages/java/io/bloombox/schema/base/CompressionOrBuilder.java
deleted file mode 100644
index 7d2e9bd..0000000
--- a/languages/java/io/bloombox/schema/base/CompressionOrBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-package io.bloombox.schema.base;
-
-public interface CompressionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Compression)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>bool enabled = 1;</code>
-   */
-  boolean getEnabled();
-
-  /**
-   * <code>.Compression.Type type = 2;</code>
-   */
-  int getTypeValue();
-  /**
-   * <code>.Compression.Type type = 2;</code>
-   */
-  io.bloombox.schema.base.Compression.Type getType();
-}
diff --git a/languages/java/io/bloombox/schema/base/CompressionOuterClass.java b/languages/java/io/bloombox/schema/base/CompressionOuterClass.java
deleted file mode 100644
index 62a25c0..0000000
--- a/languages/java/io/bloombox/schema/base/CompressionOuterClass.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-package io.bloombox.schema.base;
-
-public final class CompressionOuterClass {
-  private CompressionOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Compression_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Compression_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026base/Compression.proto\"Q\n\013Compression\022" +
-      "\017\n\007enabled\030\001 \001(\010\022\037\n\004type\030\002 \001(\0162\021.Compres" +
-      "sion.Type\"\020\n\004Type\022\010\n\004GZIP\020\000B\033\n\027io.bloomb" +
-      "ox.schema.baseP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_Compression_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Compression_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Compression_descriptor,
-        new java.lang.String[] { "Enabled", "Type", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/Language.java b/languages/java/io/bloombox/schema/base/Language.java
deleted file mode 100644
index 9805331..0000000
--- a/languages/java/io/bloombox/schema/base/Language.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-package io.bloombox.schema.base;
-
-/**
- * Protobuf enum {@code Language}
- */
-public enum Language
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>ENGLISH = 0;</code>
-   */
-  ENGLISH(0),
-  /**
-   * <code>SPANISH = 1;</code>
-   */
-  SPANISH(1),
-  /**
-   * <code>FRENCH = 2;</code>
-   */
-  FRENCH(2),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>ENGLISH = 0;</code>
-   */
-  public static final int ENGLISH_VALUE = 0;
-  /**
-   * <code>SPANISH = 1;</code>
-   */
-  public static final int SPANISH_VALUE = 1;
-  /**
-   * <code>FRENCH = 2;</code>
-   */
-  public static final int FRENCH_VALUE = 2;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static Language valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static Language forNumber(int value) {
-    switch (value) {
-      case 0: return ENGLISH;
-      case 1: return SPANISH;
-      case 2: return FRENCH;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<Language>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      Language> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<Language>() {
-          public Language findValueByNumber(int number) {
-            return Language.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.base.BaseLanguage.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final Language[] VALUES = values();
-
-  public static Language valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private Language(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:Language)
-}
-
diff --git a/languages/java/io/bloombox/schema/base/LanguageOuterClass.java b/languages/java/io/bloombox/schema/base/LanguageOuterClass.java
deleted file mode 100644
index 78d995c..0000000
--- a/languages/java/io/bloombox/schema/base/LanguageOuterClass.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-package io.bloombox.schema.base;
-
-public final class LanguageOuterClass {
-  private LanguageOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\023base/Language.proto*0\n\010Language\022\013\n\007ENG" +
-      "LISH\020\000\022\013\n\007SPANISH\020\001\022\n\n\006FRENCH\020\002B\033\n\027io.bl" +
-      "oombox.schema.baseP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/Product.java b/languages/java/io/bloombox/schema/base/Product.java
deleted file mode 100644
index 064eb54..0000000
--- a/languages/java/io/bloombox/schema/base/Product.java
+++ /dev/null
@@ -1,937 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-package io.bloombox.schema.base;
-
-/**
- * <pre>
- * -- Product Type: Top-level -- //
- * </pre>
- *
- * Protobuf type {@code Product}
- */
-public  final class Product extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Product)
-    ProductOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Product.newBuilder() to construct.
-  private Product(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Product() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Product(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            io.bloombox.schema.base.ProductKey.Builder subBuilder = null;
-            if (key_ != null) {
-              subBuilder = key_.toBuilder();
-            }
-            key_ = input.readMessage(io.bloombox.schema.base.ProductKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(key_);
-              key_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.base.ProductType.Builder subBuilder = null;
-            if (type_ != null) {
-              subBuilder = type_.toBuilder();
-            }
-            type_ = input.readMessage(io.bloombox.schema.base.ProductType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(type_);
-              type_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            com.google.protobuf.Any.Builder subBuilder = null;
-            if (data_ != null) {
-              subBuilder = data_.toBuilder();
-            }
-            data_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(data_);
-              data_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.base.BaseProduct.internal_static_Product_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.base.BaseProduct.internal_static_Product_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.base.Product.class, io.bloombox.schema.base.Product.Builder.class);
-  }
-
-  public static final int KEY_FIELD_NUMBER = 1;
-  private io.bloombox.schema.base.ProductKey key_;
-  /**
-   * <code>.ProductKey key = 1;</code>
-   */
-  public boolean hasKey() {
-    return key_ != null;
-  }
-  /**
-   * <code>.ProductKey key = 1;</code>
-   */
-  public io.bloombox.schema.base.ProductKey getKey() {
-    return key_ == null ? io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-  }
-  /**
-   * <code>.ProductKey key = 1;</code>
-   */
-  public io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder() {
-    return getKey();
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 2;
-  private io.bloombox.schema.base.ProductType type_;
-  /**
-   * <code>.ProductType type = 2;</code>
-   */
-  public boolean hasType() {
-    return type_ != null;
-  }
-  /**
-   * <code>.ProductType type = 2;</code>
-   */
-  public io.bloombox.schema.base.ProductType getType() {
-    return type_ == null ? io.bloombox.schema.base.ProductType.getDefaultInstance() : type_;
-  }
-  /**
-   * <code>.ProductType type = 2;</code>
-   */
-  public io.bloombox.schema.base.ProductTypeOrBuilder getTypeOrBuilder() {
-    return getType();
-  }
-
-  public static final int DATA_FIELD_NUMBER = 3;
-  private com.google.protobuf.Any data_;
-  /**
-   * <code>.google.protobuf.Any data = 3;</code>
-   */
-  public boolean hasData() {
-    return data_ != null;
-  }
-  /**
-   * <code>.google.protobuf.Any data = 3;</code>
-   */
-  public com.google.protobuf.Any getData() {
-    return data_ == null ? com.google.protobuf.Any.getDefaultInstance() : data_;
-  }
-  /**
-   * <code>.google.protobuf.Any data = 3;</code>
-   */
-  public com.google.protobuf.AnyOrBuilder getDataOrBuilder() {
-    return getData();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (key_ != null) {
-      output.writeMessage(1, getKey());
-    }
-    if (type_ != null) {
-      output.writeMessage(2, getType());
-    }
-    if (data_ != null) {
-      output.writeMessage(3, getData());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (key_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getKey());
-    }
-    if (type_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getType());
-    }
-    if (data_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getData());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.base.Product)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.base.Product other = (io.bloombox.schema.base.Product) obj;
-
-    boolean result = true;
-    result = result && (hasKey() == other.hasKey());
-    if (hasKey()) {
-      result = result && getKey()
-          .equals(other.getKey());
-    }
-    result = result && (hasType() == other.hasType());
-    if (hasType()) {
-      result = result && getType()
-          .equals(other.getType());
-    }
-    result = result && (hasData() == other.hasData());
-    if (hasData()) {
-      result = result && getData()
-          .equals(other.getData());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasKey()) {
-      hash = (37 * hash) + KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getKey().hashCode();
-    }
-    if (hasType()) {
-      hash = (37 * hash) + TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getType().hashCode();
-    }
-    if (hasData()) {
-      hash = (37 * hash) + DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getData().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.base.Product parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Product parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.Product parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.Product parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.base.Product prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Product Type: Top-level -- //
-   * </pre>
-   *
-   * Protobuf type {@code Product}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Product)
-      io.bloombox.schema.base.ProductOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.base.BaseProduct.internal_static_Product_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.base.BaseProduct.internal_static_Product_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.base.Product.class, io.bloombox.schema.base.Product.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.base.Product.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (keyBuilder_ == null) {
-        key_ = null;
-      } else {
-        key_ = null;
-        keyBuilder_ = null;
-      }
-      if (typeBuilder_ == null) {
-        type_ = null;
-      } else {
-        type_ = null;
-        typeBuilder_ = null;
-      }
-      if (dataBuilder_ == null) {
-        data_ = null;
-      } else {
-        data_ = null;
-        dataBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.base.BaseProduct.internal_static_Product_descriptor;
-    }
-
-    public io.bloombox.schema.base.Product getDefaultInstanceForType() {
-      return io.bloombox.schema.base.Product.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.base.Product build() {
-      io.bloombox.schema.base.Product result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.base.Product buildPartial() {
-      io.bloombox.schema.base.Product result = new io.bloombox.schema.base.Product(this);
-      if (keyBuilder_ == null) {
-        result.key_ = key_;
-      } else {
-        result.key_ = keyBuilder_.build();
-      }
-      if (typeBuilder_ == null) {
-        result.type_ = type_;
-      } else {
-        result.type_ = typeBuilder_.build();
-      }
-      if (dataBuilder_ == null) {
-        result.data_ = data_;
-      } else {
-        result.data_ = dataBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.base.Product) {
-        return mergeFrom((io.bloombox.schema.base.Product)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.base.Product other) {
-      if (other == io.bloombox.schema.base.Product.getDefaultInstance()) return this;
-      if (other.hasKey()) {
-        mergeKey(other.getKey());
-      }
-      if (other.hasType()) {
-        mergeType(other.getType());
-      }
-      if (other.hasData()) {
-        mergeData(other.getData());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.base.Product parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.base.Product) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private io.bloombox.schema.base.ProductKey key_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder> keyBuilder_;
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public boolean hasKey() {
-      return keyBuilder_ != null || key_ != null;
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKey getKey() {
-      if (keyBuilder_ == null) {
-        return key_ == null ? io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-      } else {
-        return keyBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public Builder setKey(io.bloombox.schema.base.ProductKey value) {
-      if (keyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        key_ = value;
-        onChanged();
-      } else {
-        keyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public Builder setKey(
-        io.bloombox.schema.base.ProductKey.Builder builderForValue) {
-      if (keyBuilder_ == null) {
-        key_ = builderForValue.build();
-        onChanged();
-      } else {
-        keyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public Builder mergeKey(io.bloombox.schema.base.ProductKey value) {
-      if (keyBuilder_ == null) {
-        if (key_ != null) {
-          key_ =
-            io.bloombox.schema.base.ProductKey.newBuilder(key_).mergeFrom(value).buildPartial();
-        } else {
-          key_ = value;
-        }
-        onChanged();
-      } else {
-        keyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public Builder clearKey() {
-      if (keyBuilder_ == null) {
-        key_ = null;
-        onChanged();
-      } else {
-        key_ = null;
-        keyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKey.Builder getKeyBuilder() {
-      
-      onChanged();
-      return getKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder() {
-      if (keyBuilder_ != null) {
-        return keyBuilder_.getMessageOrBuilder();
-      } else {
-        return key_ == null ?
-            io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-      }
-    }
-    /**
-     * <code>.ProductKey key = 1;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder> 
-        getKeyFieldBuilder() {
-      if (keyBuilder_ == null) {
-        keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder>(
-                getKey(),
-                getParentForChildren(),
-                isClean());
-        key_ = null;
-      }
-      return keyBuilder_;
-    }
-
-    private io.bloombox.schema.base.ProductType type_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.base.ProductType, io.bloombox.schema.base.ProductType.Builder, io.bloombox.schema.base.ProductTypeOrBuilder> typeBuilder_;
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public boolean hasType() {
-      return typeBuilder_ != null || type_ != null;
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public io.bloombox.schema.base.ProductType getType() {
-      if (typeBuilder_ == null) {
-        return type_ == null ? io.bloombox.schema.base.ProductType.getDefaultInstance() : type_;
-      } else {
-        return typeBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public Builder setType(io.bloombox.schema.base.ProductType value) {
-      if (typeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        typeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public Builder setType(
-        io.bloombox.schema.base.ProductType.Builder builderForValue) {
-      if (typeBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        typeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public Builder mergeType(io.bloombox.schema.base.ProductType value) {
-      if (typeBuilder_ == null) {
-        if (type_ != null) {
-          type_ =
-            io.bloombox.schema.base.ProductType.newBuilder(type_).mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        typeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public Builder clearType() {
-      if (typeBuilder_ == null) {
-        type_ = null;
-        onChanged();
-      } else {
-        type_ = null;
-        typeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public io.bloombox.schema.base.ProductType.Builder getTypeBuilder() {
-      
-      onChanged();
-      return getTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    public io.bloombox.schema.base.ProductTypeOrBuilder getTypeOrBuilder() {
-      if (typeBuilder_ != null) {
-        return typeBuilder_.getMessageOrBuilder();
-      } else {
-        return type_ == null ?
-            io.bloombox.schema.base.ProductType.getDefaultInstance() : type_;
-      }
-    }
-    /**
-     * <code>.ProductType type = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.base.ProductType, io.bloombox.schema.base.ProductType.Builder, io.bloombox.schema.base.ProductTypeOrBuilder> 
-        getTypeFieldBuilder() {
-      if (typeBuilder_ == null) {
-        typeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.base.ProductType, io.bloombox.schema.base.ProductType.Builder, io.bloombox.schema.base.ProductTypeOrBuilder>(
-                getType(),
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      return typeBuilder_;
-    }
-
-    private com.google.protobuf.Any data_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> dataBuilder_;
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public boolean hasData() {
-      return dataBuilder_ != null || data_ != null;
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public com.google.protobuf.Any getData() {
-      if (dataBuilder_ == null) {
-        return data_ == null ? com.google.protobuf.Any.getDefaultInstance() : data_;
-      } else {
-        return dataBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public Builder setData(com.google.protobuf.Any value) {
-      if (dataBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        data_ = value;
-        onChanged();
-      } else {
-        dataBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public Builder setData(
-        com.google.protobuf.Any.Builder builderForValue) {
-      if (dataBuilder_ == null) {
-        data_ = builderForValue.build();
-        onChanged();
-      } else {
-        dataBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public Builder mergeData(com.google.protobuf.Any value) {
-      if (dataBuilder_ == null) {
-        if (data_ != null) {
-          data_ =
-            com.google.protobuf.Any.newBuilder(data_).mergeFrom(value).buildPartial();
-        } else {
-          data_ = value;
-        }
-        onChanged();
-      } else {
-        dataBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public Builder clearData() {
-      if (dataBuilder_ == null) {
-        data_ = null;
-        onChanged();
-      } else {
-        data_ = null;
-        dataBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public com.google.protobuf.Any.Builder getDataBuilder() {
-      
-      onChanged();
-      return getDataFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    public com.google.protobuf.AnyOrBuilder getDataOrBuilder() {
-      if (dataBuilder_ != null) {
-        return dataBuilder_.getMessageOrBuilder();
-      } else {
-        return data_ == null ?
-            com.google.protobuf.Any.getDefaultInstance() : data_;
-      }
-    }
-    /**
-     * <code>.google.protobuf.Any data = 3;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> 
-        getDataFieldBuilder() {
-      if (dataBuilder_ == null) {
-        dataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder>(
-                getData(),
-                getParentForChildren(),
-                isClean());
-        data_ = null;
-      }
-      return dataBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Product)
-  }
-
-  // @@protoc_insertion_point(class_scope:Product)
-  private static final io.bloombox.schema.base.Product DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.base.Product();
-  }
-
-  public static io.bloombox.schema.base.Product getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Product>
-      PARSER = new com.google.protobuf.AbstractParser<Product>() {
-    public Product parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Product(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Product> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Product> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.base.Product getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/base/ProductKey.java b/languages/java/io/bloombox/schema/base/ProductKey.java
deleted file mode 100644
index 7980407..0000000
--- a/languages/java/io/bloombox/schema/base/ProductKey.java
+++ /dev/null
@@ -1,513 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-package io.bloombox.schema.base;
-
-/**
- * Protobuf type {@code ProductKey}
- */
-public  final class ProductKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ProductKey)
-    ProductKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ProductKey.newBuilder() to construct.
-  private ProductKey(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ProductKey() {
-    id_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ProductKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            id_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.base.BaseProductKey.internal_static_ProductKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.base.BaseProductKey.internal_static_ProductKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.base.ProductKey.class, io.bloombox.schema.base.ProductKey.Builder.class);
-  }
-
-  public static final int ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object id_;
-  /**
-   * <code>string id = 1;</code>
-   */
-  public java.lang.String getId() {
-    java.lang.Object ref = id_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      id_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string id = 1;</code>
-   */
-  public com.google.protobuf.ByteString
-      getIdBytes() {
-    java.lang.Object ref = id_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      id_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.base.ProductKey)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.base.ProductKey other = (io.bloombox.schema.base.ProductKey) obj;
-
-    boolean result = true;
-    result = result && getId()
-        .equals(other.getId());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + ID_FIELD_NUMBER;
-    hash = (53 * hash) + getId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.ProductKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.ProductKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.base.ProductKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code ProductKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ProductKey)
-      io.bloombox.schema.base.ProductKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.base.BaseProductKey.internal_static_ProductKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.base.BaseProductKey.internal_static_ProductKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.base.ProductKey.class, io.bloombox.schema.base.ProductKey.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.base.ProductKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      id_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.base.BaseProductKey.internal_static_ProductKey_descriptor;
-    }
-
-    public io.bloombox.schema.base.ProductKey getDefaultInstanceForType() {
-      return io.bloombox.schema.base.ProductKey.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.base.ProductKey build() {
-      io.bloombox.schema.base.ProductKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.base.ProductKey buildPartial() {
-      io.bloombox.schema.base.ProductKey result = new io.bloombox.schema.base.ProductKey(this);
-      result.id_ = id_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.base.ProductKey) {
-        return mergeFrom((io.bloombox.schema.base.ProductKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.base.ProductKey other) {
-      if (other == io.bloombox.schema.base.ProductKey.getDefaultInstance()) return this;
-      if (!other.getId().isEmpty()) {
-        id_ = other.id_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.base.ProductKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.base.ProductKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object id_ = "";
-    /**
-     * <code>string id = 1;</code>
-     */
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        id_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        id_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public Builder setId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      id_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public Builder clearId() {
-      
-      id_ = getDefaultInstance().getId();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public Builder setIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      id_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ProductKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:ProductKey)
-  private static final io.bloombox.schema.base.ProductKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.base.ProductKey();
-  }
-
-  public static io.bloombox.schema.base.ProductKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ProductKey>
-      PARSER = new com.google.protobuf.AbstractParser<ProductKey>() {
-    public ProductKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ProductKey> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ProductKey> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.base.ProductKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/base/ProductKeyOrBuilder.java b/languages/java/io/bloombox/schema/base/ProductKeyOrBuilder.java
deleted file mode 100644
index 8893d57..0000000
--- a/languages/java/io/bloombox/schema/base/ProductKeyOrBuilder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-package io.bloombox.schema.base;
-
-public interface ProductKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ProductKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>string id = 1;</code>
-   */
-  java.lang.String getId();
-  /**
-   * <code>string id = 1;</code>
-   */
-  com.google.protobuf.ByteString
-      getIdBytes();
-}
diff --git a/languages/java/io/bloombox/schema/base/ProductKeyOuterClass.java b/languages/java/io/bloombox/schema/base/ProductKeyOuterClass.java
deleted file mode 100644
index 86db9fc..0000000
--- a/languages/java/io/bloombox/schema/base/ProductKeyOuterClass.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-package io.bloombox.schema.base;
-
-public final class ProductKeyOuterClass {
-  private ProductKeyOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductKey_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025base/ProductKey.proto\"\030\n\nProductKey\022\n\n" +
-      "\002id\030\001 \001(\tB\033\n\027io.bloombox.schema.baseP\001b\006" +
-      "proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_ProductKey_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductKey_descriptor,
-        new java.lang.String[] { "Id", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/ProductKind.java b/languages/java/io/bloombox/schema/base/ProductKind.java
deleted file mode 100644
index 3c5d37b..0000000
--- a/languages/java/io/bloombox/schema/base/ProductKind.java
+++ /dev/null
@@ -1,157 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-package io.bloombox.schema.base;
-
-/**
- * Protobuf enum {@code ProductKind}
- */
-public enum ProductKind
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>FLOWERS = 0;</code>
-   */
-  FLOWERS(0),
-  /**
-   * <code>EDIBLES = 1;</code>
-   */
-  EDIBLES(1),
-  /**
-   * <code>EXTRACTS = 2;</code>
-   */
-  EXTRACTS(2),
-  /**
-   * <code>PREROLLS = 3;</code>
-   */
-  PREROLLS(3),
-  /**
-   * <code>APOTHECARY = 4;</code>
-   */
-  APOTHECARY(4),
-  /**
-   * <code>CARTRIDGES = 5;</code>
-   */
-  CARTRIDGES(5),
-  /**
-   * <code>PLANTS = 6;</code>
-   */
-  PLANTS(6),
-  /**
-   * <code>MERCHANDISE = 7;</code>
-   */
-  MERCHANDISE(7),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>FLOWERS = 0;</code>
-   */
-  public static final int FLOWERS_VALUE = 0;
-  /**
-   * <code>EDIBLES = 1;</code>
-   */
-  public static final int EDIBLES_VALUE = 1;
-  /**
-   * <code>EXTRACTS = 2;</code>
-   */
-  public static final int EXTRACTS_VALUE = 2;
-  /**
-   * <code>PREROLLS = 3;</code>
-   */
-  public static final int PREROLLS_VALUE = 3;
-  /**
-   * <code>APOTHECARY = 4;</code>
-   */
-  public static final int APOTHECARY_VALUE = 4;
-  /**
-   * <code>CARTRIDGES = 5;</code>
-   */
-  public static final int CARTRIDGES_VALUE = 5;
-  /**
-   * <code>PLANTS = 6;</code>
-   */
-  public static final int PLANTS_VALUE = 6;
-  /**
-   * <code>MERCHANDISE = 7;</code>
-   */
-  public static final int MERCHANDISE_VALUE = 7;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static ProductKind valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static ProductKind forNumber(int value) {
-    switch (value) {
-      case 0: return FLOWERS;
-      case 1: return EDIBLES;
-      case 2: return EXTRACTS;
-      case 3: return PREROLLS;
-      case 4: return APOTHECARY;
-      case 5: return CARTRIDGES;
-      case 6: return PLANTS;
-      case 7: return MERCHANDISE;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<ProductKind>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      ProductKind> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<ProductKind>() {
-          public ProductKind findValueByNumber(int number) {
-            return ProductKind.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.base.BaseProductKind.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final ProductKind[] VALUES = values();
-
-  public static ProductKind valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private ProductKind(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:ProductKind)
-}
-
diff --git a/languages/java/io/bloombox/schema/base/ProductKindOuterClass.java b/languages/java/io/bloombox/schema/base/ProductKindOuterClass.java
deleted file mode 100644
index fcb470c..0000000
--- a/languages/java/io/bloombox/schema/base/ProductKindOuterClass.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-package io.bloombox.schema.base;
-
-public final class ProductKindOuterClass {
-  private ProductKindOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026base/ProductKind.proto*\200\001\n\013ProductKind" +
-      "\022\013\n\007FLOWERS\020\000\022\013\n\007EDIBLES\020\001\022\014\n\010EXTRACTS\020\002" +
-      "\022\014\n\010PREROLLS\020\003\022\016\n\nAPOTHECARY\020\004\022\016\n\nCARTRI" +
-      "DGES\020\005\022\n\n\006PLANTS\020\006\022\017\n\013MERCHANDISE\020\007B\033\n\027i" +
-      "o.bloombox.schema.baseP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/ProductOrBuilder.java b/languages/java/io/bloombox/schema/base/ProductOrBuilder.java
deleted file mode 100644
index 8e96a92..0000000
--- a/languages/java/io/bloombox/schema/base/ProductOrBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-package io.bloombox.schema.base;
-
-public interface ProductOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Product)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.ProductKey key = 1;</code>
-   */
-  boolean hasKey();
-  /**
-   * <code>.ProductKey key = 1;</code>
-   */
-  io.bloombox.schema.base.ProductKey getKey();
-  /**
-   * <code>.ProductKey key = 1;</code>
-   */
-  io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder();
-
-  /**
-   * <code>.ProductType type = 2;</code>
-   */
-  boolean hasType();
-  /**
-   * <code>.ProductType type = 2;</code>
-   */
-  io.bloombox.schema.base.ProductType getType();
-  /**
-   * <code>.ProductType type = 2;</code>
-   */
-  io.bloombox.schema.base.ProductTypeOrBuilder getTypeOrBuilder();
-
-  /**
-   * <code>.google.protobuf.Any data = 3;</code>
-   */
-  boolean hasData();
-  /**
-   * <code>.google.protobuf.Any data = 3;</code>
-   */
-  com.google.protobuf.Any getData();
-  /**
-   * <code>.google.protobuf.Any data = 3;</code>
-   */
-  com.google.protobuf.AnyOrBuilder getDataOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/base/ProductOuterClass.java b/languages/java/io/bloombox/schema/base/ProductOuterClass.java
deleted file mode 100644
index a5add09..0000000
--- a/languages/java/io/bloombox/schema/base/ProductOuterClass.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Product.proto
-
-package io.bloombox.schema.base;
-
-public final class ProductOuterClass {
-  private ProductOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Product_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Product_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\022base/Product.proto\032\025base/ProductKey.pr" +
-      "oto\032\026base/ProductType.proto\032\031google/prot" +
-      "obuf/any.proto\"c\n\007Product\022\030\n\003key\030\001 \001(\0132\013" +
-      ".ProductKey\022\032\n\004type\030\002 \001(\0132\014.ProductType\022" +
-      "\"\n\004data\030\003 \001(\0132\024.google.protobuf.AnyB\033\n\027i" +
-      "o.bloombox.schema.baseP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.ProductKeyOuterClass.getDescriptor(),
-          io.bloombox.schema.base.ProductTypeOuterClass.getDescriptor(),
-          com.google.protobuf.AnyProto.getDescriptor(),
-        }, assigner);
-    internal_static_Product_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Product_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Product_descriptor,
-        new java.lang.String[] { "Key", "Type", "Data", });
-    io.bloombox.schema.base.ProductKeyOuterClass.getDescriptor();
-    io.bloombox.schema.base.ProductTypeOuterClass.getDescriptor();
-    com.google.protobuf.AnyProto.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/base/ProductType.java b/languages/java/io/bloombox/schema/base/ProductType.java
deleted file mode 100644
index 79bf382..0000000
--- a/languages/java/io/bloombox/schema/base/ProductType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-package io.bloombox.schema.base;
-
-/**
- * <pre>
- * -- Product Type: Top-level -- //
- * </pre>
- *
- * Protobuf type {@code ProductType}
- */
-public  final class ProductType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ProductType)
-    ProductTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ProductType.newBuilder() to construct.
-  private ProductType(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ProductType() {
-    kind_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ProductType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            kind_ = rawValue;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.base.BaseProductType.internal_static_ProductType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.base.BaseProductType.internal_static_ProductType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.base.ProductType.class, io.bloombox.schema.base.ProductType.Builder.class);
-  }
-
-  public static final int KIND_FIELD_NUMBER = 1;
-  private int kind_;
-  /**
-   * <code>.ProductKind kind = 1;</code>
-   */
-  public int getKindValue() {
-    return kind_;
-  }
-  /**
-   * <code>.ProductKind kind = 1;</code>
-   */
-  public io.bloombox.schema.base.ProductKind getKind() {
-    io.bloombox.schema.base.ProductKind result = io.bloombox.schema.base.ProductKind.valueOf(kind_);
-    return result == null ? io.bloombox.schema.base.ProductKind.UNRECOGNIZED : result;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (kind_ != io.bloombox.schema.base.ProductKind.FLOWERS.getNumber()) {
-      output.writeEnum(1, kind_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (kind_ != io.bloombox.schema.base.ProductKind.FLOWERS.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, kind_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.base.ProductType)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.base.ProductType other = (io.bloombox.schema.base.ProductType) obj;
-
-    boolean result = true;
-    result = result && kind_ == other.kind_;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + KIND_FIELD_NUMBER;
-    hash = (53 * hash) + kind_;
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.ProductType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.base.ProductType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.base.ProductType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Product Type: Top-level -- //
-   * </pre>
-   *
-   * Protobuf type {@code ProductType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ProductType)
-      io.bloombox.schema.base.ProductTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.base.BaseProductType.internal_static_ProductType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.base.BaseProductType.internal_static_ProductType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.base.ProductType.class, io.bloombox.schema.base.ProductType.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.base.ProductType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      kind_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.base.BaseProductType.internal_static_ProductType_descriptor;
-    }
-
-    public io.bloombox.schema.base.ProductType getDefaultInstanceForType() {
-      return io.bloombox.schema.base.ProductType.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.base.ProductType build() {
-      io.bloombox.schema.base.ProductType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.base.ProductType buildPartial() {
-      io.bloombox.schema.base.ProductType result = new io.bloombox.schema.base.ProductType(this);
-      result.kind_ = kind_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.base.ProductType) {
-        return mergeFrom((io.bloombox.schema.base.ProductType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.base.ProductType other) {
-      if (other == io.bloombox.schema.base.ProductType.getDefaultInstance()) return this;
-      if (other.kind_ != 0) {
-        setKindValue(other.getKindValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.base.ProductType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.base.ProductType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int kind_ = 0;
-    /**
-     * <code>.ProductKind kind = 1;</code>
-     */
-    public int getKindValue() {
-      return kind_;
-    }
-    /**
-     * <code>.ProductKind kind = 1;</code>
-     */
-    public Builder setKindValue(int value) {
-      kind_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.ProductKind kind = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKind getKind() {
-      io.bloombox.schema.base.ProductKind result = io.bloombox.schema.base.ProductKind.valueOf(kind_);
-      return result == null ? io.bloombox.schema.base.ProductKind.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.ProductKind kind = 1;</code>
-     */
-    public Builder setKind(io.bloombox.schema.base.ProductKind value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      kind_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.ProductKind kind = 1;</code>
-     */
-    public Builder clearKind() {
-      
-      kind_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ProductType)
-  }
-
-  // @@protoc_insertion_point(class_scope:ProductType)
-  private static final io.bloombox.schema.base.ProductType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.base.ProductType();
-  }
-
-  public static io.bloombox.schema.base.ProductType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ProductType>
-      PARSER = new com.google.protobuf.AbstractParser<ProductType>() {
-    public ProductType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ProductType> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ProductType> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.base.ProductType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/base/ProductTypeOrBuilder.java b/languages/java/io/bloombox/schema/base/ProductTypeOrBuilder.java
deleted file mode 100644
index 6a6bf69..0000000
--- a/languages/java/io/bloombox/schema/base/ProductTypeOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-package io.bloombox.schema.base;
-
-public interface ProductTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ProductType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.ProductKind kind = 1;</code>
-   */
-  int getKindValue();
-  /**
-   * <code>.ProductKind kind = 1;</code>
-   */
-  io.bloombox.schema.base.ProductKind getKind();
-}
diff --git a/languages/java/io/bloombox/schema/base/ProductTypeOuterClass.java b/languages/java/io/bloombox/schema/base/ProductTypeOuterClass.java
deleted file mode 100644
index aae6455..0000000
--- a/languages/java/io/bloombox/schema/base/ProductTypeOuterClass.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-package io.bloombox.schema.base;
-
-public final class ProductTypeOuterClass {
-  private ProductTypeOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductType_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026base/ProductType.proto\032\026base/ProductKi" +
-      "nd.proto\")\n\013ProductType\022\032\n\004kind\030\001 \001(\0162\014." +
-      "ProductKindB\033\n\027io.bloombox.schema.baseP\001" +
-      "b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.ProductKindOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_ProductType_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductType_descriptor,
-        new java.lang.String[] { "Kind", });
-    io.bloombox.schema.base.ProductKindOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/AttachedContent.java b/languages/java/io/bloombox/schema/content/AttachedContent.java
deleted file mode 100644
index 89daccc..0000000
--- a/languages/java/io/bloombox/schema/content/AttachedContent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-package io.bloombox.schema.content;
-
-public final class AttachedContent {
-  private AttachedContent() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductContent_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductContent_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\034content/ProductContent.proto\032\022content/" +
-      "Name.proto\032\025content/Content.proto\032\023conte" +
-      "nt/Brand.proto\032\025media/MediaItem.proto\"\277\001" +
-      "\n\016ProductContent\022\023\n\004name\030\001 \001(\0132\005.Name\022\031\n" +
-      "\007summary\030\002 \001(\0132\010.Content\022\025\n\005brand\030\003 \001(\0132" +
-      "\006.Brand\022\031\n\005media\030\024 \003(\0132\n.MediaItem\022\027\n\005us" +
-      "age\030\036 \001(\0132\010.Content\022\030\n\006dosage\030\037 \001(\0132\010.Co" +
-      "ntent\022\030\n\006advice\030  \001(\0132\010.ContentB4\n\032io.bl" +
-      "oombox.schema.contentB\017AttachedContentH\001" +
-      "P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.content.NameContent.getDescriptor(),
-          io.bloombox.schema.content.GenericContent.getDescriptor(),
-          io.bloombox.schema.content.BrandContent.getDescriptor(),
-          io.bloombox.schema.media.AttachedMedia.getDescriptor(),
-        }, assigner);
-    internal_static_ProductContent_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductContent_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductContent_descriptor,
-        new java.lang.String[] { "Name", "Summary", "Brand", "Media", "Usage", "Dosage", "Advice", });
-    io.bloombox.schema.content.NameContent.getDescriptor();
-    io.bloombox.schema.content.GenericContent.getDescriptor();
-    io.bloombox.schema.content.BrandContent.getDescriptor();
-    io.bloombox.schema.media.AttachedMedia.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/Brand.java b/languages/java/io/bloombox/schema/content/Brand.java
deleted file mode 100644
index 087705c..0000000
--- a/languages/java/io/bloombox/schema/content/Brand.java
+++ /dev/null
@@ -1,1417 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-package io.bloombox.schema.content;
-
-/**
- * Protobuf type {@code Brand}
- */
-public  final class Brand extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Brand)
-    BrandOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Brand.newBuilder() to construct.
-  private Brand(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Brand() {
-    media_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Brand(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            io.bloombox.schema.content.Name.Builder subBuilder = null;
-            if (name_ != null) {
-              subBuilder = name_.toBuilder();
-            }
-            name_ = input.readMessage(io.bloombox.schema.content.Name.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(name_);
-              name_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.content.Brand.Builder subBuilder = null;
-            if (parent_ != null) {
-              subBuilder = parent_.toBuilder();
-            }
-            parent_ = input.readMessage(io.bloombox.schema.content.Brand.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(parent_);
-              parent_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            io.bloombox.schema.content.Content.Builder subBuilder = null;
-            if (summary_ != null) {
-              subBuilder = summary_.toBuilder();
-            }
-            summary_ = input.readMessage(io.bloombox.schema.content.Content.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(summary_);
-              summary_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 162: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              media_ = new java.util.ArrayList<io.bloombox.schema.media.MediaItem>();
-              mutable_bitField0_ |= 0x00000008;
-            }
-            media_.add(
-                input.readMessage(io.bloombox.schema.media.MediaItem.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-        media_ = java.util.Collections.unmodifiableList(media_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.content.BrandContent.internal_static_Brand_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.content.BrandContent.internal_static_Brand_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.content.Brand.class, io.bloombox.schema.content.Brand.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int NAME_FIELD_NUMBER = 1;
-  private io.bloombox.schema.content.Name name_;
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  public boolean hasName() {
-    return name_ != null;
-  }
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  public io.bloombox.schema.content.Name getName() {
-    return name_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : name_;
-  }
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  public io.bloombox.schema.content.NameOrBuilder getNameOrBuilder() {
-    return getName();
-  }
-
-  public static final int PARENT_FIELD_NUMBER = 2;
-  private io.bloombox.schema.content.Brand parent_;
-  /**
-   * <code>.Brand parent = 2;</code>
-   */
-  public boolean hasParent() {
-    return parent_ != null;
-  }
-  /**
-   * <code>.Brand parent = 2;</code>
-   */
-  public io.bloombox.schema.content.Brand getParent() {
-    return parent_ == null ? io.bloombox.schema.content.Brand.getDefaultInstance() : parent_;
-  }
-  /**
-   * <code>.Brand parent = 2;</code>
-   */
-  public io.bloombox.schema.content.BrandOrBuilder getParentOrBuilder() {
-    return getParent();
-  }
-
-  public static final int SUMMARY_FIELD_NUMBER = 3;
-  private io.bloombox.schema.content.Content summary_;
-  /**
-   * <code>.Content summary = 3;</code>
-   */
-  public boolean hasSummary() {
-    return summary_ != null;
-  }
-  /**
-   * <code>.Content summary = 3;</code>
-   */
-  public io.bloombox.schema.content.Content getSummary() {
-    return summary_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : summary_;
-  }
-  /**
-   * <code>.Content summary = 3;</code>
-   */
-  public io.bloombox.schema.content.ContentOrBuilder getSummaryOrBuilder() {
-    return getSummary();
-  }
-
-  public static final int MEDIA_FIELD_NUMBER = 20;
-  private java.util.List<io.bloombox.schema.media.MediaItem> media_;
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public java.util.List<io.bloombox.schema.media.MediaItem> getMediaList() {
-    return media_;
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public java.util.List<? extends io.bloombox.schema.media.MediaItemOrBuilder> 
-      getMediaOrBuilderList() {
-    return media_;
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public int getMediaCount() {
-    return media_.size();
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public io.bloombox.schema.media.MediaItem getMedia(int index) {
-    return media_.get(index);
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public io.bloombox.schema.media.MediaItemOrBuilder getMediaOrBuilder(
-      int index) {
-    return media_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (name_ != null) {
-      output.writeMessage(1, getName());
-    }
-    if (parent_ != null) {
-      output.writeMessage(2, getParent());
-    }
-    if (summary_ != null) {
-      output.writeMessage(3, getSummary());
-    }
-    for (int i = 0; i < media_.size(); i++) {
-      output.writeMessage(20, media_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (name_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getName());
-    }
-    if (parent_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getParent());
-    }
-    if (summary_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getSummary());
-    }
-    for (int i = 0; i < media_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(20, media_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.content.Brand)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.content.Brand other = (io.bloombox.schema.content.Brand) obj;
-
-    boolean result = true;
-    result = result && (hasName() == other.hasName());
-    if (hasName()) {
-      result = result && getName()
-          .equals(other.getName());
-    }
-    result = result && (hasParent() == other.hasParent());
-    if (hasParent()) {
-      result = result && getParent()
-          .equals(other.getParent());
-    }
-    result = result && (hasSummary() == other.hasSummary());
-    if (hasSummary()) {
-      result = result && getSummary()
-          .equals(other.getSummary());
-    }
-    result = result && getMediaList()
-        .equals(other.getMediaList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasName()) {
-      hash = (37 * hash) + NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getName().hashCode();
-    }
-    if (hasParent()) {
-      hash = (37 * hash) + PARENT_FIELD_NUMBER;
-      hash = (53 * hash) + getParent().hashCode();
-    }
-    if (hasSummary()) {
-      hash = (37 * hash) + SUMMARY_FIELD_NUMBER;
-      hash = (53 * hash) + getSummary().hashCode();
-    }
-    if (getMediaCount() > 0) {
-      hash = (37 * hash) + MEDIA_FIELD_NUMBER;
-      hash = (53 * hash) + getMediaList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.content.Brand parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Brand parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Brand parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Brand parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.content.Brand prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code Brand}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Brand)
-      io.bloombox.schema.content.BrandOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.BrandContent.internal_static_Brand_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.content.BrandContent.internal_static_Brand_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.content.Brand.class, io.bloombox.schema.content.Brand.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.content.Brand.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getMediaFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (nameBuilder_ == null) {
-        name_ = null;
-      } else {
-        name_ = null;
-        nameBuilder_ = null;
-      }
-      if (parentBuilder_ == null) {
-        parent_ = null;
-      } else {
-        parent_ = null;
-        parentBuilder_ = null;
-      }
-      if (summaryBuilder_ == null) {
-        summary_ = null;
-      } else {
-        summary_ = null;
-        summaryBuilder_ = null;
-      }
-      if (mediaBuilder_ == null) {
-        media_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-      } else {
-        mediaBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.content.BrandContent.internal_static_Brand_descriptor;
-    }
-
-    public io.bloombox.schema.content.Brand getDefaultInstanceForType() {
-      return io.bloombox.schema.content.Brand.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.content.Brand build() {
-      io.bloombox.schema.content.Brand result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.content.Brand buildPartial() {
-      io.bloombox.schema.content.Brand result = new io.bloombox.schema.content.Brand(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (nameBuilder_ == null) {
-        result.name_ = name_;
-      } else {
-        result.name_ = nameBuilder_.build();
-      }
-      if (parentBuilder_ == null) {
-        result.parent_ = parent_;
-      } else {
-        result.parent_ = parentBuilder_.build();
-      }
-      if (summaryBuilder_ == null) {
-        result.summary_ = summary_;
-      } else {
-        result.summary_ = summaryBuilder_.build();
-      }
-      if (mediaBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          media_ = java.util.Collections.unmodifiableList(media_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.media_ = media_;
-      } else {
-        result.media_ = mediaBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.content.Brand) {
-        return mergeFrom((io.bloombox.schema.content.Brand)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.content.Brand other) {
-      if (other == io.bloombox.schema.content.Brand.getDefaultInstance()) return this;
-      if (other.hasName()) {
-        mergeName(other.getName());
-      }
-      if (other.hasParent()) {
-        mergeParent(other.getParent());
-      }
-      if (other.hasSummary()) {
-        mergeSummary(other.getSummary());
-      }
-      if (mediaBuilder_ == null) {
-        if (!other.media_.isEmpty()) {
-          if (media_.isEmpty()) {
-            media_ = other.media_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureMediaIsMutable();
-            media_.addAll(other.media_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.media_.isEmpty()) {
-          if (mediaBuilder_.isEmpty()) {
-            mediaBuilder_.dispose();
-            mediaBuilder_ = null;
-            media_ = other.media_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-            mediaBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getMediaFieldBuilder() : null;
-          } else {
-            mediaBuilder_.addAllMessages(other.media_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.content.Brand parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.content.Brand) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private io.bloombox.schema.content.Name name_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> nameBuilder_;
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public boolean hasName() {
-      return nameBuilder_ != null || name_ != null;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public io.bloombox.schema.content.Name getName() {
-      if (nameBuilder_ == null) {
-        return name_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : name_;
-      } else {
-        return nameBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder setName(io.bloombox.schema.content.Name value) {
-      if (nameBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        name_ = value;
-        onChanged();
-      } else {
-        nameBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder setName(
-        io.bloombox.schema.content.Name.Builder builderForValue) {
-      if (nameBuilder_ == null) {
-        name_ = builderForValue.build();
-        onChanged();
-      } else {
-        nameBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder mergeName(io.bloombox.schema.content.Name value) {
-      if (nameBuilder_ == null) {
-        if (name_ != null) {
-          name_ =
-            io.bloombox.schema.content.Name.newBuilder(name_).mergeFrom(value).buildPartial();
-        } else {
-          name_ = value;
-        }
-        onChanged();
-      } else {
-        nameBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder clearName() {
-      if (nameBuilder_ == null) {
-        name_ = null;
-        onChanged();
-      } else {
-        name_ = null;
-        nameBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public io.bloombox.schema.content.Name.Builder getNameBuilder() {
-      
-      onChanged();
-      return getNameFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public io.bloombox.schema.content.NameOrBuilder getNameOrBuilder() {
-      if (nameBuilder_ != null) {
-        return nameBuilder_.getMessageOrBuilder();
-      } else {
-        return name_ == null ?
-            io.bloombox.schema.content.Name.getDefaultInstance() : name_;
-      }
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> 
-        getNameFieldBuilder() {
-      if (nameBuilder_ == null) {
-        nameBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder>(
-                getName(),
-                getParentForChildren(),
-                isClean());
-        name_ = null;
-      }
-      return nameBuilder_;
-    }
-
-    private io.bloombox.schema.content.Brand parent_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Brand, io.bloombox.schema.content.Brand.Builder, io.bloombox.schema.content.BrandOrBuilder> parentBuilder_;
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public boolean hasParent() {
-      return parentBuilder_ != null || parent_ != null;
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public io.bloombox.schema.content.Brand getParent() {
-      if (parentBuilder_ == null) {
-        return parent_ == null ? io.bloombox.schema.content.Brand.getDefaultInstance() : parent_;
-      } else {
-        return parentBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public Builder setParent(io.bloombox.schema.content.Brand value) {
-      if (parentBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        parent_ = value;
-        onChanged();
-      } else {
-        parentBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public Builder setParent(
-        io.bloombox.schema.content.Brand.Builder builderForValue) {
-      if (parentBuilder_ == null) {
-        parent_ = builderForValue.build();
-        onChanged();
-      } else {
-        parentBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public Builder mergeParent(io.bloombox.schema.content.Brand value) {
-      if (parentBuilder_ == null) {
-        if (parent_ != null) {
-          parent_ =
-            io.bloombox.schema.content.Brand.newBuilder(parent_).mergeFrom(value).buildPartial();
-        } else {
-          parent_ = value;
-        }
-        onChanged();
-      } else {
-        parentBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public Builder clearParent() {
-      if (parentBuilder_ == null) {
-        parent_ = null;
-        onChanged();
-      } else {
-        parent_ = null;
-        parentBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public io.bloombox.schema.content.Brand.Builder getParentBuilder() {
-      
-      onChanged();
-      return getParentFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    public io.bloombox.schema.content.BrandOrBuilder getParentOrBuilder() {
-      if (parentBuilder_ != null) {
-        return parentBuilder_.getMessageOrBuilder();
-      } else {
-        return parent_ == null ?
-            io.bloombox.schema.content.Brand.getDefaultInstance() : parent_;
-      }
-    }
-    /**
-     * <code>.Brand parent = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Brand, io.bloombox.schema.content.Brand.Builder, io.bloombox.schema.content.BrandOrBuilder> 
-        getParentFieldBuilder() {
-      if (parentBuilder_ == null) {
-        parentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Brand, io.bloombox.schema.content.Brand.Builder, io.bloombox.schema.content.BrandOrBuilder>(
-                getParent(),
-                getParentForChildren(),
-                isClean());
-        parent_ = null;
-      }
-      return parentBuilder_;
-    }
-
-    private io.bloombox.schema.content.Content summary_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> summaryBuilder_;
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public boolean hasSummary() {
-      return summaryBuilder_ != null || summary_ != null;
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public io.bloombox.schema.content.Content getSummary() {
-      if (summaryBuilder_ == null) {
-        return summary_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : summary_;
-      } else {
-        return summaryBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public Builder setSummary(io.bloombox.schema.content.Content value) {
-      if (summaryBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        summary_ = value;
-        onChanged();
-      } else {
-        summaryBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public Builder setSummary(
-        io.bloombox.schema.content.Content.Builder builderForValue) {
-      if (summaryBuilder_ == null) {
-        summary_ = builderForValue.build();
-        onChanged();
-      } else {
-        summaryBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public Builder mergeSummary(io.bloombox.schema.content.Content value) {
-      if (summaryBuilder_ == null) {
-        if (summary_ != null) {
-          summary_ =
-            io.bloombox.schema.content.Content.newBuilder(summary_).mergeFrom(value).buildPartial();
-        } else {
-          summary_ = value;
-        }
-        onChanged();
-      } else {
-        summaryBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public Builder clearSummary() {
-      if (summaryBuilder_ == null) {
-        summary_ = null;
-        onChanged();
-      } else {
-        summary_ = null;
-        summaryBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public io.bloombox.schema.content.Content.Builder getSummaryBuilder() {
-      
-      onChanged();
-      return getSummaryFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    public io.bloombox.schema.content.ContentOrBuilder getSummaryOrBuilder() {
-      if (summaryBuilder_ != null) {
-        return summaryBuilder_.getMessageOrBuilder();
-      } else {
-        return summary_ == null ?
-            io.bloombox.schema.content.Content.getDefaultInstance() : summary_;
-      }
-    }
-    /**
-     * <code>.Content summary = 3;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> 
-        getSummaryFieldBuilder() {
-      if (summaryBuilder_ == null) {
-        summaryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder>(
-                getSummary(),
-                getParentForChildren(),
-                isClean());
-        summary_ = null;
-      }
-      return summaryBuilder_;
-    }
-
-    private java.util.List<io.bloombox.schema.media.MediaItem> media_ =
-      java.util.Collections.emptyList();
-    private void ensureMediaIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        media_ = new java.util.ArrayList<io.bloombox.schema.media.MediaItem>(media_);
-        bitField0_ |= 0x00000008;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.media.MediaItem, io.bloombox.schema.media.MediaItem.Builder, io.bloombox.schema.media.MediaItemOrBuilder> mediaBuilder_;
-
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public java.util.List<io.bloombox.schema.media.MediaItem> getMediaList() {
-      if (mediaBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(media_);
-      } else {
-        return mediaBuilder_.getMessageList();
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public int getMediaCount() {
-      if (mediaBuilder_ == null) {
-        return media_.size();
-      } else {
-        return mediaBuilder_.getCount();
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem getMedia(int index) {
-      if (mediaBuilder_ == null) {
-        return media_.get(index);
-      } else {
-        return mediaBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder setMedia(
-        int index, io.bloombox.schema.media.MediaItem value) {
-      if (mediaBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMediaIsMutable();
-        media_.set(index, value);
-        onChanged();
-      } else {
-        mediaBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder setMedia(
-        int index, io.bloombox.schema.media.MediaItem.Builder builderForValue) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        mediaBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(io.bloombox.schema.media.MediaItem value) {
-      if (mediaBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMediaIsMutable();
-        media_.add(value);
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(
-        int index, io.bloombox.schema.media.MediaItem value) {
-      if (mediaBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMediaIsMutable();
-        media_.add(index, value);
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(
-        io.bloombox.schema.media.MediaItem.Builder builderForValue) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.add(builderForValue.build());
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(
-        int index, io.bloombox.schema.media.MediaItem.Builder builderForValue) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addAllMedia(
-        java.lang.Iterable<? extends io.bloombox.schema.media.MediaItem> values) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, media_);
-        onChanged();
-      } else {
-        mediaBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder clearMedia() {
-      if (mediaBuilder_ == null) {
-        media_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-      } else {
-        mediaBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder removeMedia(int index) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.remove(index);
-        onChanged();
-      } else {
-        mediaBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem.Builder getMediaBuilder(
-        int index) {
-      return getMediaFieldBuilder().getBuilder(index);
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItemOrBuilder getMediaOrBuilder(
-        int index) {
-      if (mediaBuilder_ == null) {
-        return media_.get(index);  } else {
-        return mediaBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public java.util.List<? extends io.bloombox.schema.media.MediaItemOrBuilder> 
-         getMediaOrBuilderList() {
-      if (mediaBuilder_ != null) {
-        return mediaBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(media_);
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem.Builder addMediaBuilder() {
-      return getMediaFieldBuilder().addBuilder(
-          io.bloombox.schema.media.MediaItem.getDefaultInstance());
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem.Builder addMediaBuilder(
-        int index) {
-      return getMediaFieldBuilder().addBuilder(
-          index, io.bloombox.schema.media.MediaItem.getDefaultInstance());
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public java.util.List<io.bloombox.schema.media.MediaItem.Builder> 
-         getMediaBuilderList() {
-      return getMediaFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.media.MediaItem, io.bloombox.schema.media.MediaItem.Builder, io.bloombox.schema.media.MediaItemOrBuilder> 
-        getMediaFieldBuilder() {
-      if (mediaBuilder_ == null) {
-        mediaBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            io.bloombox.schema.media.MediaItem, io.bloombox.schema.media.MediaItem.Builder, io.bloombox.schema.media.MediaItemOrBuilder>(
-                media_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
-        media_ = null;
-      }
-      return mediaBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Brand)
-  }
-
-  // @@protoc_insertion_point(class_scope:Brand)
-  private static final io.bloombox.schema.content.Brand DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.content.Brand();
-  }
-
-  public static io.bloombox.schema.content.Brand getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Brand>
-      PARSER = new com.google.protobuf.AbstractParser<Brand>() {
-    public Brand parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Brand(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Brand> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Brand> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.content.Brand getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/content/BrandContent.java b/languages/java/io/bloombox/schema/content/BrandContent.java
deleted file mode 100644
index 94fbbe1..0000000
--- a/languages/java/io/bloombox/schema/content/BrandContent.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-package io.bloombox.schema.content;
-
-public final class BrandContent {
-  private BrandContent() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Brand_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Brand_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\023content/Brand.proto\032\022content/Name.prot" +
-      "o\032\025content/Content.proto\032\025media/MediaIte" +
-      "m.proto\"j\n\005Brand\022\023\n\004name\030\001 \001(\0132\005.Name\022\026\n" +
-      "\006parent\030\002 \001(\0132\006.Brand\022\031\n\007summary\030\003 \001(\0132\010" +
-      ".Content\022\031\n\005media\030\024 \003(\0132\n.MediaItemB1\n\032i" +
-      "o.bloombox.schema.contentB\014BrandContentH" +
-      "\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.content.NameContent.getDescriptor(),
-          io.bloombox.schema.content.GenericContent.getDescriptor(),
-          io.bloombox.schema.media.AttachedMedia.getDescriptor(),
-        }, assigner);
-    internal_static_Brand_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Brand_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Brand_descriptor,
-        new java.lang.String[] { "Name", "Parent", "Summary", "Media", });
-    io.bloombox.schema.content.NameContent.getDescriptor();
-    io.bloombox.schema.content.GenericContent.getDescriptor();
-    io.bloombox.schema.media.AttachedMedia.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/BrandOrBuilder.java b/languages/java/io/bloombox/schema/content/BrandOrBuilder.java
deleted file mode 100644
index cdfe992..0000000
--- a/languages/java/io/bloombox/schema/content/BrandOrBuilder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-package io.bloombox.schema.content;
-
-public interface BrandOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Brand)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  boolean hasName();
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  io.bloombox.schema.content.Name getName();
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  io.bloombox.schema.content.NameOrBuilder getNameOrBuilder();
-
-  /**
-   * <code>.Brand parent = 2;</code>
-   */
-  boolean hasParent();
-  /**
-   * <code>.Brand parent = 2;</code>
-   */
-  io.bloombox.schema.content.Brand getParent();
-  /**
-   * <code>.Brand parent = 2;</code>
-   */
-  io.bloombox.schema.content.BrandOrBuilder getParentOrBuilder();
-
-  /**
-   * <code>.Content summary = 3;</code>
-   */
-  boolean hasSummary();
-  /**
-   * <code>.Content summary = 3;</code>
-   */
-  io.bloombox.schema.content.Content getSummary();
-  /**
-   * <code>.Content summary = 3;</code>
-   */
-  io.bloombox.schema.content.ContentOrBuilder getSummaryOrBuilder();
-
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  java.util.List<io.bloombox.schema.media.MediaItem> 
-      getMediaList();
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  io.bloombox.schema.media.MediaItem getMedia(int index);
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  int getMediaCount();
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  java.util.List<? extends io.bloombox.schema.media.MediaItemOrBuilder> 
-      getMediaOrBuilderList();
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  io.bloombox.schema.media.MediaItemOrBuilder getMediaOrBuilder(
-      int index);
-}
diff --git a/languages/java/io/bloombox/schema/content/BrandOuterClass.java b/languages/java/io/bloombox/schema/content/BrandOuterClass.java
deleted file mode 100644
index 45eb33b..0000000
--- a/languages/java/io/bloombox/schema/content/BrandOuterClass.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-package io.bloombox.schema.content;
-
-public final class BrandOuterClass {
-  private BrandOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Brand_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Brand_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\023content/Brand.proto\032\022content/Name.prot" +
-      "o\032\025content/Content.proto\032\025media/MediaIte" +
-      "m.proto\"j\n\005Brand\022\023\n\004name\030\001 \001(\0132\005.Name\022\026\n" +
-      "\006parent\030\002 \001(\0132\006.Brand\022\031\n\007summary\030\003 \001(\0132\010" +
-      ".Content\022\031\n\005media\030\024 \003(\0132\n.MediaItemB\036\n\032i" +
-      "o.bloombox.schema.contentP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.content.NameOuterClass.getDescriptor(),
-          io.bloombox.schema.content.ContentOuterClass.getDescriptor(),
-          io.bloombox.schema.media.MediaItemOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_Brand_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Brand_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Brand_descriptor,
-        new java.lang.String[] { "Name", "Parent", "Summary", "Media", });
-    io.bloombox.schema.content.NameOuterClass.getDescriptor();
-    io.bloombox.schema.content.ContentOuterClass.getDescriptor();
-    io.bloombox.schema.media.MediaItemOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/Content.java b/languages/java/io/bloombox/schema/content/Content.java
deleted file mode 100644
index f3d3f7a..0000000
--- a/languages/java/io/bloombox/schema/content/Content.java
+++ /dev/null
@@ -1,1073 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-package io.bloombox.schema.content;
-
-/**
- * Protobuf type {@code Content}
- */
-public  final class Content extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Content)
-    ContentOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Content.newBuilder() to construct.
-  private Content(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Content() {
-    type_ = 0;
-    encoding_ = 0;
-    content_ = com.google.protobuf.ByteString.EMPTY;
-    language_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Content(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            type_ = rawValue;
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
-
-            encoding_ = rawValue;
-            break;
-          }
-          case 26: {
-
-            content_ = input.readBytes();
-            break;
-          }
-          case 32: {
-            int rawValue = input.readEnum();
-
-            language_ = rawValue;
-            break;
-          }
-          case 42: {
-            io.bloombox.schema.base.Compression.Builder subBuilder = null;
-            if (compression_ != null) {
-              subBuilder = compression_.toBuilder();
-            }
-            compression_ = input.readMessage(io.bloombox.schema.base.Compression.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(compression_);
-              compression_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.content.GenericContent.internal_static_Content_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.content.GenericContent.internal_static_Content_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.content.Content.class, io.bloombox.schema.content.Content.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code Content.Type}
-   */
-  public enum Type
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>TEXT = 0;</code>
-     */
-    TEXT(0),
-    /**
-     * <code>MARKDOWN = 1;</code>
-     */
-    MARKDOWN(1),
-    /**
-     * <code>HTML = 2;</code>
-     */
-    HTML(2),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>TEXT = 0;</code>
-     */
-    public static final int TEXT_VALUE = 0;
-    /**
-     * <code>MARKDOWN = 1;</code>
-     */
-    public static final int MARKDOWN_VALUE = 1;
-    /**
-     * <code>HTML = 2;</code>
-     */
-    public static final int HTML_VALUE = 2;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static Type valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static Type forNumber(int value) {
-      switch (value) {
-        case 0: return TEXT;
-        case 1: return MARKDOWN;
-        case 2: return HTML;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<Type>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Type> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<Type>() {
-            public Type findValueByNumber(int number) {
-              return Type.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.Content.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final Type[] VALUES = values();
-
-    public static Type valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private Type(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:Content.Type)
-  }
-
-  /**
-   * Protobuf enum {@code Content.Encoding}
-   */
-  public enum Encoding
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>UTF8 = 0;</code>
-     */
-    UTF8(0),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>UTF8 = 0;</code>
-     */
-    public static final int UTF8_VALUE = 0;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static Encoding valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static Encoding forNumber(int value) {
-      switch (value) {
-        case 0: return UTF8;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<Encoding>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Encoding> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<Encoding>() {
-            public Encoding findValueByNumber(int number) {
-              return Encoding.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.Content.getDescriptor().getEnumTypes().get(1);
-    }
-
-    private static final Encoding[] VALUES = values();
-
-    public static Encoding valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private Encoding(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:Content.Encoding)
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_;
-  /**
-   * <code>.Content.Type type = 1;</code>
-   */
-  public int getTypeValue() {
-    return type_;
-  }
-  /**
-   * <code>.Content.Type type = 1;</code>
-   */
-  public io.bloombox.schema.content.Content.Type getType() {
-    io.bloombox.schema.content.Content.Type result = io.bloombox.schema.content.Content.Type.valueOf(type_);
-    return result == null ? io.bloombox.schema.content.Content.Type.UNRECOGNIZED : result;
-  }
-
-  public static final int ENCODING_FIELD_NUMBER = 2;
-  private int encoding_;
-  /**
-   * <code>.Content.Encoding encoding = 2;</code>
-   */
-  public int getEncodingValue() {
-    return encoding_;
-  }
-  /**
-   * <code>.Content.Encoding encoding = 2;</code>
-   */
-  public io.bloombox.schema.content.Content.Encoding getEncoding() {
-    io.bloombox.schema.content.Content.Encoding result = io.bloombox.schema.content.Content.Encoding.valueOf(encoding_);
-    return result == null ? io.bloombox.schema.content.Content.Encoding.UNRECOGNIZED : result;
-  }
-
-  public static final int CONTENT_FIELD_NUMBER = 3;
-  private com.google.protobuf.ByteString content_;
-  /**
-   * <code>bytes content = 3;</code>
-   */
-  public com.google.protobuf.ByteString getContent() {
-    return content_;
-  }
-
-  public static final int LANGUAGE_FIELD_NUMBER = 4;
-  private int language_;
-  /**
-   * <code>.Language language = 4;</code>
-   */
-  public int getLanguageValue() {
-    return language_;
-  }
-  /**
-   * <code>.Language language = 4;</code>
-   */
-  public io.bloombox.schema.base.Language getLanguage() {
-    io.bloombox.schema.base.Language result = io.bloombox.schema.base.Language.valueOf(language_);
-    return result == null ? io.bloombox.schema.base.Language.UNRECOGNIZED : result;
-  }
-
-  public static final int COMPRESSION_FIELD_NUMBER = 5;
-  private io.bloombox.schema.base.Compression compression_;
-  /**
-   * <code>.Compression compression = 5;</code>
-   */
-  public boolean hasCompression() {
-    return compression_ != null;
-  }
-  /**
-   * <code>.Compression compression = 5;</code>
-   */
-  public io.bloombox.schema.base.Compression getCompression() {
-    return compression_ == null ? io.bloombox.schema.base.Compression.getDefaultInstance() : compression_;
-  }
-  /**
-   * <code>.Compression compression = 5;</code>
-   */
-  public io.bloombox.schema.base.CompressionOrBuilder getCompressionOrBuilder() {
-    return getCompression();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (type_ != io.bloombox.schema.content.Content.Type.TEXT.getNumber()) {
-      output.writeEnum(1, type_);
-    }
-    if (encoding_ != io.bloombox.schema.content.Content.Encoding.UTF8.getNumber()) {
-      output.writeEnum(2, encoding_);
-    }
-    if (!content_.isEmpty()) {
-      output.writeBytes(3, content_);
-    }
-    if (language_ != io.bloombox.schema.base.Language.ENGLISH.getNumber()) {
-      output.writeEnum(4, language_);
-    }
-    if (compression_ != null) {
-      output.writeMessage(5, getCompression());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (type_ != io.bloombox.schema.content.Content.Type.TEXT.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, type_);
-    }
-    if (encoding_ != io.bloombox.schema.content.Content.Encoding.UTF8.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, encoding_);
-    }
-    if (!content_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(3, content_);
-    }
-    if (language_ != io.bloombox.schema.base.Language.ENGLISH.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(4, language_);
-    }
-    if (compression_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, getCompression());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.content.Content)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.content.Content other = (io.bloombox.schema.content.Content) obj;
-
-    boolean result = true;
-    result = result && type_ == other.type_;
-    result = result && encoding_ == other.encoding_;
-    result = result && getContent()
-        .equals(other.getContent());
-    result = result && language_ == other.language_;
-    result = result && (hasCompression() == other.hasCompression());
-    if (hasCompression()) {
-      result = result && getCompression()
-          .equals(other.getCompression());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TYPE_FIELD_NUMBER;
-    hash = (53 * hash) + type_;
-    hash = (37 * hash) + ENCODING_FIELD_NUMBER;
-    hash = (53 * hash) + encoding_;
-    hash = (37 * hash) + CONTENT_FIELD_NUMBER;
-    hash = (53 * hash) + getContent().hashCode();
-    hash = (37 * hash) + LANGUAGE_FIELD_NUMBER;
-    hash = (53 * hash) + language_;
-    if (hasCompression()) {
-      hash = (37 * hash) + COMPRESSION_FIELD_NUMBER;
-      hash = (53 * hash) + getCompression().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.content.Content parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Content parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Content parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Content parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.content.Content prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code Content}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Content)
-      io.bloombox.schema.content.ContentOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.GenericContent.internal_static_Content_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.content.GenericContent.internal_static_Content_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.content.Content.class, io.bloombox.schema.content.Content.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.content.Content.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      type_ = 0;
-
-      encoding_ = 0;
-
-      content_ = com.google.protobuf.ByteString.EMPTY;
-
-      language_ = 0;
-
-      if (compressionBuilder_ == null) {
-        compression_ = null;
-      } else {
-        compression_ = null;
-        compressionBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.content.GenericContent.internal_static_Content_descriptor;
-    }
-
-    public io.bloombox.schema.content.Content getDefaultInstanceForType() {
-      return io.bloombox.schema.content.Content.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.content.Content build() {
-      io.bloombox.schema.content.Content result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.content.Content buildPartial() {
-      io.bloombox.schema.content.Content result = new io.bloombox.schema.content.Content(this);
-      result.type_ = type_;
-      result.encoding_ = encoding_;
-      result.content_ = content_;
-      result.language_ = language_;
-      if (compressionBuilder_ == null) {
-        result.compression_ = compression_;
-      } else {
-        result.compression_ = compressionBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.content.Content) {
-        return mergeFrom((io.bloombox.schema.content.Content)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.content.Content other) {
-      if (other == io.bloombox.schema.content.Content.getDefaultInstance()) return this;
-      if (other.type_ != 0) {
-        setTypeValue(other.getTypeValue());
-      }
-      if (other.encoding_ != 0) {
-        setEncodingValue(other.getEncodingValue());
-      }
-      if (other.getContent() != com.google.protobuf.ByteString.EMPTY) {
-        setContent(other.getContent());
-      }
-      if (other.language_ != 0) {
-        setLanguageValue(other.getLanguageValue());
-      }
-      if (other.hasCompression()) {
-        mergeCompression(other.getCompression());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.content.Content parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.content.Content) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int type_ = 0;
-    /**
-     * <code>.Content.Type type = 1;</code>
-     */
-    public int getTypeValue() {
-      return type_;
-    }
-    /**
-     * <code>.Content.Type type = 1;</code>
-     */
-    public Builder setTypeValue(int value) {
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Content.Type type = 1;</code>
-     */
-    public io.bloombox.schema.content.Content.Type getType() {
-      io.bloombox.schema.content.Content.Type result = io.bloombox.schema.content.Content.Type.valueOf(type_);
-      return result == null ? io.bloombox.schema.content.Content.Type.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.Content.Type type = 1;</code>
-     */
-    public Builder setType(io.bloombox.schema.content.Content.Type value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      type_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Content.Type type = 1;</code>
-     */
-    public Builder clearType() {
-      
-      type_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int encoding_ = 0;
-    /**
-     * <code>.Content.Encoding encoding = 2;</code>
-     */
-    public int getEncodingValue() {
-      return encoding_;
-    }
-    /**
-     * <code>.Content.Encoding encoding = 2;</code>
-     */
-    public Builder setEncodingValue(int value) {
-      encoding_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Content.Encoding encoding = 2;</code>
-     */
-    public io.bloombox.schema.content.Content.Encoding getEncoding() {
-      io.bloombox.schema.content.Content.Encoding result = io.bloombox.schema.content.Content.Encoding.valueOf(encoding_);
-      return result == null ? io.bloombox.schema.content.Content.Encoding.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.Content.Encoding encoding = 2;</code>
-     */
-    public Builder setEncoding(io.bloombox.schema.content.Content.Encoding value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      encoding_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Content.Encoding encoding = 2;</code>
-     */
-    public Builder clearEncoding() {
-      
-      encoding_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private com.google.protobuf.ByteString content_ = com.google.protobuf.ByteString.EMPTY;
-    /**
-     * <code>bytes content = 3;</code>
-     */
-    public com.google.protobuf.ByteString getContent() {
-      return content_;
-    }
-    /**
-     * <code>bytes content = 3;</code>
-     */
-    public Builder setContent(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      content_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bytes content = 3;</code>
-     */
-    public Builder clearContent() {
-      
-      content_ = getDefaultInstance().getContent();
-      onChanged();
-      return this;
-    }
-
-    private int language_ = 0;
-    /**
-     * <code>.Language language = 4;</code>
-     */
-    public int getLanguageValue() {
-      return language_;
-    }
-    /**
-     * <code>.Language language = 4;</code>
-     */
-    public Builder setLanguageValue(int value) {
-      language_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Language language = 4;</code>
-     */
-    public io.bloombox.schema.base.Language getLanguage() {
-      io.bloombox.schema.base.Language result = io.bloombox.schema.base.Language.valueOf(language_);
-      return result == null ? io.bloombox.schema.base.Language.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.Language language = 4;</code>
-     */
-    public Builder setLanguage(io.bloombox.schema.base.Language value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      language_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Language language = 4;</code>
-     */
-    public Builder clearLanguage() {
-      
-      language_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private io.bloombox.schema.base.Compression compression_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.base.Compression, io.bloombox.schema.base.Compression.Builder, io.bloombox.schema.base.CompressionOrBuilder> compressionBuilder_;
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public boolean hasCompression() {
-      return compressionBuilder_ != null || compression_ != null;
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public io.bloombox.schema.base.Compression getCompression() {
-      if (compressionBuilder_ == null) {
-        return compression_ == null ? io.bloombox.schema.base.Compression.getDefaultInstance() : compression_;
-      } else {
-        return compressionBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public Builder setCompression(io.bloombox.schema.base.Compression value) {
-      if (compressionBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        compression_ = value;
-        onChanged();
-      } else {
-        compressionBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public Builder setCompression(
-        io.bloombox.schema.base.Compression.Builder builderForValue) {
-      if (compressionBuilder_ == null) {
-        compression_ = builderForValue.build();
-        onChanged();
-      } else {
-        compressionBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public Builder mergeCompression(io.bloombox.schema.base.Compression value) {
-      if (compressionBuilder_ == null) {
-        if (compression_ != null) {
-          compression_ =
-            io.bloombox.schema.base.Compression.newBuilder(compression_).mergeFrom(value).buildPartial();
-        } else {
-          compression_ = value;
-        }
-        onChanged();
-      } else {
-        compressionBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public Builder clearCompression() {
-      if (compressionBuilder_ == null) {
-        compression_ = null;
-        onChanged();
-      } else {
-        compression_ = null;
-        compressionBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public io.bloombox.schema.base.Compression.Builder getCompressionBuilder() {
-      
-      onChanged();
-      return getCompressionFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    public io.bloombox.schema.base.CompressionOrBuilder getCompressionOrBuilder() {
-      if (compressionBuilder_ != null) {
-        return compressionBuilder_.getMessageOrBuilder();
-      } else {
-        return compression_ == null ?
-            io.bloombox.schema.base.Compression.getDefaultInstance() : compression_;
-      }
-    }
-    /**
-     * <code>.Compression compression = 5;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.base.Compression, io.bloombox.schema.base.Compression.Builder, io.bloombox.schema.base.CompressionOrBuilder> 
-        getCompressionFieldBuilder() {
-      if (compressionBuilder_ == null) {
-        compressionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.base.Compression, io.bloombox.schema.base.Compression.Builder, io.bloombox.schema.base.CompressionOrBuilder>(
-                getCompression(),
-                getParentForChildren(),
-                isClean());
-        compression_ = null;
-      }
-      return compressionBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Content)
-  }
-
-  // @@protoc_insertion_point(class_scope:Content)
-  private static final io.bloombox.schema.content.Content DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.content.Content();
-  }
-
-  public static io.bloombox.schema.content.Content getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Content>
-      PARSER = new com.google.protobuf.AbstractParser<Content>() {
-    public Content parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Content(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Content> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Content> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.content.Content getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/content/ContentOrBuilder.java b/languages/java/io/bloombox/schema/content/ContentOrBuilder.java
deleted file mode 100644
index eeb5b36..0000000
--- a/languages/java/io/bloombox/schema/content/ContentOrBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-package io.bloombox.schema.content;
-
-public interface ContentOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Content)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.Content.Type type = 1;</code>
-   */
-  int getTypeValue();
-  /**
-   * <code>.Content.Type type = 1;</code>
-   */
-  io.bloombox.schema.content.Content.Type getType();
-
-  /**
-   * <code>.Content.Encoding encoding = 2;</code>
-   */
-  int getEncodingValue();
-  /**
-   * <code>.Content.Encoding encoding = 2;</code>
-   */
-  io.bloombox.schema.content.Content.Encoding getEncoding();
-
-  /**
-   * <code>bytes content = 3;</code>
-   */
-  com.google.protobuf.ByteString getContent();
-
-  /**
-   * <code>.Language language = 4;</code>
-   */
-  int getLanguageValue();
-  /**
-   * <code>.Language language = 4;</code>
-   */
-  io.bloombox.schema.base.Language getLanguage();
-
-  /**
-   * <code>.Compression compression = 5;</code>
-   */
-  boolean hasCompression();
-  /**
-   * <code>.Compression compression = 5;</code>
-   */
-  io.bloombox.schema.base.Compression getCompression();
-  /**
-   * <code>.Compression compression = 5;</code>
-   */
-  io.bloombox.schema.base.CompressionOrBuilder getCompressionOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/content/ContentOuterClass.java b/languages/java/io/bloombox/schema/content/ContentOuterClass.java
deleted file mode 100644
index 40d5aea..0000000
--- a/languages/java/io/bloombox/schema/content/ContentOuterClass.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-package io.bloombox.schema.content;
-
-public final class ContentOuterClass {
-  private ContentOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Content_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Content_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025content/Content.proto\032\023base/Language.p" +
-      "roto\032\026base/Compression.proto\"\334\001\n\007Content" +
-      "\022\033\n\004type\030\001 \001(\0162\r.Content.Type\022#\n\010encodin" +
-      "g\030\002 \001(\0162\021.Content.Encoding\022\017\n\007content\030\003 " +
-      "\001(\014\022\033\n\010language\030\004 \001(\0162\t.Language\022!\n\013comp" +
-      "ression\030\005 \001(\0132\014.Compression\"(\n\004Type\022\010\n\004T" +
-      "EXT\020\000\022\014\n\010MARKDOWN\020\001\022\010\n\004HTML\020\002\"\024\n\010Encodin" +
-      "g\022\010\n\004UTF8\020\000B\036\n\032io.bloombox.schema.conten" +
-      "tP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.LanguageOuterClass.getDescriptor(),
-          io.bloombox.schema.base.CompressionOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_Content_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Content_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Content_descriptor,
-        new java.lang.String[] { "Type", "Encoding", "Content", "Language", "Compression", });
-    io.bloombox.schema.base.LanguageOuterClass.getDescriptor();
-    io.bloombox.schema.base.CompressionOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/GenericContent.java b/languages/java/io/bloombox/schema/content/GenericContent.java
deleted file mode 100644
index da1555b..0000000
--- a/languages/java/io/bloombox/schema/content/GenericContent.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-package io.bloombox.schema.content;
-
-public final class GenericContent {
-  private GenericContent() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Content_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Content_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025content/Content.proto\032\023base/Language.p" +
-      "roto\032\026base/Compression.proto\"\334\001\n\007Content" +
-      "\022\033\n\004type\030\001 \001(\0162\r.Content.Type\022#\n\010encodin" +
-      "g\030\002 \001(\0162\021.Content.Encoding\022\017\n\007content\030\003 " +
-      "\001(\014\022\033\n\010language\030\004 \001(\0162\t.Language\022!\n\013comp" +
-      "ression\030\005 \001(\0132\014.Compression\"(\n\004Type\022\010\n\004T" +
-      "EXT\020\000\022\014\n\010MARKDOWN\020\001\022\010\n\004HTML\020\002\"\024\n\010Encodin" +
-      "g\022\010\n\004UTF8\020\000B3\n\032io.bloombox.schema.conten" +
-      "tB\016GenericContentH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.BaseLanguage.getDescriptor(),
-          io.bloombox.schema.base.BaseCompression.getDescriptor(),
-        }, assigner);
-    internal_static_Content_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Content_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Content_descriptor,
-        new java.lang.String[] { "Type", "Encoding", "Content", "Language", "Compression", });
-    io.bloombox.schema.base.BaseLanguage.getDescriptor();
-    io.bloombox.schema.base.BaseCompression.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/MaterialsContent.java b/languages/java/io/bloombox/schema/content/MaterialsContent.java
deleted file mode 100644
index cc82282..0000000
--- a/languages/java/io/bloombox/schema/content/MaterialsContent.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-package io.bloombox.schema.content;
-
-public final class MaterialsContent {
-  private MaterialsContent() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MaterialsData_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MaterialsData_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\033content/MaterialsData.proto\032\022structs/G" +
-      "row.proto\032\025structs/Species.proto\032\026struct" +
-      "s/Genetics.proto\"q\n\rMaterialsData\022\023\n\013ing" +
-      "redients\030\001 \003(\t\022\023\n\004grow\030\002 \001(\0162\005.Grow\022\031\n\007s" +
-      "pecies\030\003 \001(\0162\010.Species\022\033\n\010genetics\030\004 \001(\013" +
-      "2\t.GeneticsB5\n\032io.bloombox.schema.conten" +
-      "tB\020MaterialsContentH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.product.struct.MaterialGrow.getDescriptor(),
-          io.bloombox.schema.product.struct.MaterialSpecies.getDescriptor(),
-          io.bloombox.schema.product.struct.GeneticsStructs.getDescriptor(),
-        }, assigner);
-    internal_static_MaterialsData_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MaterialsData_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MaterialsData_descriptor,
-        new java.lang.String[] { "Ingredients", "Grow", "Species", "Genetics", });
-    io.bloombox.schema.product.struct.MaterialGrow.getDescriptor();
-    io.bloombox.schema.product.struct.MaterialSpecies.getDescriptor();
-    io.bloombox.schema.product.struct.GeneticsStructs.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/MaterialsData.java b/languages/java/io/bloombox/schema/content/MaterialsData.java
deleted file mode 100644
index 4cbc933..0000000
--- a/languages/java/io/bloombox/schema/content/MaterialsData.java
+++ /dev/null
@@ -1,908 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-package io.bloombox.schema.content;
-
-/**
- * Protobuf type {@code MaterialsData}
- */
-public  final class MaterialsData extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:MaterialsData)
-    MaterialsDataOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use MaterialsData.newBuilder() to construct.
-  private MaterialsData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private MaterialsData() {
-    ingredients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-    grow_ = 0;
-    species_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private MaterialsData(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              ingredients_ = new com.google.protobuf.LazyStringArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            ingredients_.add(s);
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
-
-            grow_ = rawValue;
-            break;
-          }
-          case 24: {
-            int rawValue = input.readEnum();
-
-            species_ = rawValue;
-            break;
-          }
-          case 34: {
-            io.bloombox.schema.product.struct.Genetics.Builder subBuilder = null;
-            if (genetics_ != null) {
-              subBuilder = genetics_.toBuilder();
-            }
-            genetics_ = input.readMessage(io.bloombox.schema.product.struct.Genetics.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(genetics_);
-              genetics_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        ingredients_ = ingredients_.getUnmodifiableView();
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.content.MaterialsContent.internal_static_MaterialsData_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.content.MaterialsContent.internal_static_MaterialsData_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.content.MaterialsData.class, io.bloombox.schema.content.MaterialsData.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int INGREDIENTS_FIELD_NUMBER = 1;
-  private com.google.protobuf.LazyStringList ingredients_;
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  public com.google.protobuf.ProtocolStringList
-      getIngredientsList() {
-    return ingredients_;
-  }
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  public int getIngredientsCount() {
-    return ingredients_.size();
-  }
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  public java.lang.String getIngredients(int index) {
-    return ingredients_.get(index);
-  }
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  public com.google.protobuf.ByteString
-      getIngredientsBytes(int index) {
-    return ingredients_.getByteString(index);
-  }
-
-  public static final int GROW_FIELD_NUMBER = 2;
-  private int grow_;
-  /**
-   * <code>.Grow grow = 2;</code>
-   */
-  public int getGrowValue() {
-    return grow_;
-  }
-  /**
-   * <code>.Grow grow = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.Grow getGrow() {
-    io.bloombox.schema.product.struct.Grow result = io.bloombox.schema.product.struct.Grow.valueOf(grow_);
-    return result == null ? io.bloombox.schema.product.struct.Grow.UNRECOGNIZED : result;
-  }
-
-  public static final int SPECIES_FIELD_NUMBER = 3;
-  private int species_;
-  /**
-   * <code>.Species species = 3;</code>
-   */
-  public int getSpeciesValue() {
-    return species_;
-  }
-  /**
-   * <code>.Species species = 3;</code>
-   */
-  public io.bloombox.schema.product.struct.Species getSpecies() {
-    io.bloombox.schema.product.struct.Species result = io.bloombox.schema.product.struct.Species.valueOf(species_);
-    return result == null ? io.bloombox.schema.product.struct.Species.UNRECOGNIZED : result;
-  }
-
-  public static final int GENETICS_FIELD_NUMBER = 4;
-  private io.bloombox.schema.product.struct.Genetics genetics_;
-  /**
-   * <code>.Genetics genetics = 4;</code>
-   */
-  public boolean hasGenetics() {
-    return genetics_ != null;
-  }
-  /**
-   * <code>.Genetics genetics = 4;</code>
-   */
-  public io.bloombox.schema.product.struct.Genetics getGenetics() {
-    return genetics_ == null ? io.bloombox.schema.product.struct.Genetics.getDefaultInstance() : genetics_;
-  }
-  /**
-   * <code>.Genetics genetics = 4;</code>
-   */
-  public io.bloombox.schema.product.struct.GeneticsOrBuilder getGeneticsOrBuilder() {
-    return getGenetics();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < ingredients_.size(); i++) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, ingredients_.getRaw(i));
-    }
-    if (grow_ != io.bloombox.schema.product.struct.Grow.GENERIC.getNumber()) {
-      output.writeEnum(2, grow_);
-    }
-    if (species_ != io.bloombox.schema.product.struct.Species.UNSPECIFIED.getNumber()) {
-      output.writeEnum(3, species_);
-    }
-    if (genetics_ != null) {
-      output.writeMessage(4, getGenetics());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    {
-      int dataSize = 0;
-      for (int i = 0; i < ingredients_.size(); i++) {
-        dataSize += computeStringSizeNoTag(ingredients_.getRaw(i));
-      }
-      size += dataSize;
-      size += 1 * getIngredientsList().size();
-    }
-    if (grow_ != io.bloombox.schema.product.struct.Grow.GENERIC.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, grow_);
-    }
-    if (species_ != io.bloombox.schema.product.struct.Species.UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(3, species_);
-    }
-    if (genetics_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, getGenetics());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.content.MaterialsData)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.content.MaterialsData other = (io.bloombox.schema.content.MaterialsData) obj;
-
-    boolean result = true;
-    result = result && getIngredientsList()
-        .equals(other.getIngredientsList());
-    result = result && grow_ == other.grow_;
-    result = result && species_ == other.species_;
-    result = result && (hasGenetics() == other.hasGenetics());
-    if (hasGenetics()) {
-      result = result && getGenetics()
-          .equals(other.getGenetics());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getIngredientsCount() > 0) {
-      hash = (37 * hash) + INGREDIENTS_FIELD_NUMBER;
-      hash = (53 * hash) + getIngredientsList().hashCode();
-    }
-    hash = (37 * hash) + GROW_FIELD_NUMBER;
-    hash = (53 * hash) + grow_;
-    hash = (37 * hash) + SPECIES_FIELD_NUMBER;
-    hash = (53 * hash) + species_;
-    if (hasGenetics()) {
-      hash = (37 * hash) + GENETICS_FIELD_NUMBER;
-      hash = (53 * hash) + getGenetics().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.MaterialsData parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.content.MaterialsData prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code MaterialsData}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:MaterialsData)
-      io.bloombox.schema.content.MaterialsDataOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.MaterialsContent.internal_static_MaterialsData_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.content.MaterialsContent.internal_static_MaterialsData_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.content.MaterialsData.class, io.bloombox.schema.content.MaterialsData.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.content.MaterialsData.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      ingredients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
-      grow_ = 0;
-
-      species_ = 0;
-
-      if (geneticsBuilder_ == null) {
-        genetics_ = null;
-      } else {
-        genetics_ = null;
-        geneticsBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.content.MaterialsContent.internal_static_MaterialsData_descriptor;
-    }
-
-    public io.bloombox.schema.content.MaterialsData getDefaultInstanceForType() {
-      return io.bloombox.schema.content.MaterialsData.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.content.MaterialsData build() {
-      io.bloombox.schema.content.MaterialsData result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.content.MaterialsData buildPartial() {
-      io.bloombox.schema.content.MaterialsData result = new io.bloombox.schema.content.MaterialsData(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        ingredients_ = ingredients_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      }
-      result.ingredients_ = ingredients_;
-      result.grow_ = grow_;
-      result.species_ = species_;
-      if (geneticsBuilder_ == null) {
-        result.genetics_ = genetics_;
-      } else {
-        result.genetics_ = geneticsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.content.MaterialsData) {
-        return mergeFrom((io.bloombox.schema.content.MaterialsData)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.content.MaterialsData other) {
-      if (other == io.bloombox.schema.content.MaterialsData.getDefaultInstance()) return this;
-      if (!other.ingredients_.isEmpty()) {
-        if (ingredients_.isEmpty()) {
-          ingredients_ = other.ingredients_;
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          ensureIngredientsIsMutable();
-          ingredients_.addAll(other.ingredients_);
-        }
-        onChanged();
-      }
-      if (other.grow_ != 0) {
-        setGrowValue(other.getGrowValue());
-      }
-      if (other.species_ != 0) {
-        setSpeciesValue(other.getSpeciesValue());
-      }
-      if (other.hasGenetics()) {
-        mergeGenetics(other.getGenetics());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.content.MaterialsData parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.content.MaterialsData) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.protobuf.LazyStringList ingredients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-    private void ensureIngredientsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        ingredients_ = new com.google.protobuf.LazyStringArrayList(ingredients_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public com.google.protobuf.ProtocolStringList
-        getIngredientsList() {
-      return ingredients_.getUnmodifiableView();
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public int getIngredientsCount() {
-      return ingredients_.size();
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public java.lang.String getIngredients(int index) {
-      return ingredients_.get(index);
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public com.google.protobuf.ByteString
-        getIngredientsBytes(int index) {
-      return ingredients_.getByteString(index);
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public Builder setIngredients(
-        int index, java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureIngredientsIsMutable();
-      ingredients_.set(index, value);
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public Builder addIngredients(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureIngredientsIsMutable();
-      ingredients_.add(value);
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public Builder addAllIngredients(
-        java.lang.Iterable<java.lang.String> values) {
-      ensureIngredientsIsMutable();
-      com.google.protobuf.AbstractMessageLite.Builder.addAll(
-          values, ingredients_);
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public Builder clearIngredients() {
-      ingredients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00000001);
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>repeated string ingredients = 1;</code>
-     */
-    public Builder addIngredientsBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      ensureIngredientsIsMutable();
-      ingredients_.add(value);
-      onChanged();
-      return this;
-    }
-
-    private int grow_ = 0;
-    /**
-     * <code>.Grow grow = 2;</code>
-     */
-    public int getGrowValue() {
-      return grow_;
-    }
-    /**
-     * <code>.Grow grow = 2;</code>
-     */
-    public Builder setGrowValue(int value) {
-      grow_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Grow grow = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.Grow getGrow() {
-      io.bloombox.schema.product.struct.Grow result = io.bloombox.schema.product.struct.Grow.valueOf(grow_);
-      return result == null ? io.bloombox.schema.product.struct.Grow.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.Grow grow = 2;</code>
-     */
-    public Builder setGrow(io.bloombox.schema.product.struct.Grow value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      grow_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Grow grow = 2;</code>
-     */
-    public Builder clearGrow() {
-      
-      grow_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int species_ = 0;
-    /**
-     * <code>.Species species = 3;</code>
-     */
-    public int getSpeciesValue() {
-      return species_;
-    }
-    /**
-     * <code>.Species species = 3;</code>
-     */
-    public Builder setSpeciesValue(int value) {
-      species_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Species species = 3;</code>
-     */
-    public io.bloombox.schema.product.struct.Species getSpecies() {
-      io.bloombox.schema.product.struct.Species result = io.bloombox.schema.product.struct.Species.valueOf(species_);
-      return result == null ? io.bloombox.schema.product.struct.Species.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.Species species = 3;</code>
-     */
-    public Builder setSpecies(io.bloombox.schema.product.struct.Species value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      species_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.Species species = 3;</code>
-     */
-    public Builder clearSpecies() {
-      
-      species_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private io.bloombox.schema.product.struct.Genetics genetics_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.Genetics, io.bloombox.schema.product.struct.Genetics.Builder, io.bloombox.schema.product.struct.GeneticsOrBuilder> geneticsBuilder_;
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public boolean hasGenetics() {
-      return geneticsBuilder_ != null || genetics_ != null;
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public io.bloombox.schema.product.struct.Genetics getGenetics() {
-      if (geneticsBuilder_ == null) {
-        return genetics_ == null ? io.bloombox.schema.product.struct.Genetics.getDefaultInstance() : genetics_;
-      } else {
-        return geneticsBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public Builder setGenetics(io.bloombox.schema.product.struct.Genetics value) {
-      if (geneticsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        genetics_ = value;
-        onChanged();
-      } else {
-        geneticsBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public Builder setGenetics(
-        io.bloombox.schema.product.struct.Genetics.Builder builderForValue) {
-      if (geneticsBuilder_ == null) {
-        genetics_ = builderForValue.build();
-        onChanged();
-      } else {
-        geneticsBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public Builder mergeGenetics(io.bloombox.schema.product.struct.Genetics value) {
-      if (geneticsBuilder_ == null) {
-        if (genetics_ != null) {
-          genetics_ =
-            io.bloombox.schema.product.struct.Genetics.newBuilder(genetics_).mergeFrom(value).buildPartial();
-        } else {
-          genetics_ = value;
-        }
-        onChanged();
-      } else {
-        geneticsBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public Builder clearGenetics() {
-      if (geneticsBuilder_ == null) {
-        genetics_ = null;
-        onChanged();
-      } else {
-        genetics_ = null;
-        geneticsBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public io.bloombox.schema.product.struct.Genetics.Builder getGeneticsBuilder() {
-      
-      onChanged();
-      return getGeneticsFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    public io.bloombox.schema.product.struct.GeneticsOrBuilder getGeneticsOrBuilder() {
-      if (geneticsBuilder_ != null) {
-        return geneticsBuilder_.getMessageOrBuilder();
-      } else {
-        return genetics_ == null ?
-            io.bloombox.schema.product.struct.Genetics.getDefaultInstance() : genetics_;
-      }
-    }
-    /**
-     * <code>.Genetics genetics = 4;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.Genetics, io.bloombox.schema.product.struct.Genetics.Builder, io.bloombox.schema.product.struct.GeneticsOrBuilder> 
-        getGeneticsFieldBuilder() {
-      if (geneticsBuilder_ == null) {
-        geneticsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.product.struct.Genetics, io.bloombox.schema.product.struct.Genetics.Builder, io.bloombox.schema.product.struct.GeneticsOrBuilder>(
-                getGenetics(),
-                getParentForChildren(),
-                isClean());
-        genetics_ = null;
-      }
-      return geneticsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:MaterialsData)
-  }
-
-  // @@protoc_insertion_point(class_scope:MaterialsData)
-  private static final io.bloombox.schema.content.MaterialsData DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.content.MaterialsData();
-  }
-
-  public static io.bloombox.schema.content.MaterialsData getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<MaterialsData>
-      PARSER = new com.google.protobuf.AbstractParser<MaterialsData>() {
-    public MaterialsData parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new MaterialsData(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<MaterialsData> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<MaterialsData> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.content.MaterialsData getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/content/MaterialsDataOrBuilder.java b/languages/java/io/bloombox/schema/content/MaterialsDataOrBuilder.java
deleted file mode 100644
index 3bd5f6e..0000000
--- a/languages/java/io/bloombox/schema/content/MaterialsDataOrBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-package io.bloombox.schema.content;
-
-public interface MaterialsDataOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:MaterialsData)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  java.util.List<java.lang.String>
-      getIngredientsList();
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  int getIngredientsCount();
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  java.lang.String getIngredients(int index);
-  /**
-   * <code>repeated string ingredients = 1;</code>
-   */
-  com.google.protobuf.ByteString
-      getIngredientsBytes(int index);
-
-  /**
-   * <code>.Grow grow = 2;</code>
-   */
-  int getGrowValue();
-  /**
-   * <code>.Grow grow = 2;</code>
-   */
-  io.bloombox.schema.product.struct.Grow getGrow();
-
-  /**
-   * <code>.Species species = 3;</code>
-   */
-  int getSpeciesValue();
-  /**
-   * <code>.Species species = 3;</code>
-   */
-  io.bloombox.schema.product.struct.Species getSpecies();
-
-  /**
-   * <code>.Genetics genetics = 4;</code>
-   */
-  boolean hasGenetics();
-  /**
-   * <code>.Genetics genetics = 4;</code>
-   */
-  io.bloombox.schema.product.struct.Genetics getGenetics();
-  /**
-   * <code>.Genetics genetics = 4;</code>
-   */
-  io.bloombox.schema.product.struct.GeneticsOrBuilder getGeneticsOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/content/MaterialsDataOuterClass.java b/languages/java/io/bloombox/schema/content/MaterialsDataOuterClass.java
deleted file mode 100644
index 4be3b57..0000000
--- a/languages/java/io/bloombox/schema/content/MaterialsDataOuterClass.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-package io.bloombox.schema.content;
-
-public final class MaterialsDataOuterClass {
-  private MaterialsDataOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MaterialsData_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MaterialsData_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\033content/MaterialsData.proto\032\022structs/G" +
-      "row.proto\032\025structs/Species.proto\032\026struct" +
-      "s/Genetics.proto\"q\n\rMaterialsData\022\023\n\013ing" +
-      "redients\030\001 \003(\t\022\023\n\004grow\030\002 \001(\0162\005.Grow\022\031\n\007s" +
-      "pecies\030\003 \001(\0162\010.Species\022\033\n\010genetics\030\004 \001(\013" +
-      "2\t.GeneticsB\036\n\032io.bloombox.schema.conten" +
-      "tP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.product.struct.GrowOuterClass.getDescriptor(),
-          io.bloombox.schema.product.struct.SpeciesOuterClass.getDescriptor(),
-          io.bloombox.schema.product.struct.GeneticsOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_MaterialsData_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MaterialsData_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MaterialsData_descriptor,
-        new java.lang.String[] { "Ingredients", "Grow", "Species", "Genetics", });
-    io.bloombox.schema.product.struct.GrowOuterClass.getDescriptor();
-    io.bloombox.schema.product.struct.SpeciesOuterClass.getDescriptor();
-    io.bloombox.schema.product.struct.GeneticsOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/Name.java b/languages/java/io/bloombox/schema/content/Name.java
deleted file mode 100644
index b514347..0000000
--- a/languages/java/io/bloombox/schema/content/Name.java
+++ /dev/null
@@ -1,696 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-package io.bloombox.schema.content;
-
-/**
- * Protobuf type {@code Name}
- */
-public  final class Name extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Name)
-    NameOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Name.newBuilder() to construct.
-  private Name(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Name() {
-    primary_ = "";
-    display_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Name(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            primary_ = s;
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            display_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.content.NameContent.internal_static_Name_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.content.NameContent.internal_static_Name_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.content.Name.class, io.bloombox.schema.content.Name.Builder.class);
-  }
-
-  public static final int PRIMARY_FIELD_NUMBER = 1;
-  private volatile java.lang.Object primary_;
-  /**
-   * <pre>
-   * basic name
-   * </pre>
-   *
-   * <code>string primary = 1;</code>
-   */
-  public java.lang.String getPrimary() {
-    java.lang.Object ref = primary_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      primary_ = s;
-      return s;
-    }
-  }
-  /**
-   * <pre>
-   * basic name
-   * </pre>
-   *
-   * <code>string primary = 1;</code>
-   */
-  public com.google.protobuf.ByteString
-      getPrimaryBytes() {
-    java.lang.Object ref = primary_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      primary_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int DISPLAY_FIELD_NUMBER = 2;
-  private volatile java.lang.Object display_;
-  /**
-   * <pre>
-   * display name
-   * </pre>
-   *
-   * <code>string display = 2;</code>
-   */
-  public java.lang.String getDisplay() {
-    java.lang.Object ref = display_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      display_ = s;
-      return s;
-    }
-  }
-  /**
-   * <pre>
-   * display name
-   * </pre>
-   *
-   * <code>string display = 2;</code>
-   */
-  public com.google.protobuf.ByteString
-      getDisplayBytes() {
-    java.lang.Object ref = display_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      display_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getPrimaryBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, primary_);
-    }
-    if (!getDisplayBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, display_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getPrimaryBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, primary_);
-    }
-    if (!getDisplayBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, display_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.content.Name)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.content.Name other = (io.bloombox.schema.content.Name) obj;
-
-    boolean result = true;
-    result = result && getPrimary()
-        .equals(other.getPrimary());
-    result = result && getDisplay()
-        .equals(other.getDisplay());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PRIMARY_FIELD_NUMBER;
-    hash = (53 * hash) + getPrimary().hashCode();
-    hash = (37 * hash) + DISPLAY_FIELD_NUMBER;
-    hash = (53 * hash) + getDisplay().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.content.Name parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Name parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Name parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.Name parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.content.Name prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code Name}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Name)
-      io.bloombox.schema.content.NameOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.NameContent.internal_static_Name_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.content.NameContent.internal_static_Name_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.content.Name.class, io.bloombox.schema.content.Name.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.content.Name.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      primary_ = "";
-
-      display_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.content.NameContent.internal_static_Name_descriptor;
-    }
-
-    public io.bloombox.schema.content.Name getDefaultInstanceForType() {
-      return io.bloombox.schema.content.Name.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.content.Name build() {
-      io.bloombox.schema.content.Name result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.content.Name buildPartial() {
-      io.bloombox.schema.content.Name result = new io.bloombox.schema.content.Name(this);
-      result.primary_ = primary_;
-      result.display_ = display_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.content.Name) {
-        return mergeFrom((io.bloombox.schema.content.Name)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.content.Name other) {
-      if (other == io.bloombox.schema.content.Name.getDefaultInstance()) return this;
-      if (!other.getPrimary().isEmpty()) {
-        primary_ = other.primary_;
-        onChanged();
-      }
-      if (!other.getDisplay().isEmpty()) {
-        display_ = other.display_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.content.Name parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.content.Name) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object primary_ = "";
-    /**
-     * <pre>
-     * basic name
-     * </pre>
-     *
-     * <code>string primary = 1;</code>
-     */
-    public java.lang.String getPrimary() {
-      java.lang.Object ref = primary_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        primary_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <pre>
-     * basic name
-     * </pre>
-     *
-     * <code>string primary = 1;</code>
-     */
-    public com.google.protobuf.ByteString
-        getPrimaryBytes() {
-      java.lang.Object ref = primary_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        primary_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <pre>
-     * basic name
-     * </pre>
-     *
-     * <code>string primary = 1;</code>
-     */
-    public Builder setPrimary(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      primary_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * basic name
-     * </pre>
-     *
-     * <code>string primary = 1;</code>
-     */
-    public Builder clearPrimary() {
-      
-      primary_ = getDefaultInstance().getPrimary();
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * basic name
-     * </pre>
-     *
-     * <code>string primary = 1;</code>
-     */
-    public Builder setPrimaryBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      primary_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object display_ = "";
-    /**
-     * <pre>
-     * display name
-     * </pre>
-     *
-     * <code>string display = 2;</code>
-     */
-    public java.lang.String getDisplay() {
-      java.lang.Object ref = display_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        display_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <pre>
-     * display name
-     * </pre>
-     *
-     * <code>string display = 2;</code>
-     */
-    public com.google.protobuf.ByteString
-        getDisplayBytes() {
-      java.lang.Object ref = display_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        display_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <pre>
-     * display name
-     * </pre>
-     *
-     * <code>string display = 2;</code>
-     */
-    public Builder setDisplay(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      display_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * display name
-     * </pre>
-     *
-     * <code>string display = 2;</code>
-     */
-    public Builder clearDisplay() {
-      
-      display_ = getDefaultInstance().getDisplay();
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * display name
-     * </pre>
-     *
-     * <code>string display = 2;</code>
-     */
-    public Builder setDisplayBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      display_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Name)
-  }
-
-  // @@protoc_insertion_point(class_scope:Name)
-  private static final io.bloombox.schema.content.Name DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.content.Name();
-  }
-
-  public static io.bloombox.schema.content.Name getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Name>
-      PARSER = new com.google.protobuf.AbstractParser<Name>() {
-    public Name parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Name(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Name> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Name> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.content.Name getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/content/NameContent.java b/languages/java/io/bloombox/schema/content/NameContent.java
deleted file mode 100644
index 2be0234..0000000
--- a/languages/java/io/bloombox/schema/content/NameContent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-package io.bloombox.schema.content;
-
-public final class NameContent {
-  private NameContent() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Name_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Name_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\022content/Name.proto\"(\n\004Name\022\017\n\007primary\030" +
-      "\001 \001(\t\022\017\n\007display\030\002 \001(\tB0\n\032io.bloombox.sc" +
-      "hema.contentB\013NameContentH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_Name_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Name_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Name_descriptor,
-        new java.lang.String[] { "Primary", "Display", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/NameOrBuilder.java b/languages/java/io/bloombox/schema/content/NameOrBuilder.java
deleted file mode 100644
index 1f636c4..0000000
--- a/languages/java/io/bloombox/schema/content/NameOrBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-package io.bloombox.schema.content;
-
-public interface NameOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Name)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <pre>
-   * basic name
-   * </pre>
-   *
-   * <code>string primary = 1;</code>
-   */
-  java.lang.String getPrimary();
-  /**
-   * <pre>
-   * basic name
-   * </pre>
-   *
-   * <code>string primary = 1;</code>
-   */
-  com.google.protobuf.ByteString
-      getPrimaryBytes();
-
-  /**
-   * <pre>
-   * display name
-   * </pre>
-   *
-   * <code>string display = 2;</code>
-   */
-  java.lang.String getDisplay();
-  /**
-   * <pre>
-   * display name
-   * </pre>
-   *
-   * <code>string display = 2;</code>
-   */
-  com.google.protobuf.ByteString
-      getDisplayBytes();
-}
diff --git a/languages/java/io/bloombox/schema/content/NameOuterClass.java b/languages/java/io/bloombox/schema/content/NameOuterClass.java
deleted file mode 100644
index f185eb4..0000000
--- a/languages/java/io/bloombox/schema/content/NameOuterClass.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-package io.bloombox.schema.content;
-
-public final class NameOuterClass {
-  private NameOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Name_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Name_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\022content/Name.proto\"(\n\004Name\022\017\n\007primary\030" +
-      "\001 \001(\t\022\017\n\007display\030\002 \001(\tB\036\n\032io.bloombox.sc" +
-      "hema.contentP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_Name_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Name_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Name_descriptor,
-        new java.lang.String[] { "Primary", "Display", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/content/ProductContent.java b/languages/java/io/bloombox/schema/content/ProductContent.java
deleted file mode 100644
index fad9b1a..0000000
--- a/languages/java/io/bloombox/schema/content/ProductContent.java
+++ /dev/null
@@ -1,2200 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-package io.bloombox.schema.content;
-
-/**
- * Protobuf type {@code ProductContent}
- */
-public  final class ProductContent extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ProductContent)
-    ProductContentOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ProductContent.newBuilder() to construct.
-  private ProductContent(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ProductContent() {
-    media_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ProductContent(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            io.bloombox.schema.content.Name.Builder subBuilder = null;
-            if (name_ != null) {
-              subBuilder = name_.toBuilder();
-            }
-            name_ = input.readMessage(io.bloombox.schema.content.Name.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(name_);
-              name_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.content.Content.Builder subBuilder = null;
-            if (summary_ != null) {
-              subBuilder = summary_.toBuilder();
-            }
-            summary_ = input.readMessage(io.bloombox.schema.content.Content.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(summary_);
-              summary_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            io.bloombox.schema.content.Brand.Builder subBuilder = null;
-            if (brand_ != null) {
-              subBuilder = brand_.toBuilder();
-            }
-            brand_ = input.readMessage(io.bloombox.schema.content.Brand.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(brand_);
-              brand_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 162: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              media_ = new java.util.ArrayList<io.bloombox.schema.media.MediaItem>();
-              mutable_bitField0_ |= 0x00000008;
-            }
-            media_.add(
-                input.readMessage(io.bloombox.schema.media.MediaItem.parser(), extensionRegistry));
-            break;
-          }
-          case 242: {
-            io.bloombox.schema.content.Content.Builder subBuilder = null;
-            if (usage_ != null) {
-              subBuilder = usage_.toBuilder();
-            }
-            usage_ = input.readMessage(io.bloombox.schema.content.Content.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(usage_);
-              usage_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 250: {
-            io.bloombox.schema.content.Content.Builder subBuilder = null;
-            if (dosage_ != null) {
-              subBuilder = dosage_.toBuilder();
-            }
-            dosage_ = input.readMessage(io.bloombox.schema.content.Content.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(dosage_);
-              dosage_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 258: {
-            io.bloombox.schema.content.Content.Builder subBuilder = null;
-            if (advice_ != null) {
-              subBuilder = advice_.toBuilder();
-            }
-            advice_ = input.readMessage(io.bloombox.schema.content.Content.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(advice_);
-              advice_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-        media_ = java.util.Collections.unmodifiableList(media_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.content.AttachedContent.internal_static_ProductContent_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.content.AttachedContent.internal_static_ProductContent_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.content.ProductContent.class, io.bloombox.schema.content.ProductContent.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int NAME_FIELD_NUMBER = 1;
-  private io.bloombox.schema.content.Name name_;
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  public boolean hasName() {
-    return name_ != null;
-  }
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  public io.bloombox.schema.content.Name getName() {
-    return name_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : name_;
-  }
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  public io.bloombox.schema.content.NameOrBuilder getNameOrBuilder() {
-    return getName();
-  }
-
-  public static final int SUMMARY_FIELD_NUMBER = 2;
-  private io.bloombox.schema.content.Content summary_;
-  /**
-   * <pre>
-   * narrative summary
-   * </pre>
-   *
-   * <code>.Content summary = 2;</code>
-   */
-  public boolean hasSummary() {
-    return summary_ != null;
-  }
-  /**
-   * <pre>
-   * narrative summary
-   * </pre>
-   *
-   * <code>.Content summary = 2;</code>
-   */
-  public io.bloombox.schema.content.Content getSummary() {
-    return summary_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : summary_;
-  }
-  /**
-   * <pre>
-   * narrative summary
-   * </pre>
-   *
-   * <code>.Content summary = 2;</code>
-   */
-  public io.bloombox.schema.content.ContentOrBuilder getSummaryOrBuilder() {
-    return getSummary();
-  }
-
-  public static final int BRAND_FIELD_NUMBER = 3;
-  private io.bloombox.schema.content.Brand brand_;
-  /**
-   * <pre>
-   * product's brand
-   * </pre>
-   *
-   * <code>.Brand brand = 3;</code>
-   */
-  public boolean hasBrand() {
-    return brand_ != null;
-  }
-  /**
-   * <pre>
-   * product's brand
-   * </pre>
-   *
-   * <code>.Brand brand = 3;</code>
-   */
-  public io.bloombox.schema.content.Brand getBrand() {
-    return brand_ == null ? io.bloombox.schema.content.Brand.getDefaultInstance() : brand_;
-  }
-  /**
-   * <pre>
-   * product's brand
-   * </pre>
-   *
-   * <code>.Brand brand = 3;</code>
-   */
-  public io.bloombox.schema.content.BrandOrBuilder getBrandOrBuilder() {
-    return getBrand();
-  }
-
-  public static final int MEDIA_FIELD_NUMBER = 20;
-  private java.util.List<io.bloombox.schema.media.MediaItem> media_;
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public java.util.List<io.bloombox.schema.media.MediaItem> getMediaList() {
-    return media_;
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public java.util.List<? extends io.bloombox.schema.media.MediaItemOrBuilder> 
-      getMediaOrBuilderList() {
-    return media_;
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public int getMediaCount() {
-    return media_.size();
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public io.bloombox.schema.media.MediaItem getMedia(int index) {
-    return media_.get(index);
-  }
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  public io.bloombox.schema.media.MediaItemOrBuilder getMediaOrBuilder(
-      int index) {
-    return media_.get(index);
-  }
-
-  public static final int USAGE_FIELD_NUMBER = 30;
-  private io.bloombox.schema.content.Content usage_;
-  /**
-   * <pre>
-   * -- Extended Attributes
-   * </pre>
-   *
-   * <code>.Content usage = 30;</code>
-   */
-  public boolean hasUsage() {
-    return usage_ != null;
-  }
-  /**
-   * <pre>
-   * -- Extended Attributes
-   * </pre>
-   *
-   * <code>.Content usage = 30;</code>
-   */
-  public io.bloombox.schema.content.Content getUsage() {
-    return usage_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : usage_;
-  }
-  /**
-   * <pre>
-   * -- Extended Attributes
-   * </pre>
-   *
-   * <code>.Content usage = 30;</code>
-   */
-  public io.bloombox.schema.content.ContentOrBuilder getUsageOrBuilder() {
-    return getUsage();
-  }
-
-  public static final int DOSAGE_FIELD_NUMBER = 31;
-  private io.bloombox.schema.content.Content dosage_;
-  /**
-   * <pre>
-   * dosage advice
-   * </pre>
-   *
-   * <code>.Content dosage = 31;</code>
-   */
-  public boolean hasDosage() {
-    return dosage_ != null;
-  }
-  /**
-   * <pre>
-   * dosage advice
-   * </pre>
-   *
-   * <code>.Content dosage = 31;</code>
-   */
-  public io.bloombox.schema.content.Content getDosage() {
-    return dosage_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : dosage_;
-  }
-  /**
-   * <pre>
-   * dosage advice
-   * </pre>
-   *
-   * <code>.Content dosage = 31;</code>
-   */
-  public io.bloombox.schema.content.ContentOrBuilder getDosageOrBuilder() {
-    return getDosage();
-  }
-
-  public static final int ADVICE_FIELD_NUMBER = 32;
-  private io.bloombox.schema.content.Content advice_;
-  /**
-   * <pre>
-   * internal advice
-   * </pre>
-   *
-   * <code>.Content advice = 32;</code>
-   */
-  public boolean hasAdvice() {
-    return advice_ != null;
-  }
-  /**
-   * <pre>
-   * internal advice
-   * </pre>
-   *
-   * <code>.Content advice = 32;</code>
-   */
-  public io.bloombox.schema.content.Content getAdvice() {
-    return advice_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : advice_;
-  }
-  /**
-   * <pre>
-   * internal advice
-   * </pre>
-   *
-   * <code>.Content advice = 32;</code>
-   */
-  public io.bloombox.schema.content.ContentOrBuilder getAdviceOrBuilder() {
-    return getAdvice();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (name_ != null) {
-      output.writeMessage(1, getName());
-    }
-    if (summary_ != null) {
-      output.writeMessage(2, getSummary());
-    }
-    if (brand_ != null) {
-      output.writeMessage(3, getBrand());
-    }
-    for (int i = 0; i < media_.size(); i++) {
-      output.writeMessage(20, media_.get(i));
-    }
-    if (usage_ != null) {
-      output.writeMessage(30, getUsage());
-    }
-    if (dosage_ != null) {
-      output.writeMessage(31, getDosage());
-    }
-    if (advice_ != null) {
-      output.writeMessage(32, getAdvice());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (name_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getName());
-    }
-    if (summary_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getSummary());
-    }
-    if (brand_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getBrand());
-    }
-    for (int i = 0; i < media_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(20, media_.get(i));
-    }
-    if (usage_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(30, getUsage());
-    }
-    if (dosage_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(31, getDosage());
-    }
-    if (advice_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(32, getAdvice());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.content.ProductContent)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.content.ProductContent other = (io.bloombox.schema.content.ProductContent) obj;
-
-    boolean result = true;
-    result = result && (hasName() == other.hasName());
-    if (hasName()) {
-      result = result && getName()
-          .equals(other.getName());
-    }
-    result = result && (hasSummary() == other.hasSummary());
-    if (hasSummary()) {
-      result = result && getSummary()
-          .equals(other.getSummary());
-    }
-    result = result && (hasBrand() == other.hasBrand());
-    if (hasBrand()) {
-      result = result && getBrand()
-          .equals(other.getBrand());
-    }
-    result = result && getMediaList()
-        .equals(other.getMediaList());
-    result = result && (hasUsage() == other.hasUsage());
-    if (hasUsage()) {
-      result = result && getUsage()
-          .equals(other.getUsage());
-    }
-    result = result && (hasDosage() == other.hasDosage());
-    if (hasDosage()) {
-      result = result && getDosage()
-          .equals(other.getDosage());
-    }
-    result = result && (hasAdvice() == other.hasAdvice());
-    if (hasAdvice()) {
-      result = result && getAdvice()
-          .equals(other.getAdvice());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasName()) {
-      hash = (37 * hash) + NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getName().hashCode();
-    }
-    if (hasSummary()) {
-      hash = (37 * hash) + SUMMARY_FIELD_NUMBER;
-      hash = (53 * hash) + getSummary().hashCode();
-    }
-    if (hasBrand()) {
-      hash = (37 * hash) + BRAND_FIELD_NUMBER;
-      hash = (53 * hash) + getBrand().hashCode();
-    }
-    if (getMediaCount() > 0) {
-      hash = (37 * hash) + MEDIA_FIELD_NUMBER;
-      hash = (53 * hash) + getMediaList().hashCode();
-    }
-    if (hasUsage()) {
-      hash = (37 * hash) + USAGE_FIELD_NUMBER;
-      hash = (53 * hash) + getUsage().hashCode();
-    }
-    if (hasDosage()) {
-      hash = (37 * hash) + DOSAGE_FIELD_NUMBER;
-      hash = (53 * hash) + getDosage().hashCode();
-    }
-    if (hasAdvice()) {
-      hash = (37 * hash) + ADVICE_FIELD_NUMBER;
-      hash = (53 * hash) + getAdvice().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.ProductContent parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.ProductContent parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.content.ProductContent parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.content.ProductContent prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code ProductContent}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ProductContent)
-      io.bloombox.schema.content.ProductContentOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.content.AttachedContent.internal_static_ProductContent_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.content.AttachedContent.internal_static_ProductContent_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.content.ProductContent.class, io.bloombox.schema.content.ProductContent.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.content.ProductContent.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getMediaFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (nameBuilder_ == null) {
-        name_ = null;
-      } else {
-        name_ = null;
-        nameBuilder_ = null;
-      }
-      if (summaryBuilder_ == null) {
-        summary_ = null;
-      } else {
-        summary_ = null;
-        summaryBuilder_ = null;
-      }
-      if (brandBuilder_ == null) {
-        brand_ = null;
-      } else {
-        brand_ = null;
-        brandBuilder_ = null;
-      }
-      if (mediaBuilder_ == null) {
-        media_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-      } else {
-        mediaBuilder_.clear();
-      }
-      if (usageBuilder_ == null) {
-        usage_ = null;
-      } else {
-        usage_ = null;
-        usageBuilder_ = null;
-      }
-      if (dosageBuilder_ == null) {
-        dosage_ = null;
-      } else {
-        dosage_ = null;
-        dosageBuilder_ = null;
-      }
-      if (adviceBuilder_ == null) {
-        advice_ = null;
-      } else {
-        advice_ = null;
-        adviceBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.content.AttachedContent.internal_static_ProductContent_descriptor;
-    }
-
-    public io.bloombox.schema.content.ProductContent getDefaultInstanceForType() {
-      return io.bloombox.schema.content.ProductContent.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.content.ProductContent build() {
-      io.bloombox.schema.content.ProductContent result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.content.ProductContent buildPartial() {
-      io.bloombox.schema.content.ProductContent result = new io.bloombox.schema.content.ProductContent(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (nameBuilder_ == null) {
-        result.name_ = name_;
-      } else {
-        result.name_ = nameBuilder_.build();
-      }
-      if (summaryBuilder_ == null) {
-        result.summary_ = summary_;
-      } else {
-        result.summary_ = summaryBuilder_.build();
-      }
-      if (brandBuilder_ == null) {
-        result.brand_ = brand_;
-      } else {
-        result.brand_ = brandBuilder_.build();
-      }
-      if (mediaBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          media_ = java.util.Collections.unmodifiableList(media_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.media_ = media_;
-      } else {
-        result.media_ = mediaBuilder_.build();
-      }
-      if (usageBuilder_ == null) {
-        result.usage_ = usage_;
-      } else {
-        result.usage_ = usageBuilder_.build();
-      }
-      if (dosageBuilder_ == null) {
-        result.dosage_ = dosage_;
-      } else {
-        result.dosage_ = dosageBuilder_.build();
-      }
-      if (adviceBuilder_ == null) {
-        result.advice_ = advice_;
-      } else {
-        result.advice_ = adviceBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.content.ProductContent) {
-        return mergeFrom((io.bloombox.schema.content.ProductContent)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.content.ProductContent other) {
-      if (other == io.bloombox.schema.content.ProductContent.getDefaultInstance()) return this;
-      if (other.hasName()) {
-        mergeName(other.getName());
-      }
-      if (other.hasSummary()) {
-        mergeSummary(other.getSummary());
-      }
-      if (other.hasBrand()) {
-        mergeBrand(other.getBrand());
-      }
-      if (mediaBuilder_ == null) {
-        if (!other.media_.isEmpty()) {
-          if (media_.isEmpty()) {
-            media_ = other.media_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureMediaIsMutable();
-            media_.addAll(other.media_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.media_.isEmpty()) {
-          if (mediaBuilder_.isEmpty()) {
-            mediaBuilder_.dispose();
-            mediaBuilder_ = null;
-            media_ = other.media_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-            mediaBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getMediaFieldBuilder() : null;
-          } else {
-            mediaBuilder_.addAllMessages(other.media_);
-          }
-        }
-      }
-      if (other.hasUsage()) {
-        mergeUsage(other.getUsage());
-      }
-      if (other.hasDosage()) {
-        mergeDosage(other.getDosage());
-      }
-      if (other.hasAdvice()) {
-        mergeAdvice(other.getAdvice());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.content.ProductContent parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.content.ProductContent) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private io.bloombox.schema.content.Name name_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> nameBuilder_;
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public boolean hasName() {
-      return nameBuilder_ != null || name_ != null;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public io.bloombox.schema.content.Name getName() {
-      if (nameBuilder_ == null) {
-        return name_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : name_;
-      } else {
-        return nameBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder setName(io.bloombox.schema.content.Name value) {
-      if (nameBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        name_ = value;
-        onChanged();
-      } else {
-        nameBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder setName(
-        io.bloombox.schema.content.Name.Builder builderForValue) {
-      if (nameBuilder_ == null) {
-        name_ = builderForValue.build();
-        onChanged();
-      } else {
-        nameBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder mergeName(io.bloombox.schema.content.Name value) {
-      if (nameBuilder_ == null) {
-        if (name_ != null) {
-          name_ =
-            io.bloombox.schema.content.Name.newBuilder(name_).mergeFrom(value).buildPartial();
-        } else {
-          name_ = value;
-        }
-        onChanged();
-      } else {
-        nameBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public Builder clearName() {
-      if (nameBuilder_ == null) {
-        name_ = null;
-        onChanged();
-      } else {
-        name_ = null;
-        nameBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public io.bloombox.schema.content.Name.Builder getNameBuilder() {
-      
-      onChanged();
-      return getNameFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    public io.bloombox.schema.content.NameOrBuilder getNameOrBuilder() {
-      if (nameBuilder_ != null) {
-        return nameBuilder_.getMessageOrBuilder();
-      } else {
-        return name_ == null ?
-            io.bloombox.schema.content.Name.getDefaultInstance() : name_;
-      }
-    }
-    /**
-     * <pre>
-     * -- Basic Properties
-     * </pre>
-     *
-     * <code>.Name name = 1;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> 
-        getNameFieldBuilder() {
-      if (nameBuilder_ == null) {
-        nameBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder>(
-                getName(),
-                getParentForChildren(),
-                isClean());
-        name_ = null;
-      }
-      return nameBuilder_;
-    }
-
-    private io.bloombox.schema.content.Content summary_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> summaryBuilder_;
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public boolean hasSummary() {
-      return summaryBuilder_ != null || summary_ != null;
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public io.bloombox.schema.content.Content getSummary() {
-      if (summaryBuilder_ == null) {
-        return summary_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : summary_;
-      } else {
-        return summaryBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public Builder setSummary(io.bloombox.schema.content.Content value) {
-      if (summaryBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        summary_ = value;
-        onChanged();
-      } else {
-        summaryBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public Builder setSummary(
-        io.bloombox.schema.content.Content.Builder builderForValue) {
-      if (summaryBuilder_ == null) {
-        summary_ = builderForValue.build();
-        onChanged();
-      } else {
-        summaryBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public Builder mergeSummary(io.bloombox.schema.content.Content value) {
-      if (summaryBuilder_ == null) {
-        if (summary_ != null) {
-          summary_ =
-            io.bloombox.schema.content.Content.newBuilder(summary_).mergeFrom(value).buildPartial();
-        } else {
-          summary_ = value;
-        }
-        onChanged();
-      } else {
-        summaryBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public Builder clearSummary() {
-      if (summaryBuilder_ == null) {
-        summary_ = null;
-        onChanged();
-      } else {
-        summary_ = null;
-        summaryBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public io.bloombox.schema.content.Content.Builder getSummaryBuilder() {
-      
-      onChanged();
-      return getSummaryFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    public io.bloombox.schema.content.ContentOrBuilder getSummaryOrBuilder() {
-      if (summaryBuilder_ != null) {
-        return summaryBuilder_.getMessageOrBuilder();
-      } else {
-        return summary_ == null ?
-            io.bloombox.schema.content.Content.getDefaultInstance() : summary_;
-      }
-    }
-    /**
-     * <pre>
-     * narrative summary
-     * </pre>
-     *
-     * <code>.Content summary = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> 
-        getSummaryFieldBuilder() {
-      if (summaryBuilder_ == null) {
-        summaryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder>(
-                getSummary(),
-                getParentForChildren(),
-                isClean());
-        summary_ = null;
-      }
-      return summaryBuilder_;
-    }
-
-    private io.bloombox.schema.content.Brand brand_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Brand, io.bloombox.schema.content.Brand.Builder, io.bloombox.schema.content.BrandOrBuilder> brandBuilder_;
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public boolean hasBrand() {
-      return brandBuilder_ != null || brand_ != null;
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public io.bloombox.schema.content.Brand getBrand() {
-      if (brandBuilder_ == null) {
-        return brand_ == null ? io.bloombox.schema.content.Brand.getDefaultInstance() : brand_;
-      } else {
-        return brandBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public Builder setBrand(io.bloombox.schema.content.Brand value) {
-      if (brandBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        brand_ = value;
-        onChanged();
-      } else {
-        brandBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public Builder setBrand(
-        io.bloombox.schema.content.Brand.Builder builderForValue) {
-      if (brandBuilder_ == null) {
-        brand_ = builderForValue.build();
-        onChanged();
-      } else {
-        brandBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public Builder mergeBrand(io.bloombox.schema.content.Brand value) {
-      if (brandBuilder_ == null) {
-        if (brand_ != null) {
-          brand_ =
-            io.bloombox.schema.content.Brand.newBuilder(brand_).mergeFrom(value).buildPartial();
-        } else {
-          brand_ = value;
-        }
-        onChanged();
-      } else {
-        brandBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public Builder clearBrand() {
-      if (brandBuilder_ == null) {
-        brand_ = null;
-        onChanged();
-      } else {
-        brand_ = null;
-        brandBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public io.bloombox.schema.content.Brand.Builder getBrandBuilder() {
-      
-      onChanged();
-      return getBrandFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    public io.bloombox.schema.content.BrandOrBuilder getBrandOrBuilder() {
-      if (brandBuilder_ != null) {
-        return brandBuilder_.getMessageOrBuilder();
-      } else {
-        return brand_ == null ?
-            io.bloombox.schema.content.Brand.getDefaultInstance() : brand_;
-      }
-    }
-    /**
-     * <pre>
-     * product's brand
-     * </pre>
-     *
-     * <code>.Brand brand = 3;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Brand, io.bloombox.schema.content.Brand.Builder, io.bloombox.schema.content.BrandOrBuilder> 
-        getBrandFieldBuilder() {
-      if (brandBuilder_ == null) {
-        brandBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Brand, io.bloombox.schema.content.Brand.Builder, io.bloombox.schema.content.BrandOrBuilder>(
-                getBrand(),
-                getParentForChildren(),
-                isClean());
-        brand_ = null;
-      }
-      return brandBuilder_;
-    }
-
-    private java.util.List<io.bloombox.schema.media.MediaItem> media_ =
-      java.util.Collections.emptyList();
-    private void ensureMediaIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        media_ = new java.util.ArrayList<io.bloombox.schema.media.MediaItem>(media_);
-        bitField0_ |= 0x00000008;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.media.MediaItem, io.bloombox.schema.media.MediaItem.Builder, io.bloombox.schema.media.MediaItemOrBuilder> mediaBuilder_;
-
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public java.util.List<io.bloombox.schema.media.MediaItem> getMediaList() {
-      if (mediaBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(media_);
-      } else {
-        return mediaBuilder_.getMessageList();
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public int getMediaCount() {
-      if (mediaBuilder_ == null) {
-        return media_.size();
-      } else {
-        return mediaBuilder_.getCount();
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem getMedia(int index) {
-      if (mediaBuilder_ == null) {
-        return media_.get(index);
-      } else {
-        return mediaBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder setMedia(
-        int index, io.bloombox.schema.media.MediaItem value) {
-      if (mediaBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMediaIsMutable();
-        media_.set(index, value);
-        onChanged();
-      } else {
-        mediaBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder setMedia(
-        int index, io.bloombox.schema.media.MediaItem.Builder builderForValue) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        mediaBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(io.bloombox.schema.media.MediaItem value) {
-      if (mediaBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMediaIsMutable();
-        media_.add(value);
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(
-        int index, io.bloombox.schema.media.MediaItem value) {
-      if (mediaBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMediaIsMutable();
-        media_.add(index, value);
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(
-        io.bloombox.schema.media.MediaItem.Builder builderForValue) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.add(builderForValue.build());
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addMedia(
-        int index, io.bloombox.schema.media.MediaItem.Builder builderForValue) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        mediaBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder addAllMedia(
-        java.lang.Iterable<? extends io.bloombox.schema.media.MediaItem> values) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, media_);
-        onChanged();
-      } else {
-        mediaBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder clearMedia() {
-      if (mediaBuilder_ == null) {
-        media_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-      } else {
-        mediaBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public Builder removeMedia(int index) {
-      if (mediaBuilder_ == null) {
-        ensureMediaIsMutable();
-        media_.remove(index);
-        onChanged();
-      } else {
-        mediaBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem.Builder getMediaBuilder(
-        int index) {
-      return getMediaFieldBuilder().getBuilder(index);
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItemOrBuilder getMediaOrBuilder(
-        int index) {
-      if (mediaBuilder_ == null) {
-        return media_.get(index);  } else {
-        return mediaBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public java.util.List<? extends io.bloombox.schema.media.MediaItemOrBuilder> 
-         getMediaOrBuilderList() {
-      if (mediaBuilder_ != null) {
-        return mediaBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(media_);
-      }
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem.Builder addMediaBuilder() {
-      return getMediaFieldBuilder().addBuilder(
-          io.bloombox.schema.media.MediaItem.getDefaultInstance());
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public io.bloombox.schema.media.MediaItem.Builder addMediaBuilder(
-        int index) {
-      return getMediaFieldBuilder().addBuilder(
-          index, io.bloombox.schema.media.MediaItem.getDefaultInstance());
-    }
-    /**
-     * <pre>
-     * -- Media
-     * </pre>
-     *
-     * <code>repeated .MediaItem media = 20;</code>
-     */
-    public java.util.List<io.bloombox.schema.media.MediaItem.Builder> 
-         getMediaBuilderList() {
-      return getMediaFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.media.MediaItem, io.bloombox.schema.media.MediaItem.Builder, io.bloombox.schema.media.MediaItemOrBuilder> 
-        getMediaFieldBuilder() {
-      if (mediaBuilder_ == null) {
-        mediaBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            io.bloombox.schema.media.MediaItem, io.bloombox.schema.media.MediaItem.Builder, io.bloombox.schema.media.MediaItemOrBuilder>(
-                media_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
-        media_ = null;
-      }
-      return mediaBuilder_;
-    }
-
-    private io.bloombox.schema.content.Content usage_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> usageBuilder_;
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public boolean hasUsage() {
-      return usageBuilder_ != null || usage_ != null;
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public io.bloombox.schema.content.Content getUsage() {
-      if (usageBuilder_ == null) {
-        return usage_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : usage_;
-      } else {
-        return usageBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public Builder setUsage(io.bloombox.schema.content.Content value) {
-      if (usageBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        usage_ = value;
-        onChanged();
-      } else {
-        usageBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public Builder setUsage(
-        io.bloombox.schema.content.Content.Builder builderForValue) {
-      if (usageBuilder_ == null) {
-        usage_ = builderForValue.build();
-        onChanged();
-      } else {
-        usageBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public Builder mergeUsage(io.bloombox.schema.content.Content value) {
-      if (usageBuilder_ == null) {
-        if (usage_ != null) {
-          usage_ =
-            io.bloombox.schema.content.Content.newBuilder(usage_).mergeFrom(value).buildPartial();
-        } else {
-          usage_ = value;
-        }
-        onChanged();
-      } else {
-        usageBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public Builder clearUsage() {
-      if (usageBuilder_ == null) {
-        usage_ = null;
-        onChanged();
-      } else {
-        usage_ = null;
-        usageBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public io.bloombox.schema.content.Content.Builder getUsageBuilder() {
-      
-      onChanged();
-      return getUsageFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    public io.bloombox.schema.content.ContentOrBuilder getUsageOrBuilder() {
-      if (usageBuilder_ != null) {
-        return usageBuilder_.getMessageOrBuilder();
-      } else {
-        return usage_ == null ?
-            io.bloombox.schema.content.Content.getDefaultInstance() : usage_;
-      }
-    }
-    /**
-     * <pre>
-     * -- Extended Attributes
-     * </pre>
-     *
-     * <code>.Content usage = 30;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> 
-        getUsageFieldBuilder() {
-      if (usageBuilder_ == null) {
-        usageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder>(
-                getUsage(),
-                getParentForChildren(),
-                isClean());
-        usage_ = null;
-      }
-      return usageBuilder_;
-    }
-
-    private io.bloombox.schema.content.Content dosage_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> dosageBuilder_;
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public boolean hasDosage() {
-      return dosageBuilder_ != null || dosage_ != null;
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public io.bloombox.schema.content.Content getDosage() {
-      if (dosageBuilder_ == null) {
-        return dosage_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : dosage_;
-      } else {
-        return dosageBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public Builder setDosage(io.bloombox.schema.content.Content value) {
-      if (dosageBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        dosage_ = value;
-        onChanged();
-      } else {
-        dosageBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public Builder setDosage(
-        io.bloombox.schema.content.Content.Builder builderForValue) {
-      if (dosageBuilder_ == null) {
-        dosage_ = builderForValue.build();
-        onChanged();
-      } else {
-        dosageBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public Builder mergeDosage(io.bloombox.schema.content.Content value) {
-      if (dosageBuilder_ == null) {
-        if (dosage_ != null) {
-          dosage_ =
-            io.bloombox.schema.content.Content.newBuilder(dosage_).mergeFrom(value).buildPartial();
-        } else {
-          dosage_ = value;
-        }
-        onChanged();
-      } else {
-        dosageBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public Builder clearDosage() {
-      if (dosageBuilder_ == null) {
-        dosage_ = null;
-        onChanged();
-      } else {
-        dosage_ = null;
-        dosageBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public io.bloombox.schema.content.Content.Builder getDosageBuilder() {
-      
-      onChanged();
-      return getDosageFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    public io.bloombox.schema.content.ContentOrBuilder getDosageOrBuilder() {
-      if (dosageBuilder_ != null) {
-        return dosageBuilder_.getMessageOrBuilder();
-      } else {
-        return dosage_ == null ?
-            io.bloombox.schema.content.Content.getDefaultInstance() : dosage_;
-      }
-    }
-    /**
-     * <pre>
-     * dosage advice
-     * </pre>
-     *
-     * <code>.Content dosage = 31;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> 
-        getDosageFieldBuilder() {
-      if (dosageBuilder_ == null) {
-        dosageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder>(
-                getDosage(),
-                getParentForChildren(),
-                isClean());
-        dosage_ = null;
-      }
-      return dosageBuilder_;
-    }
-
-    private io.bloombox.schema.content.Content advice_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> adviceBuilder_;
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public boolean hasAdvice() {
-      return adviceBuilder_ != null || advice_ != null;
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public io.bloombox.schema.content.Content getAdvice() {
-      if (adviceBuilder_ == null) {
-        return advice_ == null ? io.bloombox.schema.content.Content.getDefaultInstance() : advice_;
-      } else {
-        return adviceBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public Builder setAdvice(io.bloombox.schema.content.Content value) {
-      if (adviceBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        advice_ = value;
-        onChanged();
-      } else {
-        adviceBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public Builder setAdvice(
-        io.bloombox.schema.content.Content.Builder builderForValue) {
-      if (adviceBuilder_ == null) {
-        advice_ = builderForValue.build();
-        onChanged();
-      } else {
-        adviceBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public Builder mergeAdvice(io.bloombox.schema.content.Content value) {
-      if (adviceBuilder_ == null) {
-        if (advice_ != null) {
-          advice_ =
-            io.bloombox.schema.content.Content.newBuilder(advice_).mergeFrom(value).buildPartial();
-        } else {
-          advice_ = value;
-        }
-        onChanged();
-      } else {
-        adviceBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public Builder clearAdvice() {
-      if (adviceBuilder_ == null) {
-        advice_ = null;
-        onChanged();
-      } else {
-        advice_ = null;
-        adviceBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public io.bloombox.schema.content.Content.Builder getAdviceBuilder() {
-      
-      onChanged();
-      return getAdviceFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    public io.bloombox.schema.content.ContentOrBuilder getAdviceOrBuilder() {
-      if (adviceBuilder_ != null) {
-        return adviceBuilder_.getMessageOrBuilder();
-      } else {
-        return advice_ == null ?
-            io.bloombox.schema.content.Content.getDefaultInstance() : advice_;
-      }
-    }
-    /**
-     * <pre>
-     * internal advice
-     * </pre>
-     *
-     * <code>.Content advice = 32;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder> 
-        getAdviceFieldBuilder() {
-      if (adviceBuilder_ == null) {
-        adviceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Content, io.bloombox.schema.content.Content.Builder, io.bloombox.schema.content.ContentOrBuilder>(
-                getAdvice(),
-                getParentForChildren(),
-                isClean());
-        advice_ = null;
-      }
-      return adviceBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ProductContent)
-  }
-
-  // @@protoc_insertion_point(class_scope:ProductContent)
-  private static final io.bloombox.schema.content.ProductContent DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.content.ProductContent();
-  }
-
-  public static io.bloombox.schema.content.ProductContent getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ProductContent>
-      PARSER = new com.google.protobuf.AbstractParser<ProductContent>() {
-    public ProductContent parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductContent(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ProductContent> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ProductContent> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.content.ProductContent getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/content/ProductContentOrBuilder.java b/languages/java/io/bloombox/schema/content/ProductContentOrBuilder.java
deleted file mode 100644
index 4cc4fb3..0000000
--- a/languages/java/io/bloombox/schema/content/ProductContentOrBuilder.java
+++ /dev/null
@@ -1,203 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-package io.bloombox.schema.content;
-
-public interface ProductContentOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ProductContent)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  boolean hasName();
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  io.bloombox.schema.content.Name getName();
-  /**
-   * <pre>
-   * -- Basic Properties
-   * </pre>
-   *
-   * <code>.Name name = 1;</code>
-   */
-  io.bloombox.schema.content.NameOrBuilder getNameOrBuilder();
-
-  /**
-   * <pre>
-   * narrative summary
-   * </pre>
-   *
-   * <code>.Content summary = 2;</code>
-   */
-  boolean hasSummary();
-  /**
-   * <pre>
-   * narrative summary
-   * </pre>
-   *
-   * <code>.Content summary = 2;</code>
-   */
-  io.bloombox.schema.content.Content getSummary();
-  /**
-   * <pre>
-   * narrative summary
-   * </pre>
-   *
-   * <code>.Content summary = 2;</code>
-   */
-  io.bloombox.schema.content.ContentOrBuilder getSummaryOrBuilder();
-
-  /**
-   * <pre>
-   * product's brand
-   * </pre>
-   *
-   * <code>.Brand brand = 3;</code>
-   */
-  boolean hasBrand();
-  /**
-   * <pre>
-   * product's brand
-   * </pre>
-   *
-   * <code>.Brand brand = 3;</code>
-   */
-  io.bloombox.schema.content.Brand getBrand();
-  /**
-   * <pre>
-   * product's brand
-   * </pre>
-   *
-   * <code>.Brand brand = 3;</code>
-   */
-  io.bloombox.schema.content.BrandOrBuilder getBrandOrBuilder();
-
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  java.util.List<io.bloombox.schema.media.MediaItem> 
-      getMediaList();
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  io.bloombox.schema.media.MediaItem getMedia(int index);
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  int getMediaCount();
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  java.util.List<? extends io.bloombox.schema.media.MediaItemOrBuilder> 
-      getMediaOrBuilderList();
-  /**
-   * <pre>
-   * -- Media
-   * </pre>
-   *
-   * <code>repeated .MediaItem media = 20;</code>
-   */
-  io.bloombox.schema.media.MediaItemOrBuilder getMediaOrBuilder(
-      int index);
-
-  /**
-   * <pre>
-   * -- Extended Attributes
-   * </pre>
-   *
-   * <code>.Content usage = 30;</code>
-   */
-  boolean hasUsage();
-  /**
-   * <pre>
-   * -- Extended Attributes
-   * </pre>
-   *
-   * <code>.Content usage = 30;</code>
-   */
-  io.bloombox.schema.content.Content getUsage();
-  /**
-   * <pre>
-   * -- Extended Attributes
-   * </pre>
-   *
-   * <code>.Content usage = 30;</code>
-   */
-  io.bloombox.schema.content.ContentOrBuilder getUsageOrBuilder();
-
-  /**
-   * <pre>
-   * dosage advice
-   * </pre>
-   *
-   * <code>.Content dosage = 31;</code>
-   */
-  boolean hasDosage();
-  /**
-   * <pre>
-   * dosage advice
-   * </pre>
-   *
-   * <code>.Content dosage = 31;</code>
-   */
-  io.bloombox.schema.content.Content getDosage();
-  /**
-   * <pre>
-   * dosage advice
-   * </pre>
-   *
-   * <code>.Content dosage = 31;</code>
-   */
-  io.bloombox.schema.content.ContentOrBuilder getDosageOrBuilder();
-
-  /**
-   * <pre>
-   * internal advice
-   * </pre>
-   *
-   * <code>.Content advice = 32;</code>
-   */
-  boolean hasAdvice();
-  /**
-   * <pre>
-   * internal advice
-   * </pre>
-   *
-   * <code>.Content advice = 32;</code>
-   */
-  io.bloombox.schema.content.Content getAdvice();
-  /**
-   * <pre>
-   * internal advice
-   * </pre>
-   *
-   * <code>.Content advice = 32;</code>
-   */
-  io.bloombox.schema.content.ContentOrBuilder getAdviceOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/content/ProductContentOuterClass.java b/languages/java/io/bloombox/schema/content/ProductContentOuterClass.java
deleted file mode 100644
index 922e35b..0000000
--- a/languages/java/io/bloombox/schema/content/ProductContentOuterClass.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-package io.bloombox.schema.content;
-
-public final class ProductContentOuterClass {
-  private ProductContentOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductContent_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductContent_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\034content/ProductContent.proto\032\022content/" +
-      "Name.proto\032\023content/Brand.proto\032\025content" +
-      "/Content.proto\032\025media/MediaItem.proto\"\277\001" +
-      "\n\016ProductContent\022\023\n\004name\030\001 \001(\0132\005.Name\022\031\n" +
-      "\007summary\030\002 \001(\0132\010.Content\022\025\n\005brand\030\003 \001(\0132" +
-      "\006.Brand\022\031\n\005media\030\024 \003(\0132\n.MediaItem\022\027\n\005us" +
-      "age\030\036 \001(\0132\010.Content\022\030\n\006dosage\030\037 \001(\0132\010.Co" +
-      "ntent\022\030\n\006advice\030  \001(\0132\010.ContentB\036\n\032io.bl" +
-      "oombox.schema.contentP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.content.NameOuterClass.getDescriptor(),
-          io.bloombox.schema.content.BrandOuterClass.getDescriptor(),
-          io.bloombox.schema.content.ContentOuterClass.getDescriptor(),
-          io.bloombox.schema.media.MediaItemOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_ProductContent_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductContent_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductContent_descriptor,
-        new java.lang.String[] { "Name", "Summary", "Brand", "Media", "Usage", "Dosage", "Advice", });
-    io.bloombox.schema.content.NameOuterClass.getDescriptor();
-    io.bloombox.schema.content.BrandOuterClass.getDescriptor();
-    io.bloombox.schema.content.ContentOuterClass.getDescriptor();
-    io.bloombox.schema.media.MediaItemOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/geo/Address.java b/languages/java/io/bloombox/schema/geo/Address.java
deleted file mode 100644
index 32ba133..0000000
--- a/languages/java/io/bloombox/schema/geo/Address.java
+++ /dev/null
@@ -1,1148 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-package io.bloombox.schema.geo;
-
-/**
- * Protobuf type {@code Address}
- */
-public  final class Address extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Address)
-    AddressOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Address.newBuilder() to construct.
-  private Address(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Address() {
-    firstLine_ = "";
-    secondLine_ = "";
-    city_ = "";
-    state_ = "";
-    zipcode_ = "";
-    country_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Address(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            firstLine_ = s;
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            secondLine_ = s;
-            break;
-          }
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            city_ = s;
-            break;
-          }
-          case 34: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            state_ = s;
-            break;
-          }
-          case 42: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            zipcode_ = s;
-            break;
-          }
-          case 50: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            country_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.geo.AddressOuterClass.internal_static_Address_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.geo.AddressOuterClass.internal_static_Address_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.geo.Address.class, io.bloombox.schema.geo.Address.Builder.class);
-  }
-
-  public static final int FIRST_LINE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object firstLine_;
-  /**
-   * <code>string first_line = 1;</code>
-   */
-  public java.lang.String getFirstLine() {
-    java.lang.Object ref = firstLine_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      firstLine_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string first_line = 1;</code>
-   */
-  public com.google.protobuf.ByteString
-      getFirstLineBytes() {
-    java.lang.Object ref = firstLine_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      firstLine_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int SECOND_LINE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object secondLine_;
-  /**
-   * <code>string second_line = 2;</code>
-   */
-  public java.lang.String getSecondLine() {
-    java.lang.Object ref = secondLine_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      secondLine_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string second_line = 2;</code>
-   */
-  public com.google.protobuf.ByteString
-      getSecondLineBytes() {
-    java.lang.Object ref = secondLine_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      secondLine_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int CITY_FIELD_NUMBER = 3;
-  private volatile java.lang.Object city_;
-  /**
-   * <code>string city = 3;</code>
-   */
-  public java.lang.String getCity() {
-    java.lang.Object ref = city_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      city_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string city = 3;</code>
-   */
-  public com.google.protobuf.ByteString
-      getCityBytes() {
-    java.lang.Object ref = city_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      city_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int STATE_FIELD_NUMBER = 4;
-  private volatile java.lang.Object state_;
-  /**
-   * <code>string state = 4;</code>
-   */
-  public java.lang.String getState() {
-    java.lang.Object ref = state_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      state_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string state = 4;</code>
-   */
-  public com.google.protobuf.ByteString
-      getStateBytes() {
-    java.lang.Object ref = state_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      state_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int ZIPCODE_FIELD_NUMBER = 5;
-  private volatile java.lang.Object zipcode_;
-  /**
-   * <code>string zipcode = 5;</code>
-   */
-  public java.lang.String getZipcode() {
-    java.lang.Object ref = zipcode_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      zipcode_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string zipcode = 5;</code>
-   */
-  public com.google.protobuf.ByteString
-      getZipcodeBytes() {
-    java.lang.Object ref = zipcode_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      zipcode_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int COUNTRY_FIELD_NUMBER = 6;
-  private volatile java.lang.Object country_;
-  /**
-   * <code>string country = 6;</code>
-   */
-  public java.lang.String getCountry() {
-    java.lang.Object ref = country_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      country_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string country = 6;</code>
-   */
-  public com.google.protobuf.ByteString
-      getCountryBytes() {
-    java.lang.Object ref = country_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      country_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getFirstLineBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, firstLine_);
-    }
-    if (!getSecondLineBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, secondLine_);
-    }
-    if (!getCityBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, city_);
-    }
-    if (!getStateBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, state_);
-    }
-    if (!getZipcodeBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, zipcode_);
-    }
-    if (!getCountryBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, country_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getFirstLineBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, firstLine_);
-    }
-    if (!getSecondLineBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, secondLine_);
-    }
-    if (!getCityBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, city_);
-    }
-    if (!getStateBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, state_);
-    }
-    if (!getZipcodeBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, zipcode_);
-    }
-    if (!getCountryBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, country_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.geo.Address)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.geo.Address other = (io.bloombox.schema.geo.Address) obj;
-
-    boolean result = true;
-    result = result && getFirstLine()
-        .equals(other.getFirstLine());
-    result = result && getSecondLine()
-        .equals(other.getSecondLine());
-    result = result && getCity()
-        .equals(other.getCity());
-    result = result && getState()
-        .equals(other.getState());
-    result = result && getZipcode()
-        .equals(other.getZipcode());
-    result = result && getCountry()
-        .equals(other.getCountry());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + FIRST_LINE_FIELD_NUMBER;
-    hash = (53 * hash) + getFirstLine().hashCode();
-    hash = (37 * hash) + SECOND_LINE_FIELD_NUMBER;
-    hash = (53 * hash) + getSecondLine().hashCode();
-    hash = (37 * hash) + CITY_FIELD_NUMBER;
-    hash = (53 * hash) + getCity().hashCode();
-    hash = (37 * hash) + STATE_FIELD_NUMBER;
-    hash = (53 * hash) + getState().hashCode();
-    hash = (37 * hash) + ZIPCODE_FIELD_NUMBER;
-    hash = (53 * hash) + getZipcode().hashCode();
-    hash = (37 * hash) + COUNTRY_FIELD_NUMBER;
-    hash = (53 * hash) + getCountry().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.geo.Address parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.geo.Address parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.geo.Address parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.geo.Address parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.geo.Address prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code Address}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Address)
-      io.bloombox.schema.geo.AddressOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.geo.AddressOuterClass.internal_static_Address_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.geo.AddressOuterClass.internal_static_Address_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.geo.Address.class, io.bloombox.schema.geo.Address.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.geo.Address.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      firstLine_ = "";
-
-      secondLine_ = "";
-
-      city_ = "";
-
-      state_ = "";
-
-      zipcode_ = "";
-
-      country_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.geo.AddressOuterClass.internal_static_Address_descriptor;
-    }
-
-    public io.bloombox.schema.geo.Address getDefaultInstanceForType() {
-      return io.bloombox.schema.geo.Address.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.geo.Address build() {
-      io.bloombox.schema.geo.Address result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.geo.Address buildPartial() {
-      io.bloombox.schema.geo.Address result = new io.bloombox.schema.geo.Address(this);
-      result.firstLine_ = firstLine_;
-      result.secondLine_ = secondLine_;
-      result.city_ = city_;
-      result.state_ = state_;
-      result.zipcode_ = zipcode_;
-      result.country_ = country_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.geo.Address) {
-        return mergeFrom((io.bloombox.schema.geo.Address)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.geo.Address other) {
-      if (other == io.bloombox.schema.geo.Address.getDefaultInstance()) return this;
-      if (!other.getFirstLine().isEmpty()) {
-        firstLine_ = other.firstLine_;
-        onChanged();
-      }
-      if (!other.getSecondLine().isEmpty()) {
-        secondLine_ = other.secondLine_;
-        onChanged();
-      }
-      if (!other.getCity().isEmpty()) {
-        city_ = other.city_;
-        onChanged();
-      }
-      if (!other.getState().isEmpty()) {
-        state_ = other.state_;
-        onChanged();
-      }
-      if (!other.getZipcode().isEmpty()) {
-        zipcode_ = other.zipcode_;
-        onChanged();
-      }
-      if (!other.getCountry().isEmpty()) {
-        country_ = other.country_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.geo.Address parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.geo.Address) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object firstLine_ = "";
-    /**
-     * <code>string first_line = 1;</code>
-     */
-    public java.lang.String getFirstLine() {
-      java.lang.Object ref = firstLine_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        firstLine_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string first_line = 1;</code>
-     */
-    public com.google.protobuf.ByteString
-        getFirstLineBytes() {
-      java.lang.Object ref = firstLine_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        firstLine_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string first_line = 1;</code>
-     */
-    public Builder setFirstLine(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      firstLine_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string first_line = 1;</code>
-     */
-    public Builder clearFirstLine() {
-      
-      firstLine_ = getDefaultInstance().getFirstLine();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string first_line = 1;</code>
-     */
-    public Builder setFirstLineBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      firstLine_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object secondLine_ = "";
-    /**
-     * <code>string second_line = 2;</code>
-     */
-    public java.lang.String getSecondLine() {
-      java.lang.Object ref = secondLine_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        secondLine_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string second_line = 2;</code>
-     */
-    public com.google.protobuf.ByteString
-        getSecondLineBytes() {
-      java.lang.Object ref = secondLine_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        secondLine_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string second_line = 2;</code>
-     */
-    public Builder setSecondLine(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      secondLine_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string second_line = 2;</code>
-     */
-    public Builder clearSecondLine() {
-      
-      secondLine_ = getDefaultInstance().getSecondLine();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string second_line = 2;</code>
-     */
-    public Builder setSecondLineBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      secondLine_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object city_ = "";
-    /**
-     * <code>string city = 3;</code>
-     */
-    public java.lang.String getCity() {
-      java.lang.Object ref = city_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        city_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string city = 3;</code>
-     */
-    public com.google.protobuf.ByteString
-        getCityBytes() {
-      java.lang.Object ref = city_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        city_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string city = 3;</code>
-     */
-    public Builder setCity(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      city_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string city = 3;</code>
-     */
-    public Builder clearCity() {
-      
-      city_ = getDefaultInstance().getCity();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string city = 3;</code>
-     */
-    public Builder setCityBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      city_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object state_ = "";
-    /**
-     * <code>string state = 4;</code>
-     */
-    public java.lang.String getState() {
-      java.lang.Object ref = state_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        state_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string state = 4;</code>
-     */
-    public com.google.protobuf.ByteString
-        getStateBytes() {
-      java.lang.Object ref = state_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        state_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string state = 4;</code>
-     */
-    public Builder setState(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      state_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string state = 4;</code>
-     */
-    public Builder clearState() {
-      
-      state_ = getDefaultInstance().getState();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string state = 4;</code>
-     */
-    public Builder setStateBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      state_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object zipcode_ = "";
-    /**
-     * <code>string zipcode = 5;</code>
-     */
-    public java.lang.String getZipcode() {
-      java.lang.Object ref = zipcode_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        zipcode_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string zipcode = 5;</code>
-     */
-    public com.google.protobuf.ByteString
-        getZipcodeBytes() {
-      java.lang.Object ref = zipcode_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        zipcode_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string zipcode = 5;</code>
-     */
-    public Builder setZipcode(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      zipcode_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string zipcode = 5;</code>
-     */
-    public Builder clearZipcode() {
-      
-      zipcode_ = getDefaultInstance().getZipcode();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string zipcode = 5;</code>
-     */
-    public Builder setZipcodeBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      zipcode_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object country_ = "";
-    /**
-     * <code>string country = 6;</code>
-     */
-    public java.lang.String getCountry() {
-      java.lang.Object ref = country_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        country_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string country = 6;</code>
-     */
-    public com.google.protobuf.ByteString
-        getCountryBytes() {
-      java.lang.Object ref = country_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        country_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string country = 6;</code>
-     */
-    public Builder setCountry(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      country_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string country = 6;</code>
-     */
-    public Builder clearCountry() {
-      
-      country_ = getDefaultInstance().getCountry();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string country = 6;</code>
-     */
-    public Builder setCountryBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      country_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Address)
-  }
-
-  // @@protoc_insertion_point(class_scope:Address)
-  private static final io.bloombox.schema.geo.Address DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.geo.Address();
-  }
-
-  public static io.bloombox.schema.geo.Address getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Address>
-      PARSER = new com.google.protobuf.AbstractParser<Address>() {
-    public Address parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Address(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Address> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Address> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.geo.Address getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/geo/AddressOrBuilder.java b/languages/java/io/bloombox/schema/geo/AddressOrBuilder.java
deleted file mode 100644
index bea504e..0000000
--- a/languages/java/io/bloombox/schema/geo/AddressOrBuilder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-package io.bloombox.schema.geo;
-
-public interface AddressOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Address)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>string first_line = 1;</code>
-   */
-  java.lang.String getFirstLine();
-  /**
-   * <code>string first_line = 1;</code>
-   */
-  com.google.protobuf.ByteString
-      getFirstLineBytes();
-
-  /**
-   * <code>string second_line = 2;</code>
-   */
-  java.lang.String getSecondLine();
-  /**
-   * <code>string second_line = 2;</code>
-   */
-  com.google.protobuf.ByteString
-      getSecondLineBytes();
-
-  /**
-   * <code>string city = 3;</code>
-   */
-  java.lang.String getCity();
-  /**
-   * <code>string city = 3;</code>
-   */
-  com.google.protobuf.ByteString
-      getCityBytes();
-
-  /**
-   * <code>string state = 4;</code>
-   */
-  java.lang.String getState();
-  /**
-   * <code>string state = 4;</code>
-   */
-  com.google.protobuf.ByteString
-      getStateBytes();
-
-  /**
-   * <code>string zipcode = 5;</code>
-   */
-  java.lang.String getZipcode();
-  /**
-   * <code>string zipcode = 5;</code>
-   */
-  com.google.protobuf.ByteString
-      getZipcodeBytes();
-
-  /**
-   * <code>string country = 6;</code>
-   */
-  java.lang.String getCountry();
-  /**
-   * <code>string country = 6;</code>
-   */
-  com.google.protobuf.ByteString
-      getCountryBytes();
-}
diff --git a/languages/java/io/bloombox/schema/geo/AddressOuterClass.java b/languages/java/io/bloombox/schema/geo/AddressOuterClass.java
deleted file mode 100644
index e21fe55..0000000
--- a/languages/java/io/bloombox/schema/geo/AddressOuterClass.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-package io.bloombox.schema.geo;
-
-public final class AddressOuterClass {
-  private AddressOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Address_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Address_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\021geo/Address.proto\"q\n\007Address\022\022\n\nfirst_" +
-      "line\030\001 \001(\t\022\023\n\013second_line\030\002 \001(\t\022\014\n\004city\030" +
-      "\003 \001(\t\022\r\n\005state\030\004 \001(\t\022\017\n\007zipcode\030\005 \001(\t\022\017\n" +
-      "\007country\030\006 \001(\tB\034\n\026io.bloombox.schema.geo" +
-      "H\001P\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_Address_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Address_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Address_descriptor,
-        new java.lang.String[] { "FirstLine", "SecondLine", "City", "State", "Zipcode", "Country", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/AttachedMedia.java b/languages/java/io/bloombox/schema/media/AttachedMedia.java
deleted file mode 100644
index bf8dacd..0000000
--- a/languages/java/io/bloombox/schema/media/AttachedMedia.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-package io.bloombox.schema.media;
-
-public final class AttachedMedia {
-  private AttachedMedia() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MediaItem_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MediaItem_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025media/MediaItem.proto\032\024media/MediaKey." +
-      "proto\032\025media/MediaType.proto\"K\n\tMediaIte" +
-      "m\022\026\n\003key\030\001 \001(\0132\t.MediaKey\022\030\n\004type\030\002 \001(\0132" +
-      "\n.MediaType\022\014\n\004name\030\003 \001(\tB0\n\030io.bloombox" +
-      ".schema.mediaB\rAttachedMediaH\001P\001\370\001\001b\006pro" +
-      "to3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.media.MediaItemKey.getDescriptor(),
-          io.bloombox.schema.media.MediaItemType.getDescriptor(),
-        }, assigner);
-    internal_static_MediaItem_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MediaItem_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MediaItem_descriptor,
-        new java.lang.String[] { "Key", "Type", "Name", });
-    io.bloombox.schema.media.MediaItemKey.getDescriptor();
-    io.bloombox.schema.media.MediaItemType.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/DocumentType.java b/languages/java/io/bloombox/schema/media/DocumentType.java
deleted file mode 100644
index 1214760..0000000
--- a/languages/java/io/bloombox/schema/media/DocumentType.java
+++ /dev/null
@@ -1,652 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-/**
- * <pre>
- * -- Media Type: Document -- //
- * </pre>
- *
- * Protobuf type {@code DocumentType}
- */
-public  final class DocumentType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:DocumentType)
-    DocumentTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DocumentType.newBuilder() to construct.
-  private DocumentType(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private DocumentType() {
-    kind_ = 0;
-    compressed_ = false;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DocumentType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            kind_ = rawValue;
-            break;
-          }
-          case 16: {
-
-            compressed_ = input.readBool();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_DocumentType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_DocumentType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.media.DocumentType.class, io.bloombox.schema.media.DocumentType.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code DocumentType.DocumentKind}
-   */
-  public enum DocumentKind
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>TXT = 0;</code>
-     */
-    TXT(0),
-    /**
-     * <code>HTML = 1;</code>
-     */
-    HTML(1),
-    /**
-     * <code>PDF = 2;</code>
-     */
-    PDF(2),
-    /**
-     * <code>MARKDOWN = 3;</code>
-     */
-    MARKDOWN(3),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>TXT = 0;</code>
-     */
-    public static final int TXT_VALUE = 0;
-    /**
-     * <code>HTML = 1;</code>
-     */
-    public static final int HTML_VALUE = 1;
-    /**
-     * <code>PDF = 2;</code>
-     */
-    public static final int PDF_VALUE = 2;
-    /**
-     * <code>MARKDOWN = 3;</code>
-     */
-    public static final int MARKDOWN_VALUE = 3;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static DocumentKind valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static DocumentKind forNumber(int value) {
-      switch (value) {
-        case 0: return TXT;
-        case 1: return HTML;
-        case 2: return PDF;
-        case 3: return MARKDOWN;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<DocumentKind>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        DocumentKind> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<DocumentKind>() {
-            public DocumentKind findValueByNumber(int number) {
-              return DocumentKind.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.DocumentType.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final DocumentKind[] VALUES = values();
-
-    public static DocumentKind valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private DocumentKind(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:DocumentType.DocumentKind)
-  }
-
-  public static final int KIND_FIELD_NUMBER = 1;
-  private int kind_;
-  /**
-   * <code>.DocumentType.DocumentKind kind = 1;</code>
-   */
-  public int getKindValue() {
-    return kind_;
-  }
-  /**
-   * <code>.DocumentType.DocumentKind kind = 1;</code>
-   */
-  public io.bloombox.schema.media.DocumentType.DocumentKind getKind() {
-    io.bloombox.schema.media.DocumentType.DocumentKind result = io.bloombox.schema.media.DocumentType.DocumentKind.valueOf(kind_);
-    return result == null ? io.bloombox.schema.media.DocumentType.DocumentKind.UNRECOGNIZED : result;
-  }
-
-  public static final int COMPRESSED_FIELD_NUMBER = 2;
-  private boolean compressed_;
-  /**
-   * <code>bool compressed = 2;</code>
-   */
-  public boolean getCompressed() {
-    return compressed_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (kind_ != io.bloombox.schema.media.DocumentType.DocumentKind.TXT.getNumber()) {
-      output.writeEnum(1, kind_);
-    }
-    if (compressed_ != false) {
-      output.writeBool(2, compressed_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (kind_ != io.bloombox.schema.media.DocumentType.DocumentKind.TXT.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, kind_);
-    }
-    if (compressed_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(2, compressed_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.media.DocumentType)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.media.DocumentType other = (io.bloombox.schema.media.DocumentType) obj;
-
-    boolean result = true;
-    result = result && kind_ == other.kind_;
-    result = result && (getCompressed()
-        == other.getCompressed());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + KIND_FIELD_NUMBER;
-    hash = (53 * hash) + kind_;
-    hash = (37 * hash) + COMPRESSED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getCompressed());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.DocumentType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.DocumentType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.DocumentType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.media.DocumentType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Media Type: Document -- //
-   * </pre>
-   *
-   * Protobuf type {@code DocumentType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:DocumentType)
-      io.bloombox.schema.media.DocumentTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_DocumentType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_DocumentType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.media.DocumentType.class, io.bloombox.schema.media.DocumentType.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.media.DocumentType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      kind_ = 0;
-
-      compressed_ = false;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_DocumentType_descriptor;
-    }
-
-    public io.bloombox.schema.media.DocumentType getDefaultInstanceForType() {
-      return io.bloombox.schema.media.DocumentType.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.media.DocumentType build() {
-      io.bloombox.schema.media.DocumentType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.media.DocumentType buildPartial() {
-      io.bloombox.schema.media.DocumentType result = new io.bloombox.schema.media.DocumentType(this);
-      result.kind_ = kind_;
-      result.compressed_ = compressed_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.media.DocumentType) {
-        return mergeFrom((io.bloombox.schema.media.DocumentType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.media.DocumentType other) {
-      if (other == io.bloombox.schema.media.DocumentType.getDefaultInstance()) return this;
-      if (other.kind_ != 0) {
-        setKindValue(other.getKindValue());
-      }
-      if (other.getCompressed() != false) {
-        setCompressed(other.getCompressed());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.media.DocumentType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.media.DocumentType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int kind_ = 0;
-    /**
-     * <code>.DocumentType.DocumentKind kind = 1;</code>
-     */
-    public int getKindValue() {
-      return kind_;
-    }
-    /**
-     * <code>.DocumentType.DocumentKind kind = 1;</code>
-     */
-    public Builder setKindValue(int value) {
-      kind_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.DocumentType.DocumentKind kind = 1;</code>
-     */
-    public io.bloombox.schema.media.DocumentType.DocumentKind getKind() {
-      io.bloombox.schema.media.DocumentType.DocumentKind result = io.bloombox.schema.media.DocumentType.DocumentKind.valueOf(kind_);
-      return result == null ? io.bloombox.schema.media.DocumentType.DocumentKind.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.DocumentType.DocumentKind kind = 1;</code>
-     */
-    public Builder setKind(io.bloombox.schema.media.DocumentType.DocumentKind value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      kind_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.DocumentType.DocumentKind kind = 1;</code>
-     */
-    public Builder clearKind() {
-      
-      kind_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private boolean compressed_ ;
-    /**
-     * <code>bool compressed = 2;</code>
-     */
-    public boolean getCompressed() {
-      return compressed_;
-    }
-    /**
-     * <code>bool compressed = 2;</code>
-     */
-    public Builder setCompressed(boolean value) {
-      
-      compressed_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool compressed = 2;</code>
-     */
-    public Builder clearCompressed() {
-      
-      compressed_ = false;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:DocumentType)
-  }
-
-  // @@protoc_insertion_point(class_scope:DocumentType)
-  private static final io.bloombox.schema.media.DocumentType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.media.DocumentType();
-  }
-
-  public static io.bloombox.schema.media.DocumentType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<DocumentType>
-      PARSER = new com.google.protobuf.AbstractParser<DocumentType>() {
-    public DocumentType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DocumentType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<DocumentType> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<DocumentType> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.media.DocumentType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/media/DocumentTypeOrBuilder.java b/languages/java/io/bloombox/schema/media/DocumentTypeOrBuilder.java
deleted file mode 100644
index 5d7270d..0000000
--- a/languages/java/io/bloombox/schema/media/DocumentTypeOrBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-public interface DocumentTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:DocumentType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.DocumentType.DocumentKind kind = 1;</code>
-   */
-  int getKindValue();
-  /**
-   * <code>.DocumentType.DocumentKind kind = 1;</code>
-   */
-  io.bloombox.schema.media.DocumentType.DocumentKind getKind();
-
-  /**
-   * <code>bool compressed = 2;</code>
-   */
-  boolean getCompressed();
-}
diff --git a/languages/java/io/bloombox/schema/media/ImageType.java b/languages/java/io/bloombox/schema/media/ImageType.java
deleted file mode 100644
index 7ed0ddc..0000000
--- a/languages/java/io/bloombox/schema/media/ImageType.java
+++ /dev/null
@@ -1,602 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-/**
- * <pre>
- * -- Media Type: Images -- //
- * </pre>
- *
- * Protobuf type {@code ImageType}
- */
-public  final class ImageType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ImageType)
-    ImageTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ImageType.newBuilder() to construct.
-  private ImageType(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ImageType() {
-    kind_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ImageType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            kind_ = rawValue;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_ImageType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_ImageType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.media.ImageType.class, io.bloombox.schema.media.ImageType.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code ImageType.ImageKind}
-   */
-  public enum ImageKind
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>PNG = 0;</code>
-     */
-    PNG(0),
-    /**
-     * <code>JPG = 1;</code>
-     */
-    JPG(1),
-    /**
-     * <code>GIF = 2;</code>
-     */
-    GIF(2),
-    /**
-     * <code>SVG = 3;</code>
-     */
-    SVG(3),
-    /**
-     * <code>WEBP = 4;</code>
-     */
-    WEBP(4),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>PNG = 0;</code>
-     */
-    public static final int PNG_VALUE = 0;
-    /**
-     * <code>JPG = 1;</code>
-     */
-    public static final int JPG_VALUE = 1;
-    /**
-     * <code>GIF = 2;</code>
-     */
-    public static final int GIF_VALUE = 2;
-    /**
-     * <code>SVG = 3;</code>
-     */
-    public static final int SVG_VALUE = 3;
-    /**
-     * <code>WEBP = 4;</code>
-     */
-    public static final int WEBP_VALUE = 4;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static ImageKind valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static ImageKind forNumber(int value) {
-      switch (value) {
-        case 0: return PNG;
-        case 1: return JPG;
-        case 2: return GIF;
-        case 3: return SVG;
-        case 4: return WEBP;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<ImageKind>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        ImageKind> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<ImageKind>() {
-            public ImageKind findValueByNumber(int number) {
-              return ImageKind.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.ImageType.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final ImageKind[] VALUES = values();
-
-    public static ImageKind valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private ImageKind(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:ImageType.ImageKind)
-  }
-
-  public static final int KIND_FIELD_NUMBER = 1;
-  private int kind_;
-  /**
-   * <code>.ImageType.ImageKind kind = 1;</code>
-   */
-  public int getKindValue() {
-    return kind_;
-  }
-  /**
-   * <code>.ImageType.ImageKind kind = 1;</code>
-   */
-  public io.bloombox.schema.media.ImageType.ImageKind getKind() {
-    io.bloombox.schema.media.ImageType.ImageKind result = io.bloombox.schema.media.ImageType.ImageKind.valueOf(kind_);
-    return result == null ? io.bloombox.schema.media.ImageType.ImageKind.UNRECOGNIZED : result;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (kind_ != io.bloombox.schema.media.ImageType.ImageKind.PNG.getNumber()) {
-      output.writeEnum(1, kind_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (kind_ != io.bloombox.schema.media.ImageType.ImageKind.PNG.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, kind_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.media.ImageType)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.media.ImageType other = (io.bloombox.schema.media.ImageType) obj;
-
-    boolean result = true;
-    result = result && kind_ == other.kind_;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + KIND_FIELD_NUMBER;
-    hash = (53 * hash) + kind_;
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.ImageType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.ImageType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.ImageType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.media.ImageType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Media Type: Images -- //
-   * </pre>
-   *
-   * Protobuf type {@code ImageType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ImageType)
-      io.bloombox.schema.media.ImageTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_ImageType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_ImageType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.media.ImageType.class, io.bloombox.schema.media.ImageType.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.media.ImageType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      kind_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_ImageType_descriptor;
-    }
-
-    public io.bloombox.schema.media.ImageType getDefaultInstanceForType() {
-      return io.bloombox.schema.media.ImageType.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.media.ImageType build() {
-      io.bloombox.schema.media.ImageType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.media.ImageType buildPartial() {
-      io.bloombox.schema.media.ImageType result = new io.bloombox.schema.media.ImageType(this);
-      result.kind_ = kind_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.media.ImageType) {
-        return mergeFrom((io.bloombox.schema.media.ImageType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.media.ImageType other) {
-      if (other == io.bloombox.schema.media.ImageType.getDefaultInstance()) return this;
-      if (other.kind_ != 0) {
-        setKindValue(other.getKindValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.media.ImageType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.media.ImageType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int kind_ = 0;
-    /**
-     * <code>.ImageType.ImageKind kind = 1;</code>
-     */
-    public int getKindValue() {
-      return kind_;
-    }
-    /**
-     * <code>.ImageType.ImageKind kind = 1;</code>
-     */
-    public Builder setKindValue(int value) {
-      kind_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.ImageType.ImageKind kind = 1;</code>
-     */
-    public io.bloombox.schema.media.ImageType.ImageKind getKind() {
-      io.bloombox.schema.media.ImageType.ImageKind result = io.bloombox.schema.media.ImageType.ImageKind.valueOf(kind_);
-      return result == null ? io.bloombox.schema.media.ImageType.ImageKind.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.ImageType.ImageKind kind = 1;</code>
-     */
-    public Builder setKind(io.bloombox.schema.media.ImageType.ImageKind value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      kind_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.ImageType.ImageKind kind = 1;</code>
-     */
-    public Builder clearKind() {
-      
-      kind_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ImageType)
-  }
-
-  // @@protoc_insertion_point(class_scope:ImageType)
-  private static final io.bloombox.schema.media.ImageType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.media.ImageType();
-  }
-
-  public static io.bloombox.schema.media.ImageType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ImageType>
-      PARSER = new com.google.protobuf.AbstractParser<ImageType>() {
-    public ImageType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ImageType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ImageType> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ImageType> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.media.ImageType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/media/ImageTypeOrBuilder.java b/languages/java/io/bloombox/schema/media/ImageTypeOrBuilder.java
deleted file mode 100644
index 6303441..0000000
--- a/languages/java/io/bloombox/schema/media/ImageTypeOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-public interface ImageTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ImageType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.ImageType.ImageKind kind = 1;</code>
-   */
-  int getKindValue();
-  /**
-   * <code>.ImageType.ImageKind kind = 1;</code>
-   */
-  io.bloombox.schema.media.ImageType.ImageKind getKind();
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaItem.java b/languages/java/io/bloombox/schema/media/MediaItem.java
deleted file mode 100644
index 13e128d..0000000
--- a/languages/java/io/bloombox/schema/media/MediaItem.java
+++ /dev/null
@@ -1,875 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-package io.bloombox.schema.media;
-
-/**
- * Protobuf type {@code MediaItem}
- */
-public  final class MediaItem extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:MediaItem)
-    MediaItemOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use MediaItem.newBuilder() to construct.
-  private MediaItem(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private MediaItem() {
-    name_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private MediaItem(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            io.bloombox.schema.media.MediaKey.Builder subBuilder = null;
-            if (key_ != null) {
-              subBuilder = key_.toBuilder();
-            }
-            key_ = input.readMessage(io.bloombox.schema.media.MediaKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(key_);
-              key_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.media.MediaType.Builder subBuilder = null;
-            if (type_ != null) {
-              subBuilder = type_.toBuilder();
-            }
-            type_ = input.readMessage(io.bloombox.schema.media.MediaType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(type_);
-              type_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.media.AttachedMedia.internal_static_MediaItem_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.media.AttachedMedia.internal_static_MediaItem_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.media.MediaItem.class, io.bloombox.schema.media.MediaItem.Builder.class);
-  }
-
-  public static final int KEY_FIELD_NUMBER = 1;
-  private io.bloombox.schema.media.MediaKey key_;
-  /**
-   * <code>.MediaKey key = 1;</code>
-   */
-  public boolean hasKey() {
-    return key_ != null;
-  }
-  /**
-   * <code>.MediaKey key = 1;</code>
-   */
-  public io.bloombox.schema.media.MediaKey getKey() {
-    return key_ == null ? io.bloombox.schema.media.MediaKey.getDefaultInstance() : key_;
-  }
-  /**
-   * <code>.MediaKey key = 1;</code>
-   */
-  public io.bloombox.schema.media.MediaKeyOrBuilder getKeyOrBuilder() {
-    return getKey();
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 2;
-  private io.bloombox.schema.media.MediaType type_;
-  /**
-   * <code>.MediaType type = 2;</code>
-   */
-  public boolean hasType() {
-    return type_ != null;
-  }
-  /**
-   * <code>.MediaType type = 2;</code>
-   */
-  public io.bloombox.schema.media.MediaType getType() {
-    return type_ == null ? io.bloombox.schema.media.MediaType.getDefaultInstance() : type_;
-  }
-  /**
-   * <code>.MediaType type = 2;</code>
-   */
-  public io.bloombox.schema.media.MediaTypeOrBuilder getTypeOrBuilder() {
-    return getType();
-  }
-
-  public static final int NAME_FIELD_NUMBER = 3;
-  private volatile java.lang.Object name_;
-  /**
-   * <code>string name = 3;</code>
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string name = 3;</code>
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (key_ != null) {
-      output.writeMessage(1, getKey());
-    }
-    if (type_ != null) {
-      output.writeMessage(2, getType());
-    }
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (key_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getKey());
-    }
-    if (type_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getType());
-    }
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.media.MediaItem)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.media.MediaItem other = (io.bloombox.schema.media.MediaItem) obj;
-
-    boolean result = true;
-    result = result && (hasKey() == other.hasKey());
-    if (hasKey()) {
-      result = result && getKey()
-          .equals(other.getKey());
-    }
-    result = result && (hasType() == other.hasType());
-    if (hasType()) {
-      result = result && getType()
-          .equals(other.getType());
-    }
-    result = result && getName()
-        .equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasKey()) {
-      hash = (37 * hash) + KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getKey().hashCode();
-    }
-    if (hasType()) {
-      hash = (37 * hash) + TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getType().hashCode();
-    }
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaItem parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaItem parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaItem parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.media.MediaItem prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code MediaItem}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:MediaItem)
-      io.bloombox.schema.media.MediaItemOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.AttachedMedia.internal_static_MediaItem_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.media.AttachedMedia.internal_static_MediaItem_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.media.MediaItem.class, io.bloombox.schema.media.MediaItem.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.media.MediaItem.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (keyBuilder_ == null) {
-        key_ = null;
-      } else {
-        key_ = null;
-        keyBuilder_ = null;
-      }
-      if (typeBuilder_ == null) {
-        type_ = null;
-      } else {
-        type_ = null;
-        typeBuilder_ = null;
-      }
-      name_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.media.AttachedMedia.internal_static_MediaItem_descriptor;
-    }
-
-    public io.bloombox.schema.media.MediaItem getDefaultInstanceForType() {
-      return io.bloombox.schema.media.MediaItem.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.media.MediaItem build() {
-      io.bloombox.schema.media.MediaItem result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.media.MediaItem buildPartial() {
-      io.bloombox.schema.media.MediaItem result = new io.bloombox.schema.media.MediaItem(this);
-      if (keyBuilder_ == null) {
-        result.key_ = key_;
-      } else {
-        result.key_ = keyBuilder_.build();
-      }
-      if (typeBuilder_ == null) {
-        result.type_ = type_;
-      } else {
-        result.type_ = typeBuilder_.build();
-      }
-      result.name_ = name_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.media.MediaItem) {
-        return mergeFrom((io.bloombox.schema.media.MediaItem)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.media.MediaItem other) {
-      if (other == io.bloombox.schema.media.MediaItem.getDefaultInstance()) return this;
-      if (other.hasKey()) {
-        mergeKey(other.getKey());
-      }
-      if (other.hasType()) {
-        mergeType(other.getType());
-      }
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.media.MediaItem parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.media.MediaItem) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private io.bloombox.schema.media.MediaKey key_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.MediaKey, io.bloombox.schema.media.MediaKey.Builder, io.bloombox.schema.media.MediaKeyOrBuilder> keyBuilder_;
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public boolean hasKey() {
-      return keyBuilder_ != null || key_ != null;
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public io.bloombox.schema.media.MediaKey getKey() {
-      if (keyBuilder_ == null) {
-        return key_ == null ? io.bloombox.schema.media.MediaKey.getDefaultInstance() : key_;
-      } else {
-        return keyBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public Builder setKey(io.bloombox.schema.media.MediaKey value) {
-      if (keyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        key_ = value;
-        onChanged();
-      } else {
-        keyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public Builder setKey(
-        io.bloombox.schema.media.MediaKey.Builder builderForValue) {
-      if (keyBuilder_ == null) {
-        key_ = builderForValue.build();
-        onChanged();
-      } else {
-        keyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public Builder mergeKey(io.bloombox.schema.media.MediaKey value) {
-      if (keyBuilder_ == null) {
-        if (key_ != null) {
-          key_ =
-            io.bloombox.schema.media.MediaKey.newBuilder(key_).mergeFrom(value).buildPartial();
-        } else {
-          key_ = value;
-        }
-        onChanged();
-      } else {
-        keyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public Builder clearKey() {
-      if (keyBuilder_ == null) {
-        key_ = null;
-        onChanged();
-      } else {
-        key_ = null;
-        keyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public io.bloombox.schema.media.MediaKey.Builder getKeyBuilder() {
-      
-      onChanged();
-      return getKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    public io.bloombox.schema.media.MediaKeyOrBuilder getKeyOrBuilder() {
-      if (keyBuilder_ != null) {
-        return keyBuilder_.getMessageOrBuilder();
-      } else {
-        return key_ == null ?
-            io.bloombox.schema.media.MediaKey.getDefaultInstance() : key_;
-      }
-    }
-    /**
-     * <code>.MediaKey key = 1;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.MediaKey, io.bloombox.schema.media.MediaKey.Builder, io.bloombox.schema.media.MediaKeyOrBuilder> 
-        getKeyFieldBuilder() {
-      if (keyBuilder_ == null) {
-        keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.media.MediaKey, io.bloombox.schema.media.MediaKey.Builder, io.bloombox.schema.media.MediaKeyOrBuilder>(
-                getKey(),
-                getParentForChildren(),
-                isClean());
-        key_ = null;
-      }
-      return keyBuilder_;
-    }
-
-    private io.bloombox.schema.media.MediaType type_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.MediaType, io.bloombox.schema.media.MediaType.Builder, io.bloombox.schema.media.MediaTypeOrBuilder> typeBuilder_;
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public boolean hasType() {
-      return typeBuilder_ != null || type_ != null;
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public io.bloombox.schema.media.MediaType getType() {
-      if (typeBuilder_ == null) {
-        return type_ == null ? io.bloombox.schema.media.MediaType.getDefaultInstance() : type_;
-      } else {
-        return typeBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public Builder setType(io.bloombox.schema.media.MediaType value) {
-      if (typeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        typeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public Builder setType(
-        io.bloombox.schema.media.MediaType.Builder builderForValue) {
-      if (typeBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        typeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public Builder mergeType(io.bloombox.schema.media.MediaType value) {
-      if (typeBuilder_ == null) {
-        if (type_ != null) {
-          type_ =
-            io.bloombox.schema.media.MediaType.newBuilder(type_).mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        typeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public Builder clearType() {
-      if (typeBuilder_ == null) {
-        type_ = null;
-        onChanged();
-      } else {
-        type_ = null;
-        typeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public io.bloombox.schema.media.MediaType.Builder getTypeBuilder() {
-      
-      onChanged();
-      return getTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    public io.bloombox.schema.media.MediaTypeOrBuilder getTypeOrBuilder() {
-      if (typeBuilder_ != null) {
-        return typeBuilder_.getMessageOrBuilder();
-      } else {
-        return type_ == null ?
-            io.bloombox.schema.media.MediaType.getDefaultInstance() : type_;
-      }
-    }
-    /**
-     * <code>.MediaType type = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.MediaType, io.bloombox.schema.media.MediaType.Builder, io.bloombox.schema.media.MediaTypeOrBuilder> 
-        getTypeFieldBuilder() {
-      if (typeBuilder_ == null) {
-        typeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.media.MediaType, io.bloombox.schema.media.MediaType.Builder, io.bloombox.schema.media.MediaTypeOrBuilder>(
-                getType(),
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      return typeBuilder_;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * <code>string name = 3;</code>
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string name = 3;</code>
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string name = 3;</code>
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string name = 3;</code>
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string name = 3;</code>
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:MediaItem)
-  }
-
-  // @@protoc_insertion_point(class_scope:MediaItem)
-  private static final io.bloombox.schema.media.MediaItem DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.media.MediaItem();
-  }
-
-  public static io.bloombox.schema.media.MediaItem getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<MediaItem>
-      PARSER = new com.google.protobuf.AbstractParser<MediaItem>() {
-    public MediaItem parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new MediaItem(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<MediaItem> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<MediaItem> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.media.MediaItem getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/media/MediaItemKey.java b/languages/java/io/bloombox/schema/media/MediaItemKey.java
deleted file mode 100644
index 6472ebf..0000000
--- a/languages/java/io/bloombox/schema/media/MediaItemKey.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-package io.bloombox.schema.media;
-
-public final class MediaItemKey {
-  private MediaItemKey() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MediaKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MediaKey_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\024media/MediaKey.proto\"\026\n\010MediaKey\022\n\n\002id" +
-      "\030\001 \001(\tB/\n\030io.bloombox.schema.mediaB\014Medi" +
-      "aItemKeyH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_MediaKey_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MediaKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MediaKey_descriptor,
-        new java.lang.String[] { "Id", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaItemOrBuilder.java b/languages/java/io/bloombox/schema/media/MediaItemOrBuilder.java
deleted file mode 100644
index cc4d5aa..0000000
--- a/languages/java/io/bloombox/schema/media/MediaItemOrBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-package io.bloombox.schema.media;
-
-public interface MediaItemOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:MediaItem)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.MediaKey key = 1;</code>
-   */
-  boolean hasKey();
-  /**
-   * <code>.MediaKey key = 1;</code>
-   */
-  io.bloombox.schema.media.MediaKey getKey();
-  /**
-   * <code>.MediaKey key = 1;</code>
-   */
-  io.bloombox.schema.media.MediaKeyOrBuilder getKeyOrBuilder();
-
-  /**
-   * <code>.MediaType type = 2;</code>
-   */
-  boolean hasType();
-  /**
-   * <code>.MediaType type = 2;</code>
-   */
-  io.bloombox.schema.media.MediaType getType();
-  /**
-   * <code>.MediaType type = 2;</code>
-   */
-  io.bloombox.schema.media.MediaTypeOrBuilder getTypeOrBuilder();
-
-  /**
-   * <code>string name = 3;</code>
-   */
-  java.lang.String getName();
-  /**
-   * <code>string name = 3;</code>
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaItemOuterClass.java b/languages/java/io/bloombox/schema/media/MediaItemOuterClass.java
deleted file mode 100644
index ad3975c..0000000
--- a/languages/java/io/bloombox/schema/media/MediaItemOuterClass.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-package io.bloombox.schema.media;
-
-public final class MediaItemOuterClass {
-  private MediaItemOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MediaItem_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MediaItem_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025media/MediaItem.proto\032\024media/MediaKey." +
-      "proto\032\025media/MediaType.proto\"K\n\tMediaIte" +
-      "m\022\026\n\003key\030\001 \001(\0132\t.MediaKey\022\030\n\004type\030\002 \001(\0132" +
-      "\n.MediaType\022\014\n\004name\030\003 \001(\tB\034\n\030io.bloombox" +
-      ".schema.mediaP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.media.MediaKeyOuterClass.getDescriptor(),
-          io.bloombox.schema.media.MediaTypeOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_MediaItem_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MediaItem_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MediaItem_descriptor,
-        new java.lang.String[] { "Key", "Type", "Name", });
-    io.bloombox.schema.media.MediaKeyOuterClass.getDescriptor();
-    io.bloombox.schema.media.MediaTypeOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaItemType.java b/languages/java/io/bloombox/schema/media/MediaItemType.java
deleted file mode 100644
index 4a4db80..0000000
--- a/languages/java/io/bloombox/schema/media/MediaItemType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-public final class MediaItemType {
-  private MediaItemType() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MediaType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MediaType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ImageType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ImageType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_DocumentType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_DocumentType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_VideoType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_VideoType_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025media/MediaType.proto\"\310\001\n\tMediaType\022\035\n" +
-      "\004kind\030\001 \001(\0162\017.MediaType.Kind\022\036\n\nimage_ty" +
-      "pe\030e \001(\0132\n.ImageType\022%\n\rdocument_type\030\311\001" +
-      " \001(\0132\r.DocumentType\022\037\n\nvideo_type\030\255\002 \001(\013" +
-      "2\n.VideoType\"4\n\004Kind\022\010\n\004LINK\020\000\022\t\n\005IMAGE\020" +
-      "\001\022\014\n\010DOCUMENT\020\002\022\t\n\005VIDEO\020\003\"j\n\tImageType\022" +
-      "\"\n\004kind\030\001 \001(\0162\024.ImageType.ImageKind\"9\n\tI" +
-      "mageKind\022\007\n\003PNG\020\000\022\007\n\003JPG\020\001\022\007\n\003GIF\020\002\022\007\n\003S" +
-      "VG\020\003\022\010\n\004WEBP\020\004\"\206\001\n\014DocumentType\022(\n\004kind\030" +
-      "\001 \001(\0162\032.DocumentType.DocumentKind\022\022\n\ncom",
-      "pressed\030\002 \001(\010\"8\n\014DocumentKind\022\007\n\003TXT\020\000\022\010" +
-      "\n\004HTML\020\001\022\007\n\003PDF\020\002\022\014\n\010MARKDOWN\020\003\"W\n\tVideo" +
-      "Type\022\"\n\004kind\030\001 \001(\0162\024.VideoType.VideoKind" +
-      "\"&\n\tVideoKind\022\007\n\003MP4\020\000\022\007\n\003FLV\020\001\022\007\n\003HLS\020\002" +
-      "B0\n\030io.bloombox.schema.mediaB\rMediaItemT" +
-      "ypeH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_MediaType_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MediaType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MediaType_descriptor,
-        new java.lang.String[] { "Kind", "ImageType", "DocumentType", "VideoType", });
-    internal_static_ImageType_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_ImageType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ImageType_descriptor,
-        new java.lang.String[] { "Kind", });
-    internal_static_DocumentType_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_DocumentType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_DocumentType_descriptor,
-        new java.lang.String[] { "Kind", "Compressed", });
-    internal_static_VideoType_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_VideoType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_VideoType_descriptor,
-        new java.lang.String[] { "Kind", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaKey.java b/languages/java/io/bloombox/schema/media/MediaKey.java
deleted file mode 100644
index c28a3af..0000000
--- a/languages/java/io/bloombox/schema/media/MediaKey.java
+++ /dev/null
@@ -1,513 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-package io.bloombox.schema.media;
-
-/**
- * Protobuf type {@code MediaKey}
- */
-public  final class MediaKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:MediaKey)
-    MediaKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use MediaKey.newBuilder() to construct.
-  private MediaKey(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private MediaKey() {
-    id_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private MediaKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            id_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.media.MediaItemKey.internal_static_MediaKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.media.MediaItemKey.internal_static_MediaKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.media.MediaKey.class, io.bloombox.schema.media.MediaKey.Builder.class);
-  }
-
-  public static final int ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object id_;
-  /**
-   * <code>string id = 1;</code>
-   */
-  public java.lang.String getId() {
-    java.lang.Object ref = id_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      id_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string id = 1;</code>
-   */
-  public com.google.protobuf.ByteString
-      getIdBytes() {
-    java.lang.Object ref = id_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      id_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.media.MediaKey)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.media.MediaKey other = (io.bloombox.schema.media.MediaKey) obj;
-
-    boolean result = true;
-    result = result && getId()
-        .equals(other.getId());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + ID_FIELD_NUMBER;
-    hash = (53 * hash) + getId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.media.MediaKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code MediaKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:MediaKey)
-      io.bloombox.schema.media.MediaKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.MediaItemKey.internal_static_MediaKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.media.MediaItemKey.internal_static_MediaKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.media.MediaKey.class, io.bloombox.schema.media.MediaKey.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.media.MediaKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      id_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.media.MediaItemKey.internal_static_MediaKey_descriptor;
-    }
-
-    public io.bloombox.schema.media.MediaKey getDefaultInstanceForType() {
-      return io.bloombox.schema.media.MediaKey.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.media.MediaKey build() {
-      io.bloombox.schema.media.MediaKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.media.MediaKey buildPartial() {
-      io.bloombox.schema.media.MediaKey result = new io.bloombox.schema.media.MediaKey(this);
-      result.id_ = id_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.media.MediaKey) {
-        return mergeFrom((io.bloombox.schema.media.MediaKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.media.MediaKey other) {
-      if (other == io.bloombox.schema.media.MediaKey.getDefaultInstance()) return this;
-      if (!other.getId().isEmpty()) {
-        id_ = other.id_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.media.MediaKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.media.MediaKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object id_ = "";
-    /**
-     * <code>string id = 1;</code>
-     */
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        id_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        id_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public Builder setId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      id_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public Builder clearId() {
-      
-      id_ = getDefaultInstance().getId();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string id = 1;</code>
-     */
-    public Builder setIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      id_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:MediaKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:MediaKey)
-  private static final io.bloombox.schema.media.MediaKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.media.MediaKey();
-  }
-
-  public static io.bloombox.schema.media.MediaKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<MediaKey>
-      PARSER = new com.google.protobuf.AbstractParser<MediaKey>() {
-    public MediaKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new MediaKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<MediaKey> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<MediaKey> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.media.MediaKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/media/MediaKeyOrBuilder.java b/languages/java/io/bloombox/schema/media/MediaKeyOrBuilder.java
deleted file mode 100644
index 253fec8..0000000
--- a/languages/java/io/bloombox/schema/media/MediaKeyOrBuilder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-package io.bloombox.schema.media;
-
-public interface MediaKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:MediaKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>string id = 1;</code>
-   */
-  java.lang.String getId();
-  /**
-   * <code>string id = 1;</code>
-   */
-  com.google.protobuf.ByteString
-      getIdBytes();
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaKeyOuterClass.java b/languages/java/io/bloombox/schema/media/MediaKeyOuterClass.java
deleted file mode 100644
index f9cacee..0000000
--- a/languages/java/io/bloombox/schema/media/MediaKeyOuterClass.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-package io.bloombox.schema.media;
-
-public final class MediaKeyOuterClass {
-  private MediaKeyOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MediaKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MediaKey_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\024media/MediaKey.proto\"\026\n\010MediaKey\022\n\n\002id" +
-      "\030\001 \001(\tB\034\n\030io.bloombox.schema.mediaP\001b\006pr" +
-      "oto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_MediaKey_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MediaKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MediaKey_descriptor,
-        new java.lang.String[] { "Id", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaType.java b/languages/java/io/bloombox/schema/media/MediaType.java
deleted file mode 100644
index 6128ac2..0000000
--- a/languages/java/io/bloombox/schema/media/MediaType.java
+++ /dev/null
@@ -1,1136 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-/**
- * <pre>
- * -- Media Type: Top-level -- //
- * </pre>
- *
- * Protobuf type {@code MediaType}
- */
-public  final class MediaType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:MediaType)
-    MediaTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use MediaType.newBuilder() to construct.
-  private MediaType(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private MediaType() {
-    kind_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private MediaType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            kind_ = rawValue;
-            break;
-          }
-          case 810: {
-            io.bloombox.schema.media.ImageType.Builder subBuilder = null;
-            if (imageType_ != null) {
-              subBuilder = imageType_.toBuilder();
-            }
-            imageType_ = input.readMessage(io.bloombox.schema.media.ImageType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(imageType_);
-              imageType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 1610: {
-            io.bloombox.schema.media.DocumentType.Builder subBuilder = null;
-            if (documentType_ != null) {
-              subBuilder = documentType_.toBuilder();
-            }
-            documentType_ = input.readMessage(io.bloombox.schema.media.DocumentType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(documentType_);
-              documentType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 2410: {
-            io.bloombox.schema.media.VideoType.Builder subBuilder = null;
-            if (videoType_ != null) {
-              subBuilder = videoType_.toBuilder();
-            }
-            videoType_ = input.readMessage(io.bloombox.schema.media.VideoType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(videoType_);
-              videoType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_MediaType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_MediaType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.media.MediaType.class, io.bloombox.schema.media.MediaType.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code MediaType.Kind}
-   */
-  public enum Kind
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>LINK = 0;</code>
-     */
-    LINK(0),
-    /**
-     * <code>IMAGE = 1;</code>
-     */
-    IMAGE(1),
-    /**
-     * <code>DOCUMENT = 2;</code>
-     */
-    DOCUMENT(2),
-    /**
-     * <code>VIDEO = 3;</code>
-     */
-    VIDEO(3),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>LINK = 0;</code>
-     */
-    public static final int LINK_VALUE = 0;
-    /**
-     * <code>IMAGE = 1;</code>
-     */
-    public static final int IMAGE_VALUE = 1;
-    /**
-     * <code>DOCUMENT = 2;</code>
-     */
-    public static final int DOCUMENT_VALUE = 2;
-    /**
-     * <code>VIDEO = 3;</code>
-     */
-    public static final int VIDEO_VALUE = 3;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static Kind valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static Kind forNumber(int value) {
-      switch (value) {
-        case 0: return LINK;
-        case 1: return IMAGE;
-        case 2: return DOCUMENT;
-        case 3: return VIDEO;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<Kind>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        Kind> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<Kind>() {
-            public Kind findValueByNumber(int number) {
-              return Kind.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.MediaType.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final Kind[] VALUES = values();
-
-    public static Kind valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private Kind(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:MediaType.Kind)
-  }
-
-  public static final int KIND_FIELD_NUMBER = 1;
-  private int kind_;
-  /**
-   * <code>.MediaType.Kind kind = 1;</code>
-   */
-  public int getKindValue() {
-    return kind_;
-  }
-  /**
-   * <code>.MediaType.Kind kind = 1;</code>
-   */
-  public io.bloombox.schema.media.MediaType.Kind getKind() {
-    io.bloombox.schema.media.MediaType.Kind result = io.bloombox.schema.media.MediaType.Kind.valueOf(kind_);
-    return result == null ? io.bloombox.schema.media.MediaType.Kind.UNRECOGNIZED : result;
-  }
-
-  public static final int IMAGE_TYPE_FIELD_NUMBER = 101;
-  private io.bloombox.schema.media.ImageType imageType_;
-  /**
-   * <code>.ImageType image_type = 101;</code>
-   */
-  public boolean hasImageType() {
-    return imageType_ != null;
-  }
-  /**
-   * <code>.ImageType image_type = 101;</code>
-   */
-  public io.bloombox.schema.media.ImageType getImageType() {
-    return imageType_ == null ? io.bloombox.schema.media.ImageType.getDefaultInstance() : imageType_;
-  }
-  /**
-   * <code>.ImageType image_type = 101;</code>
-   */
-  public io.bloombox.schema.media.ImageTypeOrBuilder getImageTypeOrBuilder() {
-    return getImageType();
-  }
-
-  public static final int DOCUMENT_TYPE_FIELD_NUMBER = 201;
-  private io.bloombox.schema.media.DocumentType documentType_;
-  /**
-   * <code>.DocumentType document_type = 201;</code>
-   */
-  public boolean hasDocumentType() {
-    return documentType_ != null;
-  }
-  /**
-   * <code>.DocumentType document_type = 201;</code>
-   */
-  public io.bloombox.schema.media.DocumentType getDocumentType() {
-    return documentType_ == null ? io.bloombox.schema.media.DocumentType.getDefaultInstance() : documentType_;
-  }
-  /**
-   * <code>.DocumentType document_type = 201;</code>
-   */
-  public io.bloombox.schema.media.DocumentTypeOrBuilder getDocumentTypeOrBuilder() {
-    return getDocumentType();
-  }
-
-  public static final int VIDEO_TYPE_FIELD_NUMBER = 301;
-  private io.bloombox.schema.media.VideoType videoType_;
-  /**
-   * <code>.VideoType video_type = 301;</code>
-   */
-  public boolean hasVideoType() {
-    return videoType_ != null;
-  }
-  /**
-   * <code>.VideoType video_type = 301;</code>
-   */
-  public io.bloombox.schema.media.VideoType getVideoType() {
-    return videoType_ == null ? io.bloombox.schema.media.VideoType.getDefaultInstance() : videoType_;
-  }
-  /**
-   * <code>.VideoType video_type = 301;</code>
-   */
-  public io.bloombox.schema.media.VideoTypeOrBuilder getVideoTypeOrBuilder() {
-    return getVideoType();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (kind_ != io.bloombox.schema.media.MediaType.Kind.LINK.getNumber()) {
-      output.writeEnum(1, kind_);
-    }
-    if (imageType_ != null) {
-      output.writeMessage(101, getImageType());
-    }
-    if (documentType_ != null) {
-      output.writeMessage(201, getDocumentType());
-    }
-    if (videoType_ != null) {
-      output.writeMessage(301, getVideoType());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (kind_ != io.bloombox.schema.media.MediaType.Kind.LINK.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, kind_);
-    }
-    if (imageType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(101, getImageType());
-    }
-    if (documentType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(201, getDocumentType());
-    }
-    if (videoType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(301, getVideoType());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.media.MediaType)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.media.MediaType other = (io.bloombox.schema.media.MediaType) obj;
-
-    boolean result = true;
-    result = result && kind_ == other.kind_;
-    result = result && (hasImageType() == other.hasImageType());
-    if (hasImageType()) {
-      result = result && getImageType()
-          .equals(other.getImageType());
-    }
-    result = result && (hasDocumentType() == other.hasDocumentType());
-    if (hasDocumentType()) {
-      result = result && getDocumentType()
-          .equals(other.getDocumentType());
-    }
-    result = result && (hasVideoType() == other.hasVideoType());
-    if (hasVideoType()) {
-      result = result && getVideoType()
-          .equals(other.getVideoType());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + KIND_FIELD_NUMBER;
-    hash = (53 * hash) + kind_;
-    if (hasImageType()) {
-      hash = (37 * hash) + IMAGE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getImageType().hashCode();
-    }
-    if (hasDocumentType()) {
-      hash = (37 * hash) + DOCUMENT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getDocumentType().hashCode();
-    }
-    if (hasVideoType()) {
-      hash = (37 * hash) + VIDEO_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getVideoType().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.MediaType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.media.MediaType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Media Type: Top-level -- //
-   * </pre>
-   *
-   * Protobuf type {@code MediaType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:MediaType)
-      io.bloombox.schema.media.MediaTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_MediaType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_MediaType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.media.MediaType.class, io.bloombox.schema.media.MediaType.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.media.MediaType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      kind_ = 0;
-
-      if (imageTypeBuilder_ == null) {
-        imageType_ = null;
-      } else {
-        imageType_ = null;
-        imageTypeBuilder_ = null;
-      }
-      if (documentTypeBuilder_ == null) {
-        documentType_ = null;
-      } else {
-        documentType_ = null;
-        documentTypeBuilder_ = null;
-      }
-      if (videoTypeBuilder_ == null) {
-        videoType_ = null;
-      } else {
-        videoType_ = null;
-        videoTypeBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_MediaType_descriptor;
-    }
-
-    public io.bloombox.schema.media.MediaType getDefaultInstanceForType() {
-      return io.bloombox.schema.media.MediaType.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.media.MediaType build() {
-      io.bloombox.schema.media.MediaType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.media.MediaType buildPartial() {
-      io.bloombox.schema.media.MediaType result = new io.bloombox.schema.media.MediaType(this);
-      result.kind_ = kind_;
-      if (imageTypeBuilder_ == null) {
-        result.imageType_ = imageType_;
-      } else {
-        result.imageType_ = imageTypeBuilder_.build();
-      }
-      if (documentTypeBuilder_ == null) {
-        result.documentType_ = documentType_;
-      } else {
-        result.documentType_ = documentTypeBuilder_.build();
-      }
-      if (videoTypeBuilder_ == null) {
-        result.videoType_ = videoType_;
-      } else {
-        result.videoType_ = videoTypeBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.media.MediaType) {
-        return mergeFrom((io.bloombox.schema.media.MediaType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.media.MediaType other) {
-      if (other == io.bloombox.schema.media.MediaType.getDefaultInstance()) return this;
-      if (other.kind_ != 0) {
-        setKindValue(other.getKindValue());
-      }
-      if (other.hasImageType()) {
-        mergeImageType(other.getImageType());
-      }
-      if (other.hasDocumentType()) {
-        mergeDocumentType(other.getDocumentType());
-      }
-      if (other.hasVideoType()) {
-        mergeVideoType(other.getVideoType());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.media.MediaType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.media.MediaType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int kind_ = 0;
-    /**
-     * <code>.MediaType.Kind kind = 1;</code>
-     */
-    public int getKindValue() {
-      return kind_;
-    }
-    /**
-     * <code>.MediaType.Kind kind = 1;</code>
-     */
-    public Builder setKindValue(int value) {
-      kind_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.MediaType.Kind kind = 1;</code>
-     */
-    public io.bloombox.schema.media.MediaType.Kind getKind() {
-      io.bloombox.schema.media.MediaType.Kind result = io.bloombox.schema.media.MediaType.Kind.valueOf(kind_);
-      return result == null ? io.bloombox.schema.media.MediaType.Kind.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.MediaType.Kind kind = 1;</code>
-     */
-    public Builder setKind(io.bloombox.schema.media.MediaType.Kind value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      kind_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.MediaType.Kind kind = 1;</code>
-     */
-    public Builder clearKind() {
-      
-      kind_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private io.bloombox.schema.media.ImageType imageType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.ImageType, io.bloombox.schema.media.ImageType.Builder, io.bloombox.schema.media.ImageTypeOrBuilder> imageTypeBuilder_;
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public boolean hasImageType() {
-      return imageTypeBuilder_ != null || imageType_ != null;
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public io.bloombox.schema.media.ImageType getImageType() {
-      if (imageTypeBuilder_ == null) {
-        return imageType_ == null ? io.bloombox.schema.media.ImageType.getDefaultInstance() : imageType_;
-      } else {
-        return imageTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public Builder setImageType(io.bloombox.schema.media.ImageType value) {
-      if (imageTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        imageType_ = value;
-        onChanged();
-      } else {
-        imageTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public Builder setImageType(
-        io.bloombox.schema.media.ImageType.Builder builderForValue) {
-      if (imageTypeBuilder_ == null) {
-        imageType_ = builderForValue.build();
-        onChanged();
-      } else {
-        imageTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public Builder mergeImageType(io.bloombox.schema.media.ImageType value) {
-      if (imageTypeBuilder_ == null) {
-        if (imageType_ != null) {
-          imageType_ =
-            io.bloombox.schema.media.ImageType.newBuilder(imageType_).mergeFrom(value).buildPartial();
-        } else {
-          imageType_ = value;
-        }
-        onChanged();
-      } else {
-        imageTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public Builder clearImageType() {
-      if (imageTypeBuilder_ == null) {
-        imageType_ = null;
-        onChanged();
-      } else {
-        imageType_ = null;
-        imageTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public io.bloombox.schema.media.ImageType.Builder getImageTypeBuilder() {
-      
-      onChanged();
-      return getImageTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    public io.bloombox.schema.media.ImageTypeOrBuilder getImageTypeOrBuilder() {
-      if (imageTypeBuilder_ != null) {
-        return imageTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return imageType_ == null ?
-            io.bloombox.schema.media.ImageType.getDefaultInstance() : imageType_;
-      }
-    }
-    /**
-     * <code>.ImageType image_type = 101;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.ImageType, io.bloombox.schema.media.ImageType.Builder, io.bloombox.schema.media.ImageTypeOrBuilder> 
-        getImageTypeFieldBuilder() {
-      if (imageTypeBuilder_ == null) {
-        imageTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.media.ImageType, io.bloombox.schema.media.ImageType.Builder, io.bloombox.schema.media.ImageTypeOrBuilder>(
-                getImageType(),
-                getParentForChildren(),
-                isClean());
-        imageType_ = null;
-      }
-      return imageTypeBuilder_;
-    }
-
-    private io.bloombox.schema.media.DocumentType documentType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.DocumentType, io.bloombox.schema.media.DocumentType.Builder, io.bloombox.schema.media.DocumentTypeOrBuilder> documentTypeBuilder_;
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public boolean hasDocumentType() {
-      return documentTypeBuilder_ != null || documentType_ != null;
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public io.bloombox.schema.media.DocumentType getDocumentType() {
-      if (documentTypeBuilder_ == null) {
-        return documentType_ == null ? io.bloombox.schema.media.DocumentType.getDefaultInstance() : documentType_;
-      } else {
-        return documentTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public Builder setDocumentType(io.bloombox.schema.media.DocumentType value) {
-      if (documentTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        documentType_ = value;
-        onChanged();
-      } else {
-        documentTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public Builder setDocumentType(
-        io.bloombox.schema.media.DocumentType.Builder builderForValue) {
-      if (documentTypeBuilder_ == null) {
-        documentType_ = builderForValue.build();
-        onChanged();
-      } else {
-        documentTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public Builder mergeDocumentType(io.bloombox.schema.media.DocumentType value) {
-      if (documentTypeBuilder_ == null) {
-        if (documentType_ != null) {
-          documentType_ =
-            io.bloombox.schema.media.DocumentType.newBuilder(documentType_).mergeFrom(value).buildPartial();
-        } else {
-          documentType_ = value;
-        }
-        onChanged();
-      } else {
-        documentTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public Builder clearDocumentType() {
-      if (documentTypeBuilder_ == null) {
-        documentType_ = null;
-        onChanged();
-      } else {
-        documentType_ = null;
-        documentTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public io.bloombox.schema.media.DocumentType.Builder getDocumentTypeBuilder() {
-      
-      onChanged();
-      return getDocumentTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    public io.bloombox.schema.media.DocumentTypeOrBuilder getDocumentTypeOrBuilder() {
-      if (documentTypeBuilder_ != null) {
-        return documentTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return documentType_ == null ?
-            io.bloombox.schema.media.DocumentType.getDefaultInstance() : documentType_;
-      }
-    }
-    /**
-     * <code>.DocumentType document_type = 201;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.DocumentType, io.bloombox.schema.media.DocumentType.Builder, io.bloombox.schema.media.DocumentTypeOrBuilder> 
-        getDocumentTypeFieldBuilder() {
-      if (documentTypeBuilder_ == null) {
-        documentTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.media.DocumentType, io.bloombox.schema.media.DocumentType.Builder, io.bloombox.schema.media.DocumentTypeOrBuilder>(
-                getDocumentType(),
-                getParentForChildren(),
-                isClean());
-        documentType_ = null;
-      }
-      return documentTypeBuilder_;
-    }
-
-    private io.bloombox.schema.media.VideoType videoType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.VideoType, io.bloombox.schema.media.VideoType.Builder, io.bloombox.schema.media.VideoTypeOrBuilder> videoTypeBuilder_;
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public boolean hasVideoType() {
-      return videoTypeBuilder_ != null || videoType_ != null;
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public io.bloombox.schema.media.VideoType getVideoType() {
-      if (videoTypeBuilder_ == null) {
-        return videoType_ == null ? io.bloombox.schema.media.VideoType.getDefaultInstance() : videoType_;
-      } else {
-        return videoTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public Builder setVideoType(io.bloombox.schema.media.VideoType value) {
-      if (videoTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        videoType_ = value;
-        onChanged();
-      } else {
-        videoTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public Builder setVideoType(
-        io.bloombox.schema.media.VideoType.Builder builderForValue) {
-      if (videoTypeBuilder_ == null) {
-        videoType_ = builderForValue.build();
-        onChanged();
-      } else {
-        videoTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public Builder mergeVideoType(io.bloombox.schema.media.VideoType value) {
-      if (videoTypeBuilder_ == null) {
-        if (videoType_ != null) {
-          videoType_ =
-            io.bloombox.schema.media.VideoType.newBuilder(videoType_).mergeFrom(value).buildPartial();
-        } else {
-          videoType_ = value;
-        }
-        onChanged();
-      } else {
-        videoTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public Builder clearVideoType() {
-      if (videoTypeBuilder_ == null) {
-        videoType_ = null;
-        onChanged();
-      } else {
-        videoType_ = null;
-        videoTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public io.bloombox.schema.media.VideoType.Builder getVideoTypeBuilder() {
-      
-      onChanged();
-      return getVideoTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    public io.bloombox.schema.media.VideoTypeOrBuilder getVideoTypeOrBuilder() {
-      if (videoTypeBuilder_ != null) {
-        return videoTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return videoType_ == null ?
-            io.bloombox.schema.media.VideoType.getDefaultInstance() : videoType_;
-      }
-    }
-    /**
-     * <code>.VideoType video_type = 301;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.media.VideoType, io.bloombox.schema.media.VideoType.Builder, io.bloombox.schema.media.VideoTypeOrBuilder> 
-        getVideoTypeFieldBuilder() {
-      if (videoTypeBuilder_ == null) {
-        videoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.media.VideoType, io.bloombox.schema.media.VideoType.Builder, io.bloombox.schema.media.VideoTypeOrBuilder>(
-                getVideoType(),
-                getParentForChildren(),
-                isClean());
-        videoType_ = null;
-      }
-      return videoTypeBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:MediaType)
-  }
-
-  // @@protoc_insertion_point(class_scope:MediaType)
-  private static final io.bloombox.schema.media.MediaType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.media.MediaType();
-  }
-
-  public static io.bloombox.schema.media.MediaType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<MediaType>
-      PARSER = new com.google.protobuf.AbstractParser<MediaType>() {
-    public MediaType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new MediaType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<MediaType> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<MediaType> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.media.MediaType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/media/MediaTypeOrBuilder.java b/languages/java/io/bloombox/schema/media/MediaTypeOrBuilder.java
deleted file mode 100644
index a292359..0000000
--- a/languages/java/io/bloombox/schema/media/MediaTypeOrBuilder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-public interface MediaTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:MediaType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.MediaType.Kind kind = 1;</code>
-   */
-  int getKindValue();
-  /**
-   * <code>.MediaType.Kind kind = 1;</code>
-   */
-  io.bloombox.schema.media.MediaType.Kind getKind();
-
-  /**
-   * <code>.ImageType image_type = 101;</code>
-   */
-  boolean hasImageType();
-  /**
-   * <code>.ImageType image_type = 101;</code>
-   */
-  io.bloombox.schema.media.ImageType getImageType();
-  /**
-   * <code>.ImageType image_type = 101;</code>
-   */
-  io.bloombox.schema.media.ImageTypeOrBuilder getImageTypeOrBuilder();
-
-  /**
-   * <code>.DocumentType document_type = 201;</code>
-   */
-  boolean hasDocumentType();
-  /**
-   * <code>.DocumentType document_type = 201;</code>
-   */
-  io.bloombox.schema.media.DocumentType getDocumentType();
-  /**
-   * <code>.DocumentType document_type = 201;</code>
-   */
-  io.bloombox.schema.media.DocumentTypeOrBuilder getDocumentTypeOrBuilder();
-
-  /**
-   * <code>.VideoType video_type = 301;</code>
-   */
-  boolean hasVideoType();
-  /**
-   * <code>.VideoType video_type = 301;</code>
-   */
-  io.bloombox.schema.media.VideoType getVideoType();
-  /**
-   * <code>.VideoType video_type = 301;</code>
-   */
-  io.bloombox.schema.media.VideoTypeOrBuilder getVideoTypeOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/media/MediaTypeOuterClass.java b/languages/java/io/bloombox/schema/media/MediaTypeOuterClass.java
deleted file mode 100644
index a1ef80b..0000000
--- a/languages/java/io/bloombox/schema/media/MediaTypeOuterClass.java
+++ /dev/null
@@ -1,101 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-public final class MediaTypeOuterClass {
-  private MediaTypeOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_MediaType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_MediaType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ImageType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ImageType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_DocumentType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_DocumentType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_VideoType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_VideoType_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025media/MediaType.proto\"\310\001\n\tMediaType\022\035\n" +
-      "\004kind\030\001 \001(\0162\017.MediaType.Kind\022\036\n\nimage_ty" +
-      "pe\030e \001(\0132\n.ImageType\022%\n\rdocument_type\030\311\001" +
-      " \001(\0132\r.DocumentType\022\037\n\nvideo_type\030\255\002 \001(\013" +
-      "2\n.VideoType\"4\n\004Kind\022\010\n\004LINK\020\000\022\t\n\005IMAGE\020" +
-      "\001\022\014\n\010DOCUMENT\020\002\022\t\n\005VIDEO\020\003\"j\n\tImageType\022" +
-      "\"\n\004kind\030\001 \001(\0162\024.ImageType.ImageKind\"9\n\tI" +
-      "mageKind\022\007\n\003PNG\020\000\022\007\n\003JPG\020\001\022\007\n\003GIF\020\002\022\007\n\003S" +
-      "VG\020\003\022\010\n\004WEBP\020\004\"\206\001\n\014DocumentType\022(\n\004kind\030" +
-      "\001 \001(\0162\032.DocumentType.DocumentKind\022\022\n\ncom",
-      "pressed\030\002 \001(\010\"8\n\014DocumentKind\022\007\n\003TXT\020\000\022\010" +
-      "\n\004HTML\020\001\022\007\n\003PDF\020\002\022\014\n\010MARKDOWN\020\003\"W\n\tVideo" +
-      "Type\022\"\n\004kind\030\001 \001(\0162\024.VideoType.VideoKind" +
-      "\"&\n\tVideoKind\022\007\n\003MP4\020\000\022\007\n\003FLV\020\001\022\007\n\003HLS\020\002" +
-      "B\034\n\030io.bloombox.schema.mediaP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_MediaType_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_MediaType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_MediaType_descriptor,
-        new java.lang.String[] { "Kind", "ImageType", "DocumentType", "VideoType", });
-    internal_static_ImageType_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_ImageType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ImageType_descriptor,
-        new java.lang.String[] { "Kind", });
-    internal_static_DocumentType_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_DocumentType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_DocumentType_descriptor,
-        new java.lang.String[] { "Kind", "Compressed", });
-    internal_static_VideoType_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_VideoType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_VideoType_descriptor,
-        new java.lang.String[] { "Kind", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/media/VideoType.java b/languages/java/io/bloombox/schema/media/VideoType.java
deleted file mode 100644
index 65fdbb2..0000000
--- a/languages/java/io/bloombox/schema/media/VideoType.java
+++ /dev/null
@@ -1,584 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-/**
- * <pre>
- * -- Media Type: Video -- //
- * </pre>
- *
- * Protobuf type {@code VideoType}
- */
-public  final class VideoType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:VideoType)
-    VideoTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use VideoType.newBuilder() to construct.
-  private VideoType(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private VideoType() {
-    kind_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private VideoType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            kind_ = rawValue;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_VideoType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.media.MediaItemType.internal_static_VideoType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.media.VideoType.class, io.bloombox.schema.media.VideoType.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code VideoType.VideoKind}
-   */
-  public enum VideoKind
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>MP4 = 0;</code>
-     */
-    MP4(0),
-    /**
-     * <code>FLV = 1;</code>
-     */
-    FLV(1),
-    /**
-     * <code>HLS = 2;</code>
-     */
-    HLS(2),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>MP4 = 0;</code>
-     */
-    public static final int MP4_VALUE = 0;
-    /**
-     * <code>FLV = 1;</code>
-     */
-    public static final int FLV_VALUE = 1;
-    /**
-     * <code>HLS = 2;</code>
-     */
-    public static final int HLS_VALUE = 2;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static VideoKind valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static VideoKind forNumber(int value) {
-      switch (value) {
-        case 0: return MP4;
-        case 1: return FLV;
-        case 2: return HLS;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<VideoKind>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        VideoKind> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<VideoKind>() {
-            public VideoKind findValueByNumber(int number) {
-              return VideoKind.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.VideoType.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final VideoKind[] VALUES = values();
-
-    public static VideoKind valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private VideoKind(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:VideoType.VideoKind)
-  }
-
-  public static final int KIND_FIELD_NUMBER = 1;
-  private int kind_;
-  /**
-   * <code>.VideoType.VideoKind kind = 1;</code>
-   */
-  public int getKindValue() {
-    return kind_;
-  }
-  /**
-   * <code>.VideoType.VideoKind kind = 1;</code>
-   */
-  public io.bloombox.schema.media.VideoType.VideoKind getKind() {
-    io.bloombox.schema.media.VideoType.VideoKind result = io.bloombox.schema.media.VideoType.VideoKind.valueOf(kind_);
-    return result == null ? io.bloombox.schema.media.VideoType.VideoKind.UNRECOGNIZED : result;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (kind_ != io.bloombox.schema.media.VideoType.VideoKind.MP4.getNumber()) {
-      output.writeEnum(1, kind_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (kind_ != io.bloombox.schema.media.VideoType.VideoKind.MP4.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, kind_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.media.VideoType)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.media.VideoType other = (io.bloombox.schema.media.VideoType) obj;
-
-    boolean result = true;
-    result = result && kind_ == other.kind_;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + KIND_FIELD_NUMBER;
-    hash = (53 * hash) + kind_;
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.VideoType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.VideoType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.media.VideoType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.media.VideoType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Media Type: Video -- //
-   * </pre>
-   *
-   * Protobuf type {@code VideoType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:VideoType)
-      io.bloombox.schema.media.VideoTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_VideoType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_VideoType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.media.VideoType.class, io.bloombox.schema.media.VideoType.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.media.VideoType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      kind_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.media.MediaItemType.internal_static_VideoType_descriptor;
-    }
-
-    public io.bloombox.schema.media.VideoType getDefaultInstanceForType() {
-      return io.bloombox.schema.media.VideoType.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.media.VideoType build() {
-      io.bloombox.schema.media.VideoType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.media.VideoType buildPartial() {
-      io.bloombox.schema.media.VideoType result = new io.bloombox.schema.media.VideoType(this);
-      result.kind_ = kind_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.media.VideoType) {
-        return mergeFrom((io.bloombox.schema.media.VideoType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.media.VideoType other) {
-      if (other == io.bloombox.schema.media.VideoType.getDefaultInstance()) return this;
-      if (other.kind_ != 0) {
-        setKindValue(other.getKindValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.media.VideoType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.media.VideoType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int kind_ = 0;
-    /**
-     * <code>.VideoType.VideoKind kind = 1;</code>
-     */
-    public int getKindValue() {
-      return kind_;
-    }
-    /**
-     * <code>.VideoType.VideoKind kind = 1;</code>
-     */
-    public Builder setKindValue(int value) {
-      kind_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.VideoType.VideoKind kind = 1;</code>
-     */
-    public io.bloombox.schema.media.VideoType.VideoKind getKind() {
-      io.bloombox.schema.media.VideoType.VideoKind result = io.bloombox.schema.media.VideoType.VideoKind.valueOf(kind_);
-      return result == null ? io.bloombox.schema.media.VideoType.VideoKind.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.VideoType.VideoKind kind = 1;</code>
-     */
-    public Builder setKind(io.bloombox.schema.media.VideoType.VideoKind value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      kind_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.VideoType.VideoKind kind = 1;</code>
-     */
-    public Builder clearKind() {
-      
-      kind_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:VideoType)
-  }
-
-  // @@protoc_insertion_point(class_scope:VideoType)
-  private static final io.bloombox.schema.media.VideoType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.media.VideoType();
-  }
-
-  public static io.bloombox.schema.media.VideoType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<VideoType>
-      PARSER = new com.google.protobuf.AbstractParser<VideoType>() {
-    public VideoType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new VideoType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<VideoType> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<VideoType> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.media.VideoType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/media/VideoTypeOrBuilder.java b/languages/java/io/bloombox/schema/media/VideoTypeOrBuilder.java
deleted file mode 100644
index 6e53c7a..0000000
--- a/languages/java/io/bloombox/schema/media/VideoTypeOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-package io.bloombox.schema.media;
-
-public interface VideoTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:VideoType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.VideoType.VideoKind kind = 1;</code>
-   */
-  int getKindValue();
-  /**
-   * <code>.VideoType.VideoKind kind = 1;</code>
-   */
-  io.bloombox.schema.media.VideoType.VideoKind getKind();
-}
diff --git a/languages/java/io/bloombox/schema/product/FlowerOuterClass.java b/languages/java/io/bloombox/schema/product/FlowerOuterClass.java
deleted file mode 100644
index 8599c6c..0000000
--- a/languages/java/io/bloombox/schema/product/FlowerOuterClass.java
+++ /dev/null
@@ -1,1600 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-
-package io.bloombox.schema.product;
-
-public final class FlowerOuterClass {
-  private FlowerOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  public interface FlowerOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:Flower)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    boolean hasKey();
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    io.bloombox.schema.base.ProductKey getKey();
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder();
-
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    boolean hasProductData();
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    io.bloombox.schema.content.ProductContent getProductData();
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    io.bloombox.schema.content.ProductContentOrBuilder getProductDataOrBuilder();
-
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    boolean hasMaterialData();
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    io.bloombox.schema.content.MaterialsData getMaterialData();
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    io.bloombox.schema.content.MaterialsDataOrBuilder getMaterialDataOrBuilder();
-
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    boolean hasFlags();
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    io.bloombox.schema.product.struct.FlagsDescriptor getFlags();
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder getFlagsOrBuilder();
-
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    boolean hasPricing();
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    io.bloombox.schema.product.struct.ProductPricing getPricing();
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    io.bloombox.schema.product.struct.ProductPricingOrBuilder getPricingOrBuilder();
-  }
-  /**
-   * Protobuf type {@code Flower}
-   */
-  public  static final class Flower extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:Flower)
-      FlowerOrBuilder {
-    // Use Flower.newBuilder() to construct.
-    private Flower(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
-    private Flower() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
-    }
-    private Flower(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      int mutable_bitField0_ = 0;
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!input.skipField(tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              io.bloombox.schema.base.ProductKey.Builder subBuilder = null;
-              if (key_ != null) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(io.bloombox.schema.base.ProductKey.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 162: {
-              io.bloombox.schema.content.ProductContent.Builder subBuilder = null;
-              if (productData_ != null) {
-                subBuilder = productData_.toBuilder();
-              }
-              productData_ = input.readMessage(io.bloombox.schema.content.ProductContent.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(productData_);
-                productData_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 170: {
-              io.bloombox.schema.content.MaterialsData.Builder subBuilder = null;
-              if (materialData_ != null) {
-                subBuilder = materialData_.toBuilder();
-              }
-              materialData_ = input.readMessage(io.bloombox.schema.content.MaterialsData.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(materialData_);
-                materialData_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 178: {
-              io.bloombox.schema.product.struct.FlagsDescriptor.Builder subBuilder = null;
-              if (flags_ != null) {
-                subBuilder = flags_.toBuilder();
-              }
-              flags_ = input.readMessage(io.bloombox.schema.product.struct.FlagsDescriptor.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(flags_);
-                flags_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 186: {
-              io.bloombox.schema.product.struct.ProductPricing.Builder subBuilder = null;
-              if (pricing_ != null) {
-                subBuilder = pricing_.toBuilder();
-              }
-              pricing_ = input.readMessage(io.bloombox.schema.product.struct.ProductPricing.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pricing_);
-                pricing_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.FlowerOuterClass.internal_static_Flower_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.FlowerOuterClass.internal_static_Flower_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.FlowerOuterClass.Flower.class, io.bloombox.schema.product.FlowerOuterClass.Flower.Builder.class);
-    }
-
-    public static final int KEY_FIELD_NUMBER = 1;
-    private io.bloombox.schema.base.ProductKey key_;
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    public boolean hasKey() {
-      return key_ != null;
-    }
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKey getKey() {
-      return key_ == null ? io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-    }
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder() {
-      return getKey();
-    }
-
-    public static final int PRODUCT_DATA_FIELD_NUMBER = 20;
-    private io.bloombox.schema.content.ProductContent productData_;
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    public boolean hasProductData() {
-      return productData_ != null;
-    }
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    public io.bloombox.schema.content.ProductContent getProductData() {
-      return productData_ == null ? io.bloombox.schema.content.ProductContent.getDefaultInstance() : productData_;
-    }
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    public io.bloombox.schema.content.ProductContentOrBuilder getProductDataOrBuilder() {
-      return getProductData();
-    }
-
-    public static final int MATERIAL_DATA_FIELD_NUMBER = 21;
-    private io.bloombox.schema.content.MaterialsData materialData_;
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    public boolean hasMaterialData() {
-      return materialData_ != null;
-    }
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    public io.bloombox.schema.content.MaterialsData getMaterialData() {
-      return materialData_ == null ? io.bloombox.schema.content.MaterialsData.getDefaultInstance() : materialData_;
-    }
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    public io.bloombox.schema.content.MaterialsDataOrBuilder getMaterialDataOrBuilder() {
-      return getMaterialData();
-    }
-
-    public static final int FLAGS_FIELD_NUMBER = 22;
-    private io.bloombox.schema.product.struct.FlagsDescriptor flags_;
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    public boolean hasFlags() {
-      return flags_ != null;
-    }
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FlagsDescriptor getFlags() {
-      return flags_ == null ? io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance() : flags_;
-    }
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder getFlagsOrBuilder() {
-      return getFlags();
-    }
-
-    public static final int PRICING_FIELD_NUMBER = 23;
-    private io.bloombox.schema.product.struct.ProductPricing pricing_;
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    public boolean hasPricing() {
-      return pricing_ != null;
-    }
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductPricing getPricing() {
-      return pricing_ == null ? io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance() : pricing_;
-    }
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductPricingOrBuilder getPricingOrBuilder() {
-      return getPricing();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (key_ != null) {
-        output.writeMessage(1, getKey());
-      }
-      if (productData_ != null) {
-        output.writeMessage(20, getProductData());
-      }
-      if (materialData_ != null) {
-        output.writeMessage(21, getMaterialData());
-      }
-      if (flags_ != null) {
-        output.writeMessage(22, getFlags());
-      }
-      if (pricing_ != null) {
-        output.writeMessage(23, getPricing());
-      }
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (key_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getKey());
-      }
-      if (productData_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(20, getProductData());
-      }
-      if (materialData_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(21, getMaterialData());
-      }
-      if (flags_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(22, getFlags());
-      }
-      if (pricing_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(23, getPricing());
-      }
-      memoizedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof io.bloombox.schema.product.FlowerOuterClass.Flower)) {
-        return super.equals(obj);
-      }
-      io.bloombox.schema.product.FlowerOuterClass.Flower other = (io.bloombox.schema.product.FlowerOuterClass.Flower) obj;
-
-      boolean result = true;
-      result = result && (hasKey() == other.hasKey());
-      if (hasKey()) {
-        result = result && getKey()
-            .equals(other.getKey());
-      }
-      result = result && (hasProductData() == other.hasProductData());
-      if (hasProductData()) {
-        result = result && getProductData()
-            .equals(other.getProductData());
-      }
-      result = result && (hasMaterialData() == other.hasMaterialData());
-      if (hasMaterialData()) {
-        result = result && getMaterialData()
-            .equals(other.getMaterialData());
-      }
-      result = result && (hasFlags() == other.hasFlags());
-      if (hasFlags()) {
-        result = result && getFlags()
-            .equals(other.getFlags());
-      }
-      result = result && (hasPricing() == other.hasPricing());
-      if (hasPricing()) {
-        result = result && getPricing()
-            .equals(other.getPricing());
-      }
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasKey()) {
-        hash = (37 * hash) + KEY_FIELD_NUMBER;
-        hash = (53 * hash) + getKey().hashCode();
-      }
-      if (hasProductData()) {
-        hash = (37 * hash) + PRODUCT_DATA_FIELD_NUMBER;
-        hash = (53 * hash) + getProductData().hashCode();
-      }
-      if (hasMaterialData()) {
-        hash = (37 * hash) + MATERIAL_DATA_FIELD_NUMBER;
-        hash = (53 * hash) + getMaterialData().hashCode();
-      }
-      if (hasFlags()) {
-        hash = (37 * hash) + FLAGS_FIELD_NUMBER;
-        hash = (53 * hash) + getFlags().hashCode();
-      }
-      if (hasPricing()) {
-        hash = (37 * hash) + PRICING_FIELD_NUMBER;
-        hash = (53 * hash) + getPricing().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(io.bloombox.schema.product.FlowerOuterClass.Flower prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code Flower}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:Flower)
-        io.bloombox.schema.product.FlowerOuterClass.FlowerOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return io.bloombox.schema.product.FlowerOuterClass.internal_static_Flower_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return io.bloombox.schema.product.FlowerOuterClass.internal_static_Flower_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                io.bloombox.schema.product.FlowerOuterClass.Flower.class, io.bloombox.schema.product.FlowerOuterClass.Flower.Builder.class);
-      }
-
-      // Construct using io.bloombox.schema.product.FlowerOuterClass.Flower.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          key_ = null;
-          keyBuilder_ = null;
-        }
-        if (productDataBuilder_ == null) {
-          productData_ = null;
-        } else {
-          productData_ = null;
-          productDataBuilder_ = null;
-        }
-        if (materialDataBuilder_ == null) {
-          materialData_ = null;
-        } else {
-          materialData_ = null;
-          materialDataBuilder_ = null;
-        }
-        if (flagsBuilder_ == null) {
-          flags_ = null;
-        } else {
-          flags_ = null;
-          flagsBuilder_ = null;
-        }
-        if (pricingBuilder_ == null) {
-          pricing_ = null;
-        } else {
-          pricing_ = null;
-          pricingBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return io.bloombox.schema.product.FlowerOuterClass.internal_static_Flower_descriptor;
-      }
-
-      public io.bloombox.schema.product.FlowerOuterClass.Flower getDefaultInstanceForType() {
-        return io.bloombox.schema.product.FlowerOuterClass.Flower.getDefaultInstance();
-      }
-
-      public io.bloombox.schema.product.FlowerOuterClass.Flower build() {
-        io.bloombox.schema.product.FlowerOuterClass.Flower result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public io.bloombox.schema.product.FlowerOuterClass.Flower buildPartial() {
-        io.bloombox.schema.product.FlowerOuterClass.Flower result = new io.bloombox.schema.product.FlowerOuterClass.Flower(this);
-        if (keyBuilder_ == null) {
-          result.key_ = key_;
-        } else {
-          result.key_ = keyBuilder_.build();
-        }
-        if (productDataBuilder_ == null) {
-          result.productData_ = productData_;
-        } else {
-          result.productData_ = productDataBuilder_.build();
-        }
-        if (materialDataBuilder_ == null) {
-          result.materialData_ = materialData_;
-        } else {
-          result.materialData_ = materialDataBuilder_.build();
-        }
-        if (flagsBuilder_ == null) {
-          result.flags_ = flags_;
-        } else {
-          result.flags_ = flagsBuilder_.build();
-        }
-        if (pricingBuilder_ == null) {
-          result.pricing_ = pricing_;
-        } else {
-          result.pricing_ = pricingBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.bloombox.schema.product.FlowerOuterClass.Flower) {
-          return mergeFrom((io.bloombox.schema.product.FlowerOuterClass.Flower)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(io.bloombox.schema.product.FlowerOuterClass.Flower other) {
-        if (other == io.bloombox.schema.product.FlowerOuterClass.Flower.getDefaultInstance()) return this;
-        if (other.hasKey()) {
-          mergeKey(other.getKey());
-        }
-        if (other.hasProductData()) {
-          mergeProductData(other.getProductData());
-        }
-        if (other.hasMaterialData()) {
-          mergeMaterialData(other.getMaterialData());
-        }
-        if (other.hasFlags()) {
-          mergeFlags(other.getFlags());
-        }
-        if (other.hasPricing()) {
-          mergePricing(other.getPricing());
-        }
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        io.bloombox.schema.product.FlowerOuterClass.Flower parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (io.bloombox.schema.product.FlowerOuterClass.Flower) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private io.bloombox.schema.base.ProductKey key_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder> keyBuilder_;
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public boolean hasKey() {
-        return keyBuilder_ != null || key_ != null;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public io.bloombox.schema.base.ProductKey getKey() {
-        if (keyBuilder_ == null) {
-          return key_ == null ? io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-        } else {
-          return keyBuilder_.getMessage();
-        }
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder setKey(io.bloombox.schema.base.ProductKey value) {
-        if (keyBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          key_ = value;
-          onChanged();
-        } else {
-          keyBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder setKey(
-          io.bloombox.schema.base.ProductKey.Builder builderForValue) {
-        if (keyBuilder_ == null) {
-          key_ = builderForValue.build();
-          onChanged();
-        } else {
-          keyBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder mergeKey(io.bloombox.schema.base.ProductKey value) {
-        if (keyBuilder_ == null) {
-          if (key_ != null) {
-            key_ =
-              io.bloombox.schema.base.ProductKey.newBuilder(key_).mergeFrom(value).buildPartial();
-          } else {
-            key_ = value;
-          }
-          onChanged();
-        } else {
-          keyBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          key_ = null;
-          keyBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public io.bloombox.schema.base.ProductKey.Builder getKeyBuilder() {
-        
-        onChanged();
-        return getKeyFieldBuilder().getBuilder();
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder() {
-        if (keyBuilder_ != null) {
-          return keyBuilder_.getMessageOrBuilder();
-        } else {
-          return key_ == null ?
-              io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-        }
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder> 
-          getKeyFieldBuilder() {
-        if (keyBuilder_ == null) {
-          keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder>(
-                  getKey(),
-                  getParentForChildren(),
-                  isClean());
-          key_ = null;
-        }
-        return keyBuilder_;
-      }
-
-      private io.bloombox.schema.content.ProductContent productData_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.ProductContent, io.bloombox.schema.content.ProductContent.Builder, io.bloombox.schema.content.ProductContentOrBuilder> productDataBuilder_;
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public boolean hasProductData() {
-        return productDataBuilder_ != null || productData_ != null;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public io.bloombox.schema.content.ProductContent getProductData() {
-        if (productDataBuilder_ == null) {
-          return productData_ == null ? io.bloombox.schema.content.ProductContent.getDefaultInstance() : productData_;
-        } else {
-          return productDataBuilder_.getMessage();
-        }
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder setProductData(io.bloombox.schema.content.ProductContent value) {
-        if (productDataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          productData_ = value;
-          onChanged();
-        } else {
-          productDataBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder setProductData(
-          io.bloombox.schema.content.ProductContent.Builder builderForValue) {
-        if (productDataBuilder_ == null) {
-          productData_ = builderForValue.build();
-          onChanged();
-        } else {
-          productDataBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder mergeProductData(io.bloombox.schema.content.ProductContent value) {
-        if (productDataBuilder_ == null) {
-          if (productData_ != null) {
-            productData_ =
-              io.bloombox.schema.content.ProductContent.newBuilder(productData_).mergeFrom(value).buildPartial();
-          } else {
-            productData_ = value;
-          }
-          onChanged();
-        } else {
-          productDataBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder clearProductData() {
-        if (productDataBuilder_ == null) {
-          productData_ = null;
-          onChanged();
-        } else {
-          productData_ = null;
-          productDataBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public io.bloombox.schema.content.ProductContent.Builder getProductDataBuilder() {
-        
-        onChanged();
-        return getProductDataFieldBuilder().getBuilder();
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public io.bloombox.schema.content.ProductContentOrBuilder getProductDataOrBuilder() {
-        if (productDataBuilder_ != null) {
-          return productDataBuilder_.getMessageOrBuilder();
-        } else {
-          return productData_ == null ?
-              io.bloombox.schema.content.ProductContent.getDefaultInstance() : productData_;
-        }
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.ProductContent, io.bloombox.schema.content.ProductContent.Builder, io.bloombox.schema.content.ProductContentOrBuilder> 
-          getProductDataFieldBuilder() {
-        if (productDataBuilder_ == null) {
-          productDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.content.ProductContent, io.bloombox.schema.content.ProductContent.Builder, io.bloombox.schema.content.ProductContentOrBuilder>(
-                  getProductData(),
-                  getParentForChildren(),
-                  isClean());
-          productData_ = null;
-        }
-        return productDataBuilder_;
-      }
-
-      private io.bloombox.schema.content.MaterialsData materialData_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.MaterialsData, io.bloombox.schema.content.MaterialsData.Builder, io.bloombox.schema.content.MaterialsDataOrBuilder> materialDataBuilder_;
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public boolean hasMaterialData() {
-        return materialDataBuilder_ != null || materialData_ != null;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public io.bloombox.schema.content.MaterialsData getMaterialData() {
-        if (materialDataBuilder_ == null) {
-          return materialData_ == null ? io.bloombox.schema.content.MaterialsData.getDefaultInstance() : materialData_;
-        } else {
-          return materialDataBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder setMaterialData(io.bloombox.schema.content.MaterialsData value) {
-        if (materialDataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          materialData_ = value;
-          onChanged();
-        } else {
-          materialDataBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder setMaterialData(
-          io.bloombox.schema.content.MaterialsData.Builder builderForValue) {
-        if (materialDataBuilder_ == null) {
-          materialData_ = builderForValue.build();
-          onChanged();
-        } else {
-          materialDataBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder mergeMaterialData(io.bloombox.schema.content.MaterialsData value) {
-        if (materialDataBuilder_ == null) {
-          if (materialData_ != null) {
-            materialData_ =
-              io.bloombox.schema.content.MaterialsData.newBuilder(materialData_).mergeFrom(value).buildPartial();
-          } else {
-            materialData_ = value;
-          }
-          onChanged();
-        } else {
-          materialDataBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder clearMaterialData() {
-        if (materialDataBuilder_ == null) {
-          materialData_ = null;
-          onChanged();
-        } else {
-          materialData_ = null;
-          materialDataBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public io.bloombox.schema.content.MaterialsData.Builder getMaterialDataBuilder() {
-        
-        onChanged();
-        return getMaterialDataFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public io.bloombox.schema.content.MaterialsDataOrBuilder getMaterialDataOrBuilder() {
-        if (materialDataBuilder_ != null) {
-          return materialDataBuilder_.getMessageOrBuilder();
-        } else {
-          return materialData_ == null ?
-              io.bloombox.schema.content.MaterialsData.getDefaultInstance() : materialData_;
-        }
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.MaterialsData, io.bloombox.schema.content.MaterialsData.Builder, io.bloombox.schema.content.MaterialsDataOrBuilder> 
-          getMaterialDataFieldBuilder() {
-        if (materialDataBuilder_ == null) {
-          materialDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.content.MaterialsData, io.bloombox.schema.content.MaterialsData.Builder, io.bloombox.schema.content.MaterialsDataOrBuilder>(
-                  getMaterialData(),
-                  getParentForChildren(),
-                  isClean());
-          materialData_ = null;
-        }
-        return materialDataBuilder_;
-      }
-
-      private io.bloombox.schema.product.struct.FlagsDescriptor flags_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.FlagsDescriptor, io.bloombox.schema.product.struct.FlagsDescriptor.Builder, io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder> flagsBuilder_;
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public boolean hasFlags() {
-        return flagsBuilder_ != null || flags_ != null;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public io.bloombox.schema.product.struct.FlagsDescriptor getFlags() {
-        if (flagsBuilder_ == null) {
-          return flags_ == null ? io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance() : flags_;
-        } else {
-          return flagsBuilder_.getMessage();
-        }
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder setFlags(io.bloombox.schema.product.struct.FlagsDescriptor value) {
-        if (flagsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          flags_ = value;
-          onChanged();
-        } else {
-          flagsBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder setFlags(
-          io.bloombox.schema.product.struct.FlagsDescriptor.Builder builderForValue) {
-        if (flagsBuilder_ == null) {
-          flags_ = builderForValue.build();
-          onChanged();
-        } else {
-          flagsBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder mergeFlags(io.bloombox.schema.product.struct.FlagsDescriptor value) {
-        if (flagsBuilder_ == null) {
-          if (flags_ != null) {
-            flags_ =
-              io.bloombox.schema.product.struct.FlagsDescriptor.newBuilder(flags_).mergeFrom(value).buildPartial();
-          } else {
-            flags_ = value;
-          }
-          onChanged();
-        } else {
-          flagsBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder clearFlags() {
-        if (flagsBuilder_ == null) {
-          flags_ = null;
-          onChanged();
-        } else {
-          flags_ = null;
-          flagsBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public io.bloombox.schema.product.struct.FlagsDescriptor.Builder getFlagsBuilder() {
-        
-        onChanged();
-        return getFlagsFieldBuilder().getBuilder();
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder getFlagsOrBuilder() {
-        if (flagsBuilder_ != null) {
-          return flagsBuilder_.getMessageOrBuilder();
-        } else {
-          return flags_ == null ?
-              io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance() : flags_;
-        }
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.FlagsDescriptor, io.bloombox.schema.product.struct.FlagsDescriptor.Builder, io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder> 
-          getFlagsFieldBuilder() {
-        if (flagsBuilder_ == null) {
-          flagsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.product.struct.FlagsDescriptor, io.bloombox.schema.product.struct.FlagsDescriptor.Builder, io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder>(
-                  getFlags(),
-                  getParentForChildren(),
-                  isClean());
-          flags_ = null;
-        }
-        return flagsBuilder_;
-      }
-
-      private io.bloombox.schema.product.struct.ProductPricing pricing_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.ProductPricing, io.bloombox.schema.product.struct.ProductPricing.Builder, io.bloombox.schema.product.struct.ProductPricingOrBuilder> pricingBuilder_;
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public boolean hasPricing() {
-        return pricingBuilder_ != null || pricing_ != null;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public io.bloombox.schema.product.struct.ProductPricing getPricing() {
-        if (pricingBuilder_ == null) {
-          return pricing_ == null ? io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance() : pricing_;
-        } else {
-          return pricingBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder setPricing(io.bloombox.schema.product.struct.ProductPricing value) {
-        if (pricingBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pricing_ = value;
-          onChanged();
-        } else {
-          pricingBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder setPricing(
-          io.bloombox.schema.product.struct.ProductPricing.Builder builderForValue) {
-        if (pricingBuilder_ == null) {
-          pricing_ = builderForValue.build();
-          onChanged();
-        } else {
-          pricingBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder mergePricing(io.bloombox.schema.product.struct.ProductPricing value) {
-        if (pricingBuilder_ == null) {
-          if (pricing_ != null) {
-            pricing_ =
-              io.bloombox.schema.product.struct.ProductPricing.newBuilder(pricing_).mergeFrom(value).buildPartial();
-          } else {
-            pricing_ = value;
-          }
-          onChanged();
-        } else {
-          pricingBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder clearPricing() {
-        if (pricingBuilder_ == null) {
-          pricing_ = null;
-          onChanged();
-        } else {
-          pricing_ = null;
-          pricingBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public io.bloombox.schema.product.struct.ProductPricing.Builder getPricingBuilder() {
-        
-        onChanged();
-        return getPricingFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public io.bloombox.schema.product.struct.ProductPricingOrBuilder getPricingOrBuilder() {
-        if (pricingBuilder_ != null) {
-          return pricingBuilder_.getMessageOrBuilder();
-        } else {
-          return pricing_ == null ?
-              io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance() : pricing_;
-        }
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.ProductPricing, io.bloombox.schema.product.struct.ProductPricing.Builder, io.bloombox.schema.product.struct.ProductPricingOrBuilder> 
-          getPricingFieldBuilder() {
-        if (pricingBuilder_ == null) {
-          pricingBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.product.struct.ProductPricing, io.bloombox.schema.product.struct.ProductPricing.Builder, io.bloombox.schema.product.struct.ProductPricingOrBuilder>(
-                  getPricing(),
-                  getParentForChildren(),
-                  isClean());
-          pricing_ = null;
-        }
-        return pricingBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:Flower)
-    }
-
-    // @@protoc_insertion_point(class_scope:Flower)
-    private static final io.bloombox.schema.product.FlowerOuterClass.Flower DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new io.bloombox.schema.product.FlowerOuterClass.Flower();
-    }
-
-    public static io.bloombox.schema.product.FlowerOuterClass.Flower getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<Flower>
-        PARSER = new com.google.protobuf.AbstractParser<Flower>() {
-      public Flower parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Flower(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser<Flower> parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Flower> getParserForType() {
-      return PARSER;
-    }
-
-    public io.bloombox.schema.product.FlowerOuterClass.Flower getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Flower_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Flower_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025products/Flower.proto\032\025base/ProductKey" +
-      ".proto\032\033content/MaterialsData.proto\032\034con" +
-      "tent/ProductContent.proto\032\035structs/Flags" +
-      "Descriptor.proto\032\'structs/pricing/Pricin" +
-      "gDescriptor.proto\"\263\001\n\006Flower\022\030\n\003key\030\001 \001(" +
-      "\0132\013.ProductKey\022%\n\014product_data\030\024 \001(\0132\017.P" +
-      "roductContent\022%\n\rmaterial_data\030\025 \001(\0132\016.M" +
-      "aterialsData\022\037\n\005flags\030\026 \001(\0132\020.FlagsDescr" +
-      "iptor\022 \n\007pricing\030\027 \001(\0132\017.ProductPricingB" +
-      "\036\n\032io.bloombox.schema.productP\000b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.ProductKeyOuterClass.getDescriptor(),
-          io.bloombox.schema.content.MaterialsDataOuterClass.getDescriptor(),
-          io.bloombox.schema.content.ProductContentOuterClass.getDescriptor(),
-          io.bloombox.schema.product.struct.FlagsDescriptorOuterClass.getDescriptor(),
-          io.bloombox.schema.product.struct.PricingDescriptorOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_Flower_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Flower_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Flower_descriptor,
-        new java.lang.String[] { "Key", "ProductData", "MaterialData", "Flags", "Pricing", });
-    io.bloombox.schema.base.ProductKeyOuterClass.getDescriptor();
-    io.bloombox.schema.content.MaterialsDataOuterClass.getDescriptor();
-    io.bloombox.schema.content.ProductContentOuterClass.getDescriptor();
-    io.bloombox.schema.product.struct.FlagsDescriptorOuterClass.getDescriptor();
-    io.bloombox.schema.product.struct.PricingDescriptorOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/FlowerProduct.java b/languages/java/io/bloombox/schema/product/FlowerProduct.java
deleted file mode 100644
index 6dd7c1d..0000000
--- a/languages/java/io/bloombox/schema/product/FlowerProduct.java
+++ /dev/null
@@ -1,1609 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-
-package io.bloombox.schema.product;
-
-public final class FlowerProduct {
-  private FlowerProduct() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  public interface FlowerOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:Flower)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    boolean hasKey();
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    io.bloombox.schema.base.ProductKey getKey();
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder();
-
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    boolean hasProductData();
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    io.bloombox.schema.content.ProductContent getProductData();
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    io.bloombox.schema.content.ProductContentOrBuilder getProductDataOrBuilder();
-
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    boolean hasMaterialData();
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    io.bloombox.schema.content.MaterialsData getMaterialData();
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    io.bloombox.schema.content.MaterialsDataOrBuilder getMaterialDataOrBuilder();
-
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    boolean hasFlags();
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    io.bloombox.schema.product.struct.FlagsDescriptor getFlags();
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder getFlagsOrBuilder();
-
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    boolean hasPricing();
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    io.bloombox.schema.product.struct.ProductPricing getPricing();
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    io.bloombox.schema.product.struct.ProductPricingOrBuilder getPricingOrBuilder();
-  }
-  /**
-   * Protobuf type {@code Flower}
-   */
-  public  static final class Flower extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:Flower)
-      FlowerOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Flower.newBuilder() to construct.
-    private Flower(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
-    private Flower() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Flower(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              io.bloombox.schema.base.ProductKey.Builder subBuilder = null;
-              if (key_ != null) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(io.bloombox.schema.base.ProductKey.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 162: {
-              io.bloombox.schema.content.ProductContent.Builder subBuilder = null;
-              if (productData_ != null) {
-                subBuilder = productData_.toBuilder();
-              }
-              productData_ = input.readMessage(io.bloombox.schema.content.ProductContent.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(productData_);
-                productData_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 170: {
-              io.bloombox.schema.content.MaterialsData.Builder subBuilder = null;
-              if (materialData_ != null) {
-                subBuilder = materialData_.toBuilder();
-              }
-              materialData_ = input.readMessage(io.bloombox.schema.content.MaterialsData.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(materialData_);
-                materialData_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 178: {
-              io.bloombox.schema.product.struct.FlagsDescriptor.Builder subBuilder = null;
-              if (flags_ != null) {
-                subBuilder = flags_.toBuilder();
-              }
-              flags_ = input.readMessage(io.bloombox.schema.product.struct.FlagsDescriptor.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(flags_);
-                flags_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 186: {
-              io.bloombox.schema.product.struct.ProductPricing.Builder subBuilder = null;
-              if (pricing_ != null) {
-                subBuilder = pricing_.toBuilder();
-              }
-              pricing_ = input.readMessage(io.bloombox.schema.product.struct.ProductPricing.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pricing_);
-                pricing_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.FlowerProduct.internal_static_Flower_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.FlowerProduct.internal_static_Flower_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.FlowerProduct.Flower.class, io.bloombox.schema.product.FlowerProduct.Flower.Builder.class);
-    }
-
-    public static final int KEY_FIELD_NUMBER = 1;
-    private io.bloombox.schema.base.ProductKey key_;
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    public boolean hasKey() {
-      return key_ != null;
-    }
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKey getKey() {
-      return key_ == null ? io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-    }
-    /**
-     * <pre>
-     * -- Object Key
-     * </pre>
-     *
-     * <code>.ProductKey key = 1;</code>
-     */
-    public io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder() {
-      return getKey();
-    }
-
-    public static final int PRODUCT_DATA_FIELD_NUMBER = 20;
-    private io.bloombox.schema.content.ProductContent productData_;
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    public boolean hasProductData() {
-      return productData_ != null;
-    }
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    public io.bloombox.schema.content.ProductContent getProductData() {
-      return productData_ == null ? io.bloombox.schema.content.ProductContent.getDefaultInstance() : productData_;
-    }
-    /**
-     * <pre>
-     * -- Basic Product &amp; Materials Data
-     * </pre>
-     *
-     * <code>.ProductContent product_data = 20;</code>
-     */
-    public io.bloombox.schema.content.ProductContentOrBuilder getProductDataOrBuilder() {
-      return getProductData();
-    }
-
-    public static final int MATERIAL_DATA_FIELD_NUMBER = 21;
-    private io.bloombox.schema.content.MaterialsData materialData_;
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    public boolean hasMaterialData() {
-      return materialData_ != null;
-    }
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    public io.bloombox.schema.content.MaterialsData getMaterialData() {
-      return materialData_ == null ? io.bloombox.schema.content.MaterialsData.getDefaultInstance() : materialData_;
-    }
-    /**
-     * <code>.MaterialsData material_data = 21;</code>
-     */
-    public io.bloombox.schema.content.MaterialsDataOrBuilder getMaterialDataOrBuilder() {
-      return getMaterialData();
-    }
-
-    public static final int FLAGS_FIELD_NUMBER = 22;
-    private io.bloombox.schema.product.struct.FlagsDescriptor flags_;
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    public boolean hasFlags() {
-      return flags_ != null;
-    }
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FlagsDescriptor getFlags() {
-      return flags_ == null ? io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance() : flags_;
-    }
-    /**
-     * <pre>
-     * -- Flags and Pricing
-     * </pre>
-     *
-     * <code>.FlagsDescriptor flags = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder getFlagsOrBuilder() {
-      return getFlags();
-    }
-
-    public static final int PRICING_FIELD_NUMBER = 23;
-    private io.bloombox.schema.product.struct.ProductPricing pricing_;
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    public boolean hasPricing() {
-      return pricing_ != null;
-    }
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductPricing getPricing() {
-      return pricing_ == null ? io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance() : pricing_;
-    }
-    /**
-     * <code>.ProductPricing pricing = 23;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductPricingOrBuilder getPricingOrBuilder() {
-      return getPricing();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (key_ != null) {
-        output.writeMessage(1, getKey());
-      }
-      if (productData_ != null) {
-        output.writeMessage(20, getProductData());
-      }
-      if (materialData_ != null) {
-        output.writeMessage(21, getMaterialData());
-      }
-      if (flags_ != null) {
-        output.writeMessage(22, getFlags());
-      }
-      if (pricing_ != null) {
-        output.writeMessage(23, getPricing());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (key_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getKey());
-      }
-      if (productData_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(20, getProductData());
-      }
-      if (materialData_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(21, getMaterialData());
-      }
-      if (flags_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(22, getFlags());
-      }
-      if (pricing_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(23, getPricing());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof io.bloombox.schema.product.FlowerProduct.Flower)) {
-        return super.equals(obj);
-      }
-      io.bloombox.schema.product.FlowerProduct.Flower other = (io.bloombox.schema.product.FlowerProduct.Flower) obj;
-
-      boolean result = true;
-      result = result && (hasKey() == other.hasKey());
-      if (hasKey()) {
-        result = result && getKey()
-            .equals(other.getKey());
-      }
-      result = result && (hasProductData() == other.hasProductData());
-      if (hasProductData()) {
-        result = result && getProductData()
-            .equals(other.getProductData());
-      }
-      result = result && (hasMaterialData() == other.hasMaterialData());
-      if (hasMaterialData()) {
-        result = result && getMaterialData()
-            .equals(other.getMaterialData());
-      }
-      result = result && (hasFlags() == other.hasFlags());
-      if (hasFlags()) {
-        result = result && getFlags()
-            .equals(other.getFlags());
-      }
-      result = result && (hasPricing() == other.hasPricing());
-      if (hasPricing()) {
-        result = result && getPricing()
-            .equals(other.getPricing());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasKey()) {
-        hash = (37 * hash) + KEY_FIELD_NUMBER;
-        hash = (53 * hash) + getKey().hashCode();
-      }
-      if (hasProductData()) {
-        hash = (37 * hash) + PRODUCT_DATA_FIELD_NUMBER;
-        hash = (53 * hash) + getProductData().hashCode();
-      }
-      if (hasMaterialData()) {
-        hash = (37 * hash) + MATERIAL_DATA_FIELD_NUMBER;
-        hash = (53 * hash) + getMaterialData().hashCode();
-      }
-      if (hasFlags()) {
-        hash = (37 * hash) + FLAGS_FIELD_NUMBER;
-        hash = (53 * hash) + getFlags().hashCode();
-      }
-      if (hasPricing()) {
-        hash = (37 * hash) + PRICING_FIELD_NUMBER;
-        hash = (53 * hash) + getPricing().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static io.bloombox.schema.product.FlowerProduct.Flower parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(io.bloombox.schema.product.FlowerProduct.Flower prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code Flower}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:Flower)
-        io.bloombox.schema.product.FlowerProduct.FlowerOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return io.bloombox.schema.product.FlowerProduct.internal_static_Flower_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return io.bloombox.schema.product.FlowerProduct.internal_static_Flower_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                io.bloombox.schema.product.FlowerProduct.Flower.class, io.bloombox.schema.product.FlowerProduct.Flower.Builder.class);
-      }
-
-      // Construct using io.bloombox.schema.product.FlowerProduct.Flower.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (keyBuilder_ == null) {
-          key_ = null;
-        } else {
-          key_ = null;
-          keyBuilder_ = null;
-        }
-        if (productDataBuilder_ == null) {
-          productData_ = null;
-        } else {
-          productData_ = null;
-          productDataBuilder_ = null;
-        }
-        if (materialDataBuilder_ == null) {
-          materialData_ = null;
-        } else {
-          materialData_ = null;
-          materialDataBuilder_ = null;
-        }
-        if (flagsBuilder_ == null) {
-          flags_ = null;
-        } else {
-          flags_ = null;
-          flagsBuilder_ = null;
-        }
-        if (pricingBuilder_ == null) {
-          pricing_ = null;
-        } else {
-          pricing_ = null;
-          pricingBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return io.bloombox.schema.product.FlowerProduct.internal_static_Flower_descriptor;
-      }
-
-      public io.bloombox.schema.product.FlowerProduct.Flower getDefaultInstanceForType() {
-        return io.bloombox.schema.product.FlowerProduct.Flower.getDefaultInstance();
-      }
-
-      public io.bloombox.schema.product.FlowerProduct.Flower build() {
-        io.bloombox.schema.product.FlowerProduct.Flower result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public io.bloombox.schema.product.FlowerProduct.Flower buildPartial() {
-        io.bloombox.schema.product.FlowerProduct.Flower result = new io.bloombox.schema.product.FlowerProduct.Flower(this);
-        if (keyBuilder_ == null) {
-          result.key_ = key_;
-        } else {
-          result.key_ = keyBuilder_.build();
-        }
-        if (productDataBuilder_ == null) {
-          result.productData_ = productData_;
-        } else {
-          result.productData_ = productDataBuilder_.build();
-        }
-        if (materialDataBuilder_ == null) {
-          result.materialData_ = materialData_;
-        } else {
-          result.materialData_ = materialDataBuilder_.build();
-        }
-        if (flagsBuilder_ == null) {
-          result.flags_ = flags_;
-        } else {
-          result.flags_ = flagsBuilder_.build();
-        }
-        if (pricingBuilder_ == null) {
-          result.pricing_ = pricing_;
-        } else {
-          result.pricing_ = pricingBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.bloombox.schema.product.FlowerProduct.Flower) {
-          return mergeFrom((io.bloombox.schema.product.FlowerProduct.Flower)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(io.bloombox.schema.product.FlowerProduct.Flower other) {
-        if (other == io.bloombox.schema.product.FlowerProduct.Flower.getDefaultInstance()) return this;
-        if (other.hasKey()) {
-          mergeKey(other.getKey());
-        }
-        if (other.hasProductData()) {
-          mergeProductData(other.getProductData());
-        }
-        if (other.hasMaterialData()) {
-          mergeMaterialData(other.getMaterialData());
-        }
-        if (other.hasFlags()) {
-          mergeFlags(other.getFlags());
-        }
-        if (other.hasPricing()) {
-          mergePricing(other.getPricing());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        io.bloombox.schema.product.FlowerProduct.Flower parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (io.bloombox.schema.product.FlowerProduct.Flower) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private io.bloombox.schema.base.ProductKey key_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder> keyBuilder_;
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public boolean hasKey() {
-        return keyBuilder_ != null || key_ != null;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public io.bloombox.schema.base.ProductKey getKey() {
-        if (keyBuilder_ == null) {
-          return key_ == null ? io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-        } else {
-          return keyBuilder_.getMessage();
-        }
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder setKey(io.bloombox.schema.base.ProductKey value) {
-        if (keyBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          key_ = value;
-          onChanged();
-        } else {
-          keyBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder setKey(
-          io.bloombox.schema.base.ProductKey.Builder builderForValue) {
-        if (keyBuilder_ == null) {
-          key_ = builderForValue.build();
-          onChanged();
-        } else {
-          keyBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder mergeKey(io.bloombox.schema.base.ProductKey value) {
-        if (keyBuilder_ == null) {
-          if (key_ != null) {
-            key_ =
-              io.bloombox.schema.base.ProductKey.newBuilder(key_).mergeFrom(value).buildPartial();
-          } else {
-            key_ = value;
-          }
-          onChanged();
-        } else {
-          keyBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public Builder clearKey() {
-        if (keyBuilder_ == null) {
-          key_ = null;
-          onChanged();
-        } else {
-          key_ = null;
-          keyBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public io.bloombox.schema.base.ProductKey.Builder getKeyBuilder() {
-        
-        onChanged();
-        return getKeyFieldBuilder().getBuilder();
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      public io.bloombox.schema.base.ProductKeyOrBuilder getKeyOrBuilder() {
-        if (keyBuilder_ != null) {
-          return keyBuilder_.getMessageOrBuilder();
-        } else {
-          return key_ == null ?
-              io.bloombox.schema.base.ProductKey.getDefaultInstance() : key_;
-        }
-      }
-      /**
-       * <pre>
-       * -- Object Key
-       * </pre>
-       *
-       * <code>.ProductKey key = 1;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder> 
-          getKeyFieldBuilder() {
-        if (keyBuilder_ == null) {
-          keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.base.ProductKey, io.bloombox.schema.base.ProductKey.Builder, io.bloombox.schema.base.ProductKeyOrBuilder>(
-                  getKey(),
-                  getParentForChildren(),
-                  isClean());
-          key_ = null;
-        }
-        return keyBuilder_;
-      }
-
-      private io.bloombox.schema.content.ProductContent productData_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.ProductContent, io.bloombox.schema.content.ProductContent.Builder, io.bloombox.schema.content.ProductContentOrBuilder> productDataBuilder_;
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public boolean hasProductData() {
-        return productDataBuilder_ != null || productData_ != null;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public io.bloombox.schema.content.ProductContent getProductData() {
-        if (productDataBuilder_ == null) {
-          return productData_ == null ? io.bloombox.schema.content.ProductContent.getDefaultInstance() : productData_;
-        } else {
-          return productDataBuilder_.getMessage();
-        }
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder setProductData(io.bloombox.schema.content.ProductContent value) {
-        if (productDataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          productData_ = value;
-          onChanged();
-        } else {
-          productDataBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder setProductData(
-          io.bloombox.schema.content.ProductContent.Builder builderForValue) {
-        if (productDataBuilder_ == null) {
-          productData_ = builderForValue.build();
-          onChanged();
-        } else {
-          productDataBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder mergeProductData(io.bloombox.schema.content.ProductContent value) {
-        if (productDataBuilder_ == null) {
-          if (productData_ != null) {
-            productData_ =
-              io.bloombox.schema.content.ProductContent.newBuilder(productData_).mergeFrom(value).buildPartial();
-          } else {
-            productData_ = value;
-          }
-          onChanged();
-        } else {
-          productDataBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public Builder clearProductData() {
-        if (productDataBuilder_ == null) {
-          productData_ = null;
-          onChanged();
-        } else {
-          productData_ = null;
-          productDataBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public io.bloombox.schema.content.ProductContent.Builder getProductDataBuilder() {
-        
-        onChanged();
-        return getProductDataFieldBuilder().getBuilder();
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      public io.bloombox.schema.content.ProductContentOrBuilder getProductDataOrBuilder() {
-        if (productDataBuilder_ != null) {
-          return productDataBuilder_.getMessageOrBuilder();
-        } else {
-          return productData_ == null ?
-              io.bloombox.schema.content.ProductContent.getDefaultInstance() : productData_;
-        }
-      }
-      /**
-       * <pre>
-       * -- Basic Product &amp; Materials Data
-       * </pre>
-       *
-       * <code>.ProductContent product_data = 20;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.ProductContent, io.bloombox.schema.content.ProductContent.Builder, io.bloombox.schema.content.ProductContentOrBuilder> 
-          getProductDataFieldBuilder() {
-        if (productDataBuilder_ == null) {
-          productDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.content.ProductContent, io.bloombox.schema.content.ProductContent.Builder, io.bloombox.schema.content.ProductContentOrBuilder>(
-                  getProductData(),
-                  getParentForChildren(),
-                  isClean());
-          productData_ = null;
-        }
-        return productDataBuilder_;
-      }
-
-      private io.bloombox.schema.content.MaterialsData materialData_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.MaterialsData, io.bloombox.schema.content.MaterialsData.Builder, io.bloombox.schema.content.MaterialsDataOrBuilder> materialDataBuilder_;
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public boolean hasMaterialData() {
-        return materialDataBuilder_ != null || materialData_ != null;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public io.bloombox.schema.content.MaterialsData getMaterialData() {
-        if (materialDataBuilder_ == null) {
-          return materialData_ == null ? io.bloombox.schema.content.MaterialsData.getDefaultInstance() : materialData_;
-        } else {
-          return materialDataBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder setMaterialData(io.bloombox.schema.content.MaterialsData value) {
-        if (materialDataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          materialData_ = value;
-          onChanged();
-        } else {
-          materialDataBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder setMaterialData(
-          io.bloombox.schema.content.MaterialsData.Builder builderForValue) {
-        if (materialDataBuilder_ == null) {
-          materialData_ = builderForValue.build();
-          onChanged();
-        } else {
-          materialDataBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder mergeMaterialData(io.bloombox.schema.content.MaterialsData value) {
-        if (materialDataBuilder_ == null) {
-          if (materialData_ != null) {
-            materialData_ =
-              io.bloombox.schema.content.MaterialsData.newBuilder(materialData_).mergeFrom(value).buildPartial();
-          } else {
-            materialData_ = value;
-          }
-          onChanged();
-        } else {
-          materialDataBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public Builder clearMaterialData() {
-        if (materialDataBuilder_ == null) {
-          materialData_ = null;
-          onChanged();
-        } else {
-          materialData_ = null;
-          materialDataBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public io.bloombox.schema.content.MaterialsData.Builder getMaterialDataBuilder() {
-        
-        onChanged();
-        return getMaterialDataFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      public io.bloombox.schema.content.MaterialsDataOrBuilder getMaterialDataOrBuilder() {
-        if (materialDataBuilder_ != null) {
-          return materialDataBuilder_.getMessageOrBuilder();
-        } else {
-          return materialData_ == null ?
-              io.bloombox.schema.content.MaterialsData.getDefaultInstance() : materialData_;
-        }
-      }
-      /**
-       * <code>.MaterialsData material_data = 21;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.content.MaterialsData, io.bloombox.schema.content.MaterialsData.Builder, io.bloombox.schema.content.MaterialsDataOrBuilder> 
-          getMaterialDataFieldBuilder() {
-        if (materialDataBuilder_ == null) {
-          materialDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.content.MaterialsData, io.bloombox.schema.content.MaterialsData.Builder, io.bloombox.schema.content.MaterialsDataOrBuilder>(
-                  getMaterialData(),
-                  getParentForChildren(),
-                  isClean());
-          materialData_ = null;
-        }
-        return materialDataBuilder_;
-      }
-
-      private io.bloombox.schema.product.struct.FlagsDescriptor flags_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.FlagsDescriptor, io.bloombox.schema.product.struct.FlagsDescriptor.Builder, io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder> flagsBuilder_;
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public boolean hasFlags() {
-        return flagsBuilder_ != null || flags_ != null;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public io.bloombox.schema.product.struct.FlagsDescriptor getFlags() {
-        if (flagsBuilder_ == null) {
-          return flags_ == null ? io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance() : flags_;
-        } else {
-          return flagsBuilder_.getMessage();
-        }
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder setFlags(io.bloombox.schema.product.struct.FlagsDescriptor value) {
-        if (flagsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          flags_ = value;
-          onChanged();
-        } else {
-          flagsBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder setFlags(
-          io.bloombox.schema.product.struct.FlagsDescriptor.Builder builderForValue) {
-        if (flagsBuilder_ == null) {
-          flags_ = builderForValue.build();
-          onChanged();
-        } else {
-          flagsBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder mergeFlags(io.bloombox.schema.product.struct.FlagsDescriptor value) {
-        if (flagsBuilder_ == null) {
-          if (flags_ != null) {
-            flags_ =
-              io.bloombox.schema.product.struct.FlagsDescriptor.newBuilder(flags_).mergeFrom(value).buildPartial();
-          } else {
-            flags_ = value;
-          }
-          onChanged();
-        } else {
-          flagsBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public Builder clearFlags() {
-        if (flagsBuilder_ == null) {
-          flags_ = null;
-          onChanged();
-        } else {
-          flags_ = null;
-          flagsBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public io.bloombox.schema.product.struct.FlagsDescriptor.Builder getFlagsBuilder() {
-        
-        onChanged();
-        return getFlagsFieldBuilder().getBuilder();
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      public io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder getFlagsOrBuilder() {
-        if (flagsBuilder_ != null) {
-          return flagsBuilder_.getMessageOrBuilder();
-        } else {
-          return flags_ == null ?
-              io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance() : flags_;
-        }
-      }
-      /**
-       * <pre>
-       * -- Flags and Pricing
-       * </pre>
-       *
-       * <code>.FlagsDescriptor flags = 22;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.FlagsDescriptor, io.bloombox.schema.product.struct.FlagsDescriptor.Builder, io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder> 
-          getFlagsFieldBuilder() {
-        if (flagsBuilder_ == null) {
-          flagsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.product.struct.FlagsDescriptor, io.bloombox.schema.product.struct.FlagsDescriptor.Builder, io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder>(
-                  getFlags(),
-                  getParentForChildren(),
-                  isClean());
-          flags_ = null;
-        }
-        return flagsBuilder_;
-      }
-
-      private io.bloombox.schema.product.struct.ProductPricing pricing_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.ProductPricing, io.bloombox.schema.product.struct.ProductPricing.Builder, io.bloombox.schema.product.struct.ProductPricingOrBuilder> pricingBuilder_;
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public boolean hasPricing() {
-        return pricingBuilder_ != null || pricing_ != null;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public io.bloombox.schema.product.struct.ProductPricing getPricing() {
-        if (pricingBuilder_ == null) {
-          return pricing_ == null ? io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance() : pricing_;
-        } else {
-          return pricingBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder setPricing(io.bloombox.schema.product.struct.ProductPricing value) {
-        if (pricingBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pricing_ = value;
-          onChanged();
-        } else {
-          pricingBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder setPricing(
-          io.bloombox.schema.product.struct.ProductPricing.Builder builderForValue) {
-        if (pricingBuilder_ == null) {
-          pricing_ = builderForValue.build();
-          onChanged();
-        } else {
-          pricingBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder mergePricing(io.bloombox.schema.product.struct.ProductPricing value) {
-        if (pricingBuilder_ == null) {
-          if (pricing_ != null) {
-            pricing_ =
-              io.bloombox.schema.product.struct.ProductPricing.newBuilder(pricing_).mergeFrom(value).buildPartial();
-          } else {
-            pricing_ = value;
-          }
-          onChanged();
-        } else {
-          pricingBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public Builder clearPricing() {
-        if (pricingBuilder_ == null) {
-          pricing_ = null;
-          onChanged();
-        } else {
-          pricing_ = null;
-          pricingBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public io.bloombox.schema.product.struct.ProductPricing.Builder getPricingBuilder() {
-        
-        onChanged();
-        return getPricingFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      public io.bloombox.schema.product.struct.ProductPricingOrBuilder getPricingOrBuilder() {
-        if (pricingBuilder_ != null) {
-          return pricingBuilder_.getMessageOrBuilder();
-        } else {
-          return pricing_ == null ?
-              io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance() : pricing_;
-        }
-      }
-      /**
-       * <code>.ProductPricing pricing = 23;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          io.bloombox.schema.product.struct.ProductPricing, io.bloombox.schema.product.struct.ProductPricing.Builder, io.bloombox.schema.product.struct.ProductPricingOrBuilder> 
-          getPricingFieldBuilder() {
-        if (pricingBuilder_ == null) {
-          pricingBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              io.bloombox.schema.product.struct.ProductPricing, io.bloombox.schema.product.struct.ProductPricing.Builder, io.bloombox.schema.product.struct.ProductPricingOrBuilder>(
-                  getPricing(),
-                  getParentForChildren(),
-                  isClean());
-          pricing_ = null;
-        }
-        return pricingBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:Flower)
-    }
-
-    // @@protoc_insertion_point(class_scope:Flower)
-    private static final io.bloombox.schema.product.FlowerProduct.Flower DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new io.bloombox.schema.product.FlowerProduct.Flower();
-    }
-
-    public static io.bloombox.schema.product.FlowerProduct.Flower getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<Flower>
-        PARSER = new com.google.protobuf.AbstractParser<Flower>() {
-      public Flower parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Flower(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser<Flower> parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Flower> getParserForType() {
-      return PARSER;
-    }
-
-    public io.bloombox.schema.product.FlowerProduct.Flower getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Flower_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Flower_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025products/Flower.proto\032\025base/ProductKey" +
-      ".proto\032\033content/MaterialsData.proto\032\034con" +
-      "tent/ProductContent.proto\032\035structs/Flags" +
-      "Descriptor.proto\032\'structs/pricing/Pricin" +
-      "gDescriptor.proto\"\263\001\n\006Flower\022\030\n\003key\030\001 \001(" +
-      "\0132\013.ProductKey\022%\n\014product_data\030\024 \001(\0132\017.P" +
-      "roductContent\022%\n\rmaterial_data\030\025 \001(\0132\016.M" +
-      "aterialsData\022\037\n\005flags\030\026 \001(\0132\020.FlagsDescr" +
-      "iptor\022 \n\007pricing\030\027 \001(\0132\017.ProductPricingB" +
-      "2\n\032io.bloombox.schema.productB\rFlowerPro",
-      "ductH\001P\000\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.base.BaseProductKey.getDescriptor(),
-          io.bloombox.schema.content.MaterialsContent.getDescriptor(),
-          io.bloombox.schema.content.AttachedContent.getDescriptor(),
-          io.bloombox.schema.product.struct.BaseStructs.getDescriptor(),
-          io.bloombox.schema.product.struct.ProductPricingSpec.getDescriptor(),
-        }, assigner);
-    internal_static_Flower_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Flower_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Flower_descriptor,
-        new java.lang.String[] { "Key", "ProductData", "MaterialData", "Flags", "Pricing", });
-    io.bloombox.schema.base.BaseProductKey.getDescriptor();
-    io.bloombox.schema.content.MaterialsContent.getDescriptor();
-    io.bloombox.schema.content.AttachedContent.getDescriptor();
-    io.bloombox.schema.product.struct.BaseStructs.getDescriptor();
-    io.bloombox.schema.product.struct.ProductPricingSpec.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/BaseStructs.java b/languages/java/io/bloombox/schema/product/struct/BaseStructs.java
deleted file mode 100644
index d972cbc..0000000
--- a/languages/java/io/bloombox/schema/product/struct/BaseStructs.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class BaseStructs {
-  private BaseStructs() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductFlagValue_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductFlagValue_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductFlagset_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductFlagset_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_FlagsDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_FlagsDescriptor_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\035structs/FlagsDescriptor.proto\"=\n\020Produ" +
-      "ctFlagValue\022\032\n\004type\030\001 \001(\0162\014.ProductFlag\022" +
-      "\r\n\005value\030\002 \001(\010\"2\n\016ProductFlagset\022 \n\005flag" +
-      "s\030\001 \003(\0132\021.ProductFlagValue\"j\n\017FlagsDescr" +
-      "iptor\022\017\n\007visible\030\001 \001(\010\022\017\n\007premium\030\002 \001(\010\022" +
-      "\020\n\010featured\030\003 \001(\010\022\022\n\nlastchance\030\004 \001(\010\022\017\n" +
-      "\007inhouse\030\005 \001(\010*R\n\013ProductFlag\022\013\n\007VISIBLE" +
-      "\020\000\022\013\n\007PREMIUM\020\001\022\014\n\010FEATURED\020\002\022\016\n\nLASTCHA" +
-      "NCE\020\003\022\013\n\007INHOUSE\020\004B7\n!io.bloombox.schema" +
-      ".product.structB\013BaseStructsH\001P\001\370\001\001b\006pro",
-      "to3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_ProductFlagValue_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductFlagValue_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductFlagValue_descriptor,
-        new java.lang.String[] { "Type", "Value", });
-    internal_static_ProductFlagset_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_ProductFlagset_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductFlagset_descriptor,
-        new java.lang.String[] { "Flags", });
-    internal_static_FlagsDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_FlagsDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_FlagsDescriptor_descriptor,
-        new java.lang.String[] { "Visible", "Premium", "Featured", "Lastchance", "Inhouse", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/FlagsDescriptor.java b/languages/java/io/bloombox/schema/product/struct/FlagsDescriptor.java
deleted file mode 100644
index 83d34cd..0000000
--- a/languages/java/io/bloombox/schema/product/struct/FlagsDescriptor.java
+++ /dev/null
@@ -1,681 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code FlagsDescriptor}
- */
-public  final class FlagsDescriptor extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:FlagsDescriptor)
-    FlagsDescriptorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use FlagsDescriptor.newBuilder() to construct.
-  private FlagsDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private FlagsDescriptor() {
-    visible_ = false;
-    premium_ = false;
-    featured_ = false;
-    lastchance_ = false;
-    inhouse_ = false;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private FlagsDescriptor(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            visible_ = input.readBool();
-            break;
-          }
-          case 16: {
-
-            premium_ = input.readBool();
-            break;
-          }
-          case 24: {
-
-            featured_ = input.readBool();
-            break;
-          }
-          case 32: {
-
-            lastchance_ = input.readBool();
-            break;
-          }
-          case 40: {
-
-            inhouse_ = input.readBool();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.BaseStructs.internal_static_FlagsDescriptor_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.BaseStructs.internal_static_FlagsDescriptor_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.FlagsDescriptor.class, io.bloombox.schema.product.struct.FlagsDescriptor.Builder.class);
-  }
-
-  public static final int VISIBLE_FIELD_NUMBER = 1;
-  private boolean visible_;
-  /**
-   * <code>bool visible = 1;</code>
-   */
-  public boolean getVisible() {
-    return visible_;
-  }
-
-  public static final int PREMIUM_FIELD_NUMBER = 2;
-  private boolean premium_;
-  /**
-   * <code>bool premium = 2;</code>
-   */
-  public boolean getPremium() {
-    return premium_;
-  }
-
-  public static final int FEATURED_FIELD_NUMBER = 3;
-  private boolean featured_;
-  /**
-   * <code>bool featured = 3;</code>
-   */
-  public boolean getFeatured() {
-    return featured_;
-  }
-
-  public static final int LASTCHANCE_FIELD_NUMBER = 4;
-  private boolean lastchance_;
-  /**
-   * <code>bool lastchance = 4;</code>
-   */
-  public boolean getLastchance() {
-    return lastchance_;
-  }
-
-  public static final int INHOUSE_FIELD_NUMBER = 5;
-  private boolean inhouse_;
-  /**
-   * <code>bool inhouse = 5;</code>
-   */
-  public boolean getInhouse() {
-    return inhouse_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (visible_ != false) {
-      output.writeBool(1, visible_);
-    }
-    if (premium_ != false) {
-      output.writeBool(2, premium_);
-    }
-    if (featured_ != false) {
-      output.writeBool(3, featured_);
-    }
-    if (lastchance_ != false) {
-      output.writeBool(4, lastchance_);
-    }
-    if (inhouse_ != false) {
-      output.writeBool(5, inhouse_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (visible_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(1, visible_);
-    }
-    if (premium_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(2, premium_);
-    }
-    if (featured_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(3, featured_);
-    }
-    if (lastchance_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(4, lastchance_);
-    }
-    if (inhouse_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(5, inhouse_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.FlagsDescriptor)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.FlagsDescriptor other = (io.bloombox.schema.product.struct.FlagsDescriptor) obj;
-
-    boolean result = true;
-    result = result && (getVisible()
-        == other.getVisible());
-    result = result && (getPremium()
-        == other.getPremium());
-    result = result && (getFeatured()
-        == other.getFeatured());
-    result = result && (getLastchance()
-        == other.getLastchance());
-    result = result && (getInhouse()
-        == other.getInhouse());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + VISIBLE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getVisible());
-    hash = (37 * hash) + PREMIUM_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getPremium());
-    hash = (37 * hash) + FEATURED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getFeatured());
-    hash = (37 * hash) + LASTCHANCE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getLastchance());
-    hash = (37 * hash) + INHOUSE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getInhouse());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.FlagsDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.FlagsDescriptor prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code FlagsDescriptor}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:FlagsDescriptor)
-      io.bloombox.schema.product.struct.FlagsDescriptorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_FlagsDescriptor_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_FlagsDescriptor_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.FlagsDescriptor.class, io.bloombox.schema.product.struct.FlagsDescriptor.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.FlagsDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      visible_ = false;
-
-      premium_ = false;
-
-      featured_ = false;
-
-      lastchance_ = false;
-
-      inhouse_ = false;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_FlagsDescriptor_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.FlagsDescriptor getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.FlagsDescriptor build() {
-      io.bloombox.schema.product.struct.FlagsDescriptor result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.FlagsDescriptor buildPartial() {
-      io.bloombox.schema.product.struct.FlagsDescriptor result = new io.bloombox.schema.product.struct.FlagsDescriptor(this);
-      result.visible_ = visible_;
-      result.premium_ = premium_;
-      result.featured_ = featured_;
-      result.lastchance_ = lastchance_;
-      result.inhouse_ = inhouse_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.FlagsDescriptor) {
-        return mergeFrom((io.bloombox.schema.product.struct.FlagsDescriptor)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.FlagsDescriptor other) {
-      if (other == io.bloombox.schema.product.struct.FlagsDescriptor.getDefaultInstance()) return this;
-      if (other.getVisible() != false) {
-        setVisible(other.getVisible());
-      }
-      if (other.getPremium() != false) {
-        setPremium(other.getPremium());
-      }
-      if (other.getFeatured() != false) {
-        setFeatured(other.getFeatured());
-      }
-      if (other.getLastchance() != false) {
-        setLastchance(other.getLastchance());
-      }
-      if (other.getInhouse() != false) {
-        setInhouse(other.getInhouse());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.FlagsDescriptor parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.FlagsDescriptor) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private boolean visible_ ;
-    /**
-     * <code>bool visible = 1;</code>
-     */
-    public boolean getVisible() {
-      return visible_;
-    }
-    /**
-     * <code>bool visible = 1;</code>
-     */
-    public Builder setVisible(boolean value) {
-      
-      visible_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool visible = 1;</code>
-     */
-    public Builder clearVisible() {
-      
-      visible_ = false;
-      onChanged();
-      return this;
-    }
-
-    private boolean premium_ ;
-    /**
-     * <code>bool premium = 2;</code>
-     */
-    public boolean getPremium() {
-      return premium_;
-    }
-    /**
-     * <code>bool premium = 2;</code>
-     */
-    public Builder setPremium(boolean value) {
-      
-      premium_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool premium = 2;</code>
-     */
-    public Builder clearPremium() {
-      
-      premium_ = false;
-      onChanged();
-      return this;
-    }
-
-    private boolean featured_ ;
-    /**
-     * <code>bool featured = 3;</code>
-     */
-    public boolean getFeatured() {
-      return featured_;
-    }
-    /**
-     * <code>bool featured = 3;</code>
-     */
-    public Builder setFeatured(boolean value) {
-      
-      featured_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool featured = 3;</code>
-     */
-    public Builder clearFeatured() {
-      
-      featured_ = false;
-      onChanged();
-      return this;
-    }
-
-    private boolean lastchance_ ;
-    /**
-     * <code>bool lastchance = 4;</code>
-     */
-    public boolean getLastchance() {
-      return lastchance_;
-    }
-    /**
-     * <code>bool lastchance = 4;</code>
-     */
-    public Builder setLastchance(boolean value) {
-      
-      lastchance_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool lastchance = 4;</code>
-     */
-    public Builder clearLastchance() {
-      
-      lastchance_ = false;
-      onChanged();
-      return this;
-    }
-
-    private boolean inhouse_ ;
-    /**
-     * <code>bool inhouse = 5;</code>
-     */
-    public boolean getInhouse() {
-      return inhouse_;
-    }
-    /**
-     * <code>bool inhouse = 5;</code>
-     */
-    public Builder setInhouse(boolean value) {
-      
-      inhouse_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool inhouse = 5;</code>
-     */
-    public Builder clearInhouse() {
-      
-      inhouse_ = false;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:FlagsDescriptor)
-  }
-
-  // @@protoc_insertion_point(class_scope:FlagsDescriptor)
-  private static final io.bloombox.schema.product.struct.FlagsDescriptor DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.FlagsDescriptor();
-  }
-
-  public static io.bloombox.schema.product.struct.FlagsDescriptor getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<FlagsDescriptor>
-      PARSER = new com.google.protobuf.AbstractParser<FlagsDescriptor>() {
-    public FlagsDescriptor parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FlagsDescriptor(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<FlagsDescriptor> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<FlagsDescriptor> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.FlagsDescriptor getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/FlagsDescriptorOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/FlagsDescriptorOrBuilder.java
deleted file mode 100644
index e7376d4..0000000
--- a/languages/java/io/bloombox/schema/product/struct/FlagsDescriptorOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface FlagsDescriptorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:FlagsDescriptor)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>bool visible = 1;</code>
-   */
-  boolean getVisible();
-
-  /**
-   * <code>bool premium = 2;</code>
-   */
-  boolean getPremium();
-
-  /**
-   * <code>bool featured = 3;</code>
-   */
-  boolean getFeatured();
-
-  /**
-   * <code>bool lastchance = 4;</code>
-   */
-  boolean getLastchance();
-
-  /**
-   * <code>bool inhouse = 5;</code>
-   */
-  boolean getInhouse();
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/FlagsDescriptorOuterClass.java b/languages/java/io/bloombox/schema/product/struct/FlagsDescriptorOuterClass.java
deleted file mode 100644
index 3d0b1cc..0000000
--- a/languages/java/io/bloombox/schema/product/struct/FlagsDescriptorOuterClass.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class FlagsDescriptorOuterClass {
-  private FlagsDescriptorOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductFlagValue_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductFlagValue_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductFlagset_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductFlagset_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_FlagsDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_FlagsDescriptor_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\035structs/FlagsDescriptor.proto\"=\n\020Produ" +
-      "ctFlagValue\022\032\n\004type\030\001 \001(\0162\014.ProductFlag\022" +
-      "\r\n\005value\030\002 \001(\010\"2\n\016ProductFlagset\022 \n\005flag" +
-      "s\030\001 \003(\0132\021.ProductFlagValue\"j\n\017FlagsDescr" +
-      "iptor\022\017\n\007visible\030\001 \001(\010\022\017\n\007premium\030\002 \001(\010\022" +
-      "\020\n\010featured\030\003 \001(\010\022\022\n\nlastchance\030\004 \001(\010\022\017\n" +
-      "\007inhouse\030\005 \001(\010*R\n\013ProductFlag\022\013\n\007VISIBLE" +
-      "\020\000\022\013\n\007PREMIUM\020\001\022\014\n\010FEATURED\020\002\022\016\n\nLASTCHA" +
-      "NCE\020\003\022\013\n\007INHOUSE\020\004B%\n!io.bloombox.schema" +
-      ".product.structP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_ProductFlagValue_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ProductFlagValue_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductFlagValue_descriptor,
-        new java.lang.String[] { "Type", "Value", });
-    internal_static_ProductFlagset_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_ProductFlagset_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductFlagset_descriptor,
-        new java.lang.String[] { "Flags", });
-    internal_static_FlagsDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_FlagsDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_FlagsDescriptor_descriptor,
-        new java.lang.String[] { "Visible", "Premium", "Featured", "Lastchance", "Inhouse", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/FreebiePricingDescriptor.java b/languages/java/io/bloombox/schema/product/struct/FreebiePricingDescriptor.java
deleted file mode 100644
index 38956c1..0000000
--- a/languages/java/io/bloombox/schema/product/struct/FreebiePricingDescriptor.java
+++ /dev/null
@@ -1,385 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code FreebiePricingDescriptor}
- */
-public  final class FreebiePricingDescriptor extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:FreebiePricingDescriptor)
-    FreebiePricingDescriptorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use FreebiePricingDescriptor.newBuilder() to construct.
-  private FreebiePricingDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private FreebiePricingDescriptor() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private FreebiePricingDescriptor(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_FreebiePricingDescriptor_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_FreebiePricingDescriptor_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.FreebiePricingDescriptor.class, io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder.class);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.FreebiePricingDescriptor)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.FreebiePricingDescriptor other = (io.bloombox.schema.product.struct.FreebiePricingDescriptor) obj;
-
-    boolean result = true;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.FreebiePricingDescriptor prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code FreebiePricingDescriptor}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:FreebiePricingDescriptor)
-      io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_FreebiePricingDescriptor_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_FreebiePricingDescriptor_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.FreebiePricingDescriptor.class, io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.FreebiePricingDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_FreebiePricingDescriptor_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.FreebiePricingDescriptor getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.FreebiePricingDescriptor.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.FreebiePricingDescriptor build() {
-      io.bloombox.schema.product.struct.FreebiePricingDescriptor result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.FreebiePricingDescriptor buildPartial() {
-      io.bloombox.schema.product.struct.FreebiePricingDescriptor result = new io.bloombox.schema.product.struct.FreebiePricingDescriptor(this);
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.FreebiePricingDescriptor) {
-        return mergeFrom((io.bloombox.schema.product.struct.FreebiePricingDescriptor)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.FreebiePricingDescriptor other) {
-      if (other == io.bloombox.schema.product.struct.FreebiePricingDescriptor.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.FreebiePricingDescriptor parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.FreebiePricingDescriptor) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:FreebiePricingDescriptor)
-  }
-
-  // @@protoc_insertion_point(class_scope:FreebiePricingDescriptor)
-  private static final io.bloombox.schema.product.struct.FreebiePricingDescriptor DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.FreebiePricingDescriptor();
-  }
-
-  public static io.bloombox.schema.product.struct.FreebiePricingDescriptor getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<FreebiePricingDescriptor>
-      PARSER = new com.google.protobuf.AbstractParser<FreebiePricingDescriptor>() {
-    public FreebiePricingDescriptor parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FreebiePricingDescriptor(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<FreebiePricingDescriptor> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<FreebiePricingDescriptor> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.FreebiePricingDescriptor getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/FreebiePricingDescriptorOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/FreebiePricingDescriptorOrBuilder.java
deleted file mode 100644
index c722cb7..0000000
--- a/languages/java/io/bloombox/schema/product/struct/FreebiePricingDescriptorOrBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface FreebiePricingDescriptorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:FreebiePricingDescriptor)
-    com.google.protobuf.MessageOrBuilder {
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/Genetics.java b/languages/java/io/bloombox/schema/product/struct/Genetics.java
deleted file mode 100644
index c11c901..0000000
--- a/languages/java/io/bloombox/schema/product/struct/Genetics.java
+++ /dev/null
@@ -1,748 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code Genetics}
- */
-public  final class Genetics extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:Genetics)
-    GeneticsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Genetics.newBuilder() to construct.
-  private Genetics(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private Genetics() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Genetics(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            io.bloombox.schema.content.Name.Builder subBuilder = null;
-            if (male_ != null) {
-              subBuilder = male_.toBuilder();
-            }
-            male_ = input.readMessage(io.bloombox.schema.content.Name.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(male_);
-              male_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.content.Name.Builder subBuilder = null;
-            if (female_ != null) {
-              subBuilder = female_.toBuilder();
-            }
-            female_ = input.readMessage(io.bloombox.schema.content.Name.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(female_);
-              female_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.GeneticsStructs.internal_static_Genetics_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.GeneticsStructs.internal_static_Genetics_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.Genetics.class, io.bloombox.schema.product.struct.Genetics.Builder.class);
-  }
-
-  public static final int MALE_FIELD_NUMBER = 1;
-  private io.bloombox.schema.content.Name male_;
-  /**
-   * <code>.Name male = 1;</code>
-   */
-  public boolean hasMale() {
-    return male_ != null;
-  }
-  /**
-   * <code>.Name male = 1;</code>
-   */
-  public io.bloombox.schema.content.Name getMale() {
-    return male_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : male_;
-  }
-  /**
-   * <code>.Name male = 1;</code>
-   */
-  public io.bloombox.schema.content.NameOrBuilder getMaleOrBuilder() {
-    return getMale();
-  }
-
-  public static final int FEMALE_FIELD_NUMBER = 2;
-  private io.bloombox.schema.content.Name female_;
-  /**
-   * <code>.Name female = 2;</code>
-   */
-  public boolean hasFemale() {
-    return female_ != null;
-  }
-  /**
-   * <code>.Name female = 2;</code>
-   */
-  public io.bloombox.schema.content.Name getFemale() {
-    return female_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : female_;
-  }
-  /**
-   * <code>.Name female = 2;</code>
-   */
-  public io.bloombox.schema.content.NameOrBuilder getFemaleOrBuilder() {
-    return getFemale();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (male_ != null) {
-      output.writeMessage(1, getMale());
-    }
-    if (female_ != null) {
-      output.writeMessage(2, getFemale());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (male_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getMale());
-    }
-    if (female_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getFemale());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.Genetics)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.Genetics other = (io.bloombox.schema.product.struct.Genetics) obj;
-
-    boolean result = true;
-    result = result && (hasMale() == other.hasMale());
-    if (hasMale()) {
-      result = result && getMale()
-          .equals(other.getMale());
-    }
-    result = result && (hasFemale() == other.hasFemale());
-    if (hasFemale()) {
-      result = result && getFemale()
-          .equals(other.getFemale());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasMale()) {
-      hash = (37 * hash) + MALE_FIELD_NUMBER;
-      hash = (53 * hash) + getMale().hashCode();
-    }
-    if (hasFemale()) {
-      hash = (37 * hash) + FEMALE_FIELD_NUMBER;
-      hash = (53 * hash) + getFemale().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.Genetics parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.Genetics prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code Genetics}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:Genetics)
-      io.bloombox.schema.product.struct.GeneticsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.GeneticsStructs.internal_static_Genetics_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.GeneticsStructs.internal_static_Genetics_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.Genetics.class, io.bloombox.schema.product.struct.Genetics.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.Genetics.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (maleBuilder_ == null) {
-        male_ = null;
-      } else {
-        male_ = null;
-        maleBuilder_ = null;
-      }
-      if (femaleBuilder_ == null) {
-        female_ = null;
-      } else {
-        female_ = null;
-        femaleBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.GeneticsStructs.internal_static_Genetics_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.Genetics getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.Genetics.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.Genetics build() {
-      io.bloombox.schema.product.struct.Genetics result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.Genetics buildPartial() {
-      io.bloombox.schema.product.struct.Genetics result = new io.bloombox.schema.product.struct.Genetics(this);
-      if (maleBuilder_ == null) {
-        result.male_ = male_;
-      } else {
-        result.male_ = maleBuilder_.build();
-      }
-      if (femaleBuilder_ == null) {
-        result.female_ = female_;
-      } else {
-        result.female_ = femaleBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.Genetics) {
-        return mergeFrom((io.bloombox.schema.product.struct.Genetics)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.Genetics other) {
-      if (other == io.bloombox.schema.product.struct.Genetics.getDefaultInstance()) return this;
-      if (other.hasMale()) {
-        mergeMale(other.getMale());
-      }
-      if (other.hasFemale()) {
-        mergeFemale(other.getFemale());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.Genetics parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.Genetics) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private io.bloombox.schema.content.Name male_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> maleBuilder_;
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public boolean hasMale() {
-      return maleBuilder_ != null || male_ != null;
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public io.bloombox.schema.content.Name getMale() {
-      if (maleBuilder_ == null) {
-        return male_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : male_;
-      } else {
-        return maleBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public Builder setMale(io.bloombox.schema.content.Name value) {
-      if (maleBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        male_ = value;
-        onChanged();
-      } else {
-        maleBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public Builder setMale(
-        io.bloombox.schema.content.Name.Builder builderForValue) {
-      if (maleBuilder_ == null) {
-        male_ = builderForValue.build();
-        onChanged();
-      } else {
-        maleBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public Builder mergeMale(io.bloombox.schema.content.Name value) {
-      if (maleBuilder_ == null) {
-        if (male_ != null) {
-          male_ =
-            io.bloombox.schema.content.Name.newBuilder(male_).mergeFrom(value).buildPartial();
-        } else {
-          male_ = value;
-        }
-        onChanged();
-      } else {
-        maleBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public Builder clearMale() {
-      if (maleBuilder_ == null) {
-        male_ = null;
-        onChanged();
-      } else {
-        male_ = null;
-        maleBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public io.bloombox.schema.content.Name.Builder getMaleBuilder() {
-      
-      onChanged();
-      return getMaleFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    public io.bloombox.schema.content.NameOrBuilder getMaleOrBuilder() {
-      if (maleBuilder_ != null) {
-        return maleBuilder_.getMessageOrBuilder();
-      } else {
-        return male_ == null ?
-            io.bloombox.schema.content.Name.getDefaultInstance() : male_;
-      }
-    }
-    /**
-     * <code>.Name male = 1;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> 
-        getMaleFieldBuilder() {
-      if (maleBuilder_ == null) {
-        maleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder>(
-                getMale(),
-                getParentForChildren(),
-                isClean());
-        male_ = null;
-      }
-      return maleBuilder_;
-    }
-
-    private io.bloombox.schema.content.Name female_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> femaleBuilder_;
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public boolean hasFemale() {
-      return femaleBuilder_ != null || female_ != null;
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public io.bloombox.schema.content.Name getFemale() {
-      if (femaleBuilder_ == null) {
-        return female_ == null ? io.bloombox.schema.content.Name.getDefaultInstance() : female_;
-      } else {
-        return femaleBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public Builder setFemale(io.bloombox.schema.content.Name value) {
-      if (femaleBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        female_ = value;
-        onChanged();
-      } else {
-        femaleBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public Builder setFemale(
-        io.bloombox.schema.content.Name.Builder builderForValue) {
-      if (femaleBuilder_ == null) {
-        female_ = builderForValue.build();
-        onChanged();
-      } else {
-        femaleBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public Builder mergeFemale(io.bloombox.schema.content.Name value) {
-      if (femaleBuilder_ == null) {
-        if (female_ != null) {
-          female_ =
-            io.bloombox.schema.content.Name.newBuilder(female_).mergeFrom(value).buildPartial();
-        } else {
-          female_ = value;
-        }
-        onChanged();
-      } else {
-        femaleBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public Builder clearFemale() {
-      if (femaleBuilder_ == null) {
-        female_ = null;
-        onChanged();
-      } else {
-        female_ = null;
-        femaleBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public io.bloombox.schema.content.Name.Builder getFemaleBuilder() {
-      
-      onChanged();
-      return getFemaleFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    public io.bloombox.schema.content.NameOrBuilder getFemaleOrBuilder() {
-      if (femaleBuilder_ != null) {
-        return femaleBuilder_.getMessageOrBuilder();
-      } else {
-        return female_ == null ?
-            io.bloombox.schema.content.Name.getDefaultInstance() : female_;
-      }
-    }
-    /**
-     * <code>.Name female = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder> 
-        getFemaleFieldBuilder() {
-      if (femaleBuilder_ == null) {
-        femaleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.content.Name, io.bloombox.schema.content.Name.Builder, io.bloombox.schema.content.NameOrBuilder>(
-                getFemale(),
-                getParentForChildren(),
-                isClean());
-        female_ = null;
-      }
-      return femaleBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:Genetics)
-  }
-
-  // @@protoc_insertion_point(class_scope:Genetics)
-  private static final io.bloombox.schema.product.struct.Genetics DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.Genetics();
-  }
-
-  public static io.bloombox.schema.product.struct.Genetics getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<Genetics>
-      PARSER = new com.google.protobuf.AbstractParser<Genetics>() {
-    public Genetics parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Genetics(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<Genetics> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<Genetics> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.Genetics getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/GeneticsOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/GeneticsOrBuilder.java
deleted file mode 100644
index 7cd5574..0000000
--- a/languages/java/io/bloombox/schema/product/struct/GeneticsOrBuilder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface GeneticsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:Genetics)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.Name male = 1;</code>
-   */
-  boolean hasMale();
-  /**
-   * <code>.Name male = 1;</code>
-   */
-  io.bloombox.schema.content.Name getMale();
-  /**
-   * <code>.Name male = 1;</code>
-   */
-  io.bloombox.schema.content.NameOrBuilder getMaleOrBuilder();
-
-  /**
-   * <code>.Name female = 2;</code>
-   */
-  boolean hasFemale();
-  /**
-   * <code>.Name female = 2;</code>
-   */
-  io.bloombox.schema.content.Name getFemale();
-  /**
-   * <code>.Name female = 2;</code>
-   */
-  io.bloombox.schema.content.NameOrBuilder getFemaleOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/GeneticsOuterClass.java b/languages/java/io/bloombox/schema/product/struct/GeneticsOuterClass.java
deleted file mode 100644
index 4e2f542..0000000
--- a/languages/java/io/bloombox/schema/product/struct/GeneticsOuterClass.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class GeneticsOuterClass {
-  private GeneticsOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Genetics_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Genetics_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026structs/Genetics.proto\032\022content/Name.p" +
-      "roto\"6\n\010Genetics\022\023\n\004male\030\001 \001(\0132\005.Name\022\025\n" +
-      "\006female\030\002 \001(\0132\005.NameB%\n!io.bloombox.sche" +
-      "ma.product.structP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.content.NameOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_Genetics_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Genetics_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Genetics_descriptor,
-        new java.lang.String[] { "Male", "Female", });
-    io.bloombox.schema.content.NameOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/GeneticsStructs.java b/languages/java/io/bloombox/schema/product/struct/GeneticsStructs.java
deleted file mode 100644
index 75d33da..0000000
--- a/languages/java/io/bloombox/schema/product/struct/GeneticsStructs.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class GeneticsStructs {
-  private GeneticsStructs() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Genetics_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Genetics_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\026structs/Genetics.proto\032\022content/Name.p" +
-      "roto\"6\n\010Genetics\022\023\n\004male\030\001 \001(\0132\005.Name\022\025\n" +
-      "\006female\030\002 \001(\0132\005.NameB;\n!io.bloombox.sche" +
-      "ma.product.structB\017GeneticsStructsH\001P\001\370\001" +
-      "\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.content.NameContent.getDescriptor(),
-        }, assigner);
-    internal_static_Genetics_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_Genetics_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Genetics_descriptor,
-        new java.lang.String[] { "Male", "Female", });
-    io.bloombox.schema.content.NameContent.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/Grow.java b/languages/java/io/bloombox/schema/product/struct/Grow.java
deleted file mode 100644
index 5aa8092..0000000
--- a/languages/java/io/bloombox/schema/product/struct/Grow.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf enum {@code Grow}
- */
-public enum Grow
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>GENERIC = 0;</code>
-   */
-  GENERIC(0),
-  /**
-   * <code>INDOOR = 1;</code>
-   */
-  INDOOR(1),
-  /**
-   * <code>GREENHOUSE = 2;</code>
-   */
-  GREENHOUSE(2),
-  /**
-   * <code>OUTDOOR = 3;</code>
-   */
-  OUTDOOR(3),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>GENERIC = 0;</code>
-   */
-  public static final int GENERIC_VALUE = 0;
-  /**
-   * <code>INDOOR = 1;</code>
-   */
-  public static final int INDOOR_VALUE = 1;
-  /**
-   * <code>GREENHOUSE = 2;</code>
-   */
-  public static final int GREENHOUSE_VALUE = 2;
-  /**
-   * <code>OUTDOOR = 3;</code>
-   */
-  public static final int OUTDOOR_VALUE = 3;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static Grow valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static Grow forNumber(int value) {
-    switch (value) {
-      case 0: return GENERIC;
-      case 1: return INDOOR;
-      case 2: return GREENHOUSE;
-      case 3: return OUTDOOR;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<Grow>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      Grow> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<Grow>() {
-          public Grow findValueByNumber(int number) {
-            return Grow.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.MaterialGrow.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final Grow[] VALUES = values();
-
-  public static Grow valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private Grow(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:Grow)
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/GrowOuterClass.java b/languages/java/io/bloombox/schema/product/struct/GrowOuterClass.java
deleted file mode 100644
index 77db06c..0000000
--- a/languages/java/io/bloombox/schema/product/struct/GrowOuterClass.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class GrowOuterClass {
-  private GrowOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\022structs/Grow.proto*<\n\004Grow\022\013\n\007GENERIC\020" +
-      "\000\022\n\n\006INDOOR\020\001\022\016\n\nGREENHOUSE\020\002\022\013\n\007OUTDOOR" +
-      "\020\003B%\n!io.bloombox.schema.product.structP" +
-      "\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/MaterialGrow.java b/languages/java/io/bloombox/schema/product/struct/MaterialGrow.java
deleted file mode 100644
index ad970f9..0000000
--- a/languages/java/io/bloombox/schema/product/struct/MaterialGrow.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class MaterialGrow {
-  private MaterialGrow() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\022structs/Grow.proto*<\n\004Grow\022\013\n\007GENERIC\020" +
-      "\000\022\n\n\006INDOOR\020\001\022\016\n\nGREENHOUSE\020\002\022\013\n\007OUTDOOR" +
-      "\020\003B8\n!io.bloombox.schema.product.structB" +
-      "\014MaterialGrowH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/MaterialSpecies.java b/languages/java/io/bloombox/schema/product/struct/MaterialSpecies.java
deleted file mode 100644
index 7eb5401..0000000
--- a/languages/java/io/bloombox/schema/product/struct/MaterialSpecies.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class MaterialSpecies {
-  private MaterialSpecies() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025structs/Species.proto*d\n\007Species\022\017\n\013UN" +
-      "SPECIFIED\020\000\022\n\n\006SATIVA\020\001\022\021\n\rHYBRID_SATIVA" +
-      "\020\002\022\n\n\006HYBRID\020\003\022\021\n\rHYBRID_INDICA\020\004\022\n\n\006IND" +
-      "ICA\020\005B;\n!io.bloombox.schema.product.stru" +
-      "ctB\017MaterialSpeciesH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingDescriptor.java b/languages/java/io/bloombox/schema/product/struct/PricingDescriptor.java
deleted file mode 100644
index 3f8649d..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingDescriptor.java
+++ /dev/null
@@ -1,1068 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * <pre>
- * -- Pricing: Main Descriptor
- * </pre>
- *
- * Protobuf type {@code PricingDescriptor}
- */
-public  final class PricingDescriptor extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:PricingDescriptor)
-    PricingDescriptorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use PricingDescriptor.newBuilder() to construct.
-  private PricingDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private PricingDescriptor() {
-    type_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private PricingDescriptor(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            type_ = rawValue;
-            break;
-          }
-          case 162: {
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder subBuilder = null;
-            if (unit_ != null) {
-              subBuilder = unit_.toBuilder();
-            }
-            unit_ = input.readMessage(io.bloombox.schema.product.struct.UnitPricingDescriptor.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(unit_);
-              unit_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 170: {
-            io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder subBuilder = null;
-            if (weighted_ != null) {
-              subBuilder = weighted_.toBuilder();
-            }
-            weighted_ = input.readMessage(io.bloombox.schema.product.struct.WeightedPricingDescriptor.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(weighted_);
-              weighted_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 178: {
-            io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder subBuilder = null;
-            if (freebie_ != null) {
-              subBuilder = freebie_.toBuilder();
-            }
-            freebie_ = input.readMessage(io.bloombox.schema.product.struct.FreebiePricingDescriptor.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(freebie_);
-              freebie_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingDescriptor_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingDescriptor_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.PricingDescriptor.class, io.bloombox.schema.product.struct.PricingDescriptor.Builder.class);
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_;
-  /**
-   * <code>.PricingType type = 1;</code>
-   */
-  public int getTypeValue() {
-    return type_;
-  }
-  /**
-   * <code>.PricingType type = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.PricingType getType() {
-    io.bloombox.schema.product.struct.PricingType result = io.bloombox.schema.product.struct.PricingType.valueOf(type_);
-    return result == null ? io.bloombox.schema.product.struct.PricingType.UNRECOGNIZED : result;
-  }
-
-  public static final int UNIT_FIELD_NUMBER = 20;
-  private io.bloombox.schema.product.struct.UnitPricingDescriptor unit_;
-  /**
-   * <pre>
-   * -- descriptors
-   * </pre>
-   *
-   * <code>.UnitPricingDescriptor unit = 20;</code>
-   */
-  public boolean hasUnit() {
-    return unit_ != null;
-  }
-  /**
-   * <pre>
-   * -- descriptors
-   * </pre>
-   *
-   * <code>.UnitPricingDescriptor unit = 20;</code>
-   */
-  public io.bloombox.schema.product.struct.UnitPricingDescriptor getUnit() {
-    return unit_ == null ? io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance() : unit_;
-  }
-  /**
-   * <pre>
-   * -- descriptors
-   * </pre>
-   *
-   * <code>.UnitPricingDescriptor unit = 20;</code>
-   */
-  public io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder getUnitOrBuilder() {
-    return getUnit();
-  }
-
-  public static final int WEIGHTED_FIELD_NUMBER = 21;
-  private io.bloombox.schema.product.struct.WeightedPricingDescriptor weighted_;
-  /**
-   * <code>.WeightedPricingDescriptor weighted = 21;</code>
-   */
-  public boolean hasWeighted() {
-    return weighted_ != null;
-  }
-  /**
-   * <code>.WeightedPricingDescriptor weighted = 21;</code>
-   */
-  public io.bloombox.schema.product.struct.WeightedPricingDescriptor getWeighted() {
-    return weighted_ == null ? io.bloombox.schema.product.struct.WeightedPricingDescriptor.getDefaultInstance() : weighted_;
-  }
-  /**
-   * <code>.WeightedPricingDescriptor weighted = 21;</code>
-   */
-  public io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder getWeightedOrBuilder() {
-    return getWeighted();
-  }
-
-  public static final int FREEBIE_FIELD_NUMBER = 22;
-  private io.bloombox.schema.product.struct.FreebiePricingDescriptor freebie_;
-  /**
-   * <code>.FreebiePricingDescriptor freebie = 22;</code>
-   */
-  public boolean hasFreebie() {
-    return freebie_ != null;
-  }
-  /**
-   * <code>.FreebiePricingDescriptor freebie = 22;</code>
-   */
-  public io.bloombox.schema.product.struct.FreebiePricingDescriptor getFreebie() {
-    return freebie_ == null ? io.bloombox.schema.product.struct.FreebiePricingDescriptor.getDefaultInstance() : freebie_;
-  }
-  /**
-   * <code>.FreebiePricingDescriptor freebie = 22;</code>
-   */
-  public io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder getFreebieOrBuilder() {
-    return getFreebie();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (type_ != io.bloombox.schema.product.struct.PricingType.UNIT.getNumber()) {
-      output.writeEnum(1, type_);
-    }
-    if (unit_ != null) {
-      output.writeMessage(20, getUnit());
-    }
-    if (weighted_ != null) {
-      output.writeMessage(21, getWeighted());
-    }
-    if (freebie_ != null) {
-      output.writeMessage(22, getFreebie());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (type_ != io.bloombox.schema.product.struct.PricingType.UNIT.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, type_);
-    }
-    if (unit_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(20, getUnit());
-    }
-    if (weighted_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(21, getWeighted());
-    }
-    if (freebie_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(22, getFreebie());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.PricingDescriptor)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.PricingDescriptor other = (io.bloombox.schema.product.struct.PricingDescriptor) obj;
-
-    boolean result = true;
-    result = result && type_ == other.type_;
-    result = result && (hasUnit() == other.hasUnit());
-    if (hasUnit()) {
-      result = result && getUnit()
-          .equals(other.getUnit());
-    }
-    result = result && (hasWeighted() == other.hasWeighted());
-    if (hasWeighted()) {
-      result = result && getWeighted()
-          .equals(other.getWeighted());
-    }
-    result = result && (hasFreebie() == other.hasFreebie());
-    if (hasFreebie()) {
-      result = result && getFreebie()
-          .equals(other.getFreebie());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TYPE_FIELD_NUMBER;
-    hash = (53 * hash) + type_;
-    if (hasUnit()) {
-      hash = (37 * hash) + UNIT_FIELD_NUMBER;
-      hash = (53 * hash) + getUnit().hashCode();
-    }
-    if (hasWeighted()) {
-      hash = (37 * hash) + WEIGHTED_FIELD_NUMBER;
-      hash = (53 * hash) + getWeighted().hashCode();
-    }
-    if (hasFreebie()) {
-      hash = (37 * hash) + FREEBIE_FIELD_NUMBER;
-      hash = (53 * hash) + getFreebie().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.PricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.PricingDescriptor prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Pricing: Main Descriptor
-   * </pre>
-   *
-   * Protobuf type {@code PricingDescriptor}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:PricingDescriptor)
-      io.bloombox.schema.product.struct.PricingDescriptorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingDescriptor_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingDescriptor_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.PricingDescriptor.class, io.bloombox.schema.product.struct.PricingDescriptor.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.PricingDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      type_ = 0;
-
-      if (unitBuilder_ == null) {
-        unit_ = null;
-      } else {
-        unit_ = null;
-        unitBuilder_ = null;
-      }
-      if (weightedBuilder_ == null) {
-        weighted_ = null;
-      } else {
-        weighted_ = null;
-        weightedBuilder_ = null;
-      }
-      if (freebieBuilder_ == null) {
-        freebie_ = null;
-      } else {
-        freebie_ = null;
-        freebieBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingDescriptor_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.PricingDescriptor getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.PricingDescriptor.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.PricingDescriptor build() {
-      io.bloombox.schema.product.struct.PricingDescriptor result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.PricingDescriptor buildPartial() {
-      io.bloombox.schema.product.struct.PricingDescriptor result = new io.bloombox.schema.product.struct.PricingDescriptor(this);
-      result.type_ = type_;
-      if (unitBuilder_ == null) {
-        result.unit_ = unit_;
-      } else {
-        result.unit_ = unitBuilder_.build();
-      }
-      if (weightedBuilder_ == null) {
-        result.weighted_ = weighted_;
-      } else {
-        result.weighted_ = weightedBuilder_.build();
-      }
-      if (freebieBuilder_ == null) {
-        result.freebie_ = freebie_;
-      } else {
-        result.freebie_ = freebieBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.PricingDescriptor) {
-        return mergeFrom((io.bloombox.schema.product.struct.PricingDescriptor)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.PricingDescriptor other) {
-      if (other == io.bloombox.schema.product.struct.PricingDescriptor.getDefaultInstance()) return this;
-      if (other.type_ != 0) {
-        setTypeValue(other.getTypeValue());
-      }
-      if (other.hasUnit()) {
-        mergeUnit(other.getUnit());
-      }
-      if (other.hasWeighted()) {
-        mergeWeighted(other.getWeighted());
-      }
-      if (other.hasFreebie()) {
-        mergeFreebie(other.getFreebie());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.PricingDescriptor parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.PricingDescriptor) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int type_ = 0;
-    /**
-     * <code>.PricingType type = 1;</code>
-     */
-    public int getTypeValue() {
-      return type_;
-    }
-    /**
-     * <code>.PricingType type = 1;</code>
-     */
-    public Builder setTypeValue(int value) {
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.PricingType type = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingType getType() {
-      io.bloombox.schema.product.struct.PricingType result = io.bloombox.schema.product.struct.PricingType.valueOf(type_);
-      return result == null ? io.bloombox.schema.product.struct.PricingType.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.PricingType type = 1;</code>
-     */
-    public Builder setType(io.bloombox.schema.product.struct.PricingType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      type_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.PricingType type = 1;</code>
-     */
-    public Builder clearType() {
-      
-      type_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private io.bloombox.schema.product.struct.UnitPricingDescriptor unit_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.UnitPricingDescriptor, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder, io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder> unitBuilder_;
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public boolean hasUnit() {
-      return unitBuilder_ != null || unit_ != null;
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor getUnit() {
-      if (unitBuilder_ == null) {
-        return unit_ == null ? io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance() : unit_;
-      } else {
-        return unitBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public Builder setUnit(io.bloombox.schema.product.struct.UnitPricingDescriptor value) {
-      if (unitBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        unit_ = value;
-        onChanged();
-      } else {
-        unitBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public Builder setUnit(
-        io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder builderForValue) {
-      if (unitBuilder_ == null) {
-        unit_ = builderForValue.build();
-        onChanged();
-      } else {
-        unitBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public Builder mergeUnit(io.bloombox.schema.product.struct.UnitPricingDescriptor value) {
-      if (unitBuilder_ == null) {
-        if (unit_ != null) {
-          unit_ =
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.newBuilder(unit_).mergeFrom(value).buildPartial();
-        } else {
-          unit_ = value;
-        }
-        onChanged();
-      } else {
-        unitBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public Builder clearUnit() {
-      if (unitBuilder_ == null) {
-        unit_ = null;
-        onChanged();
-      } else {
-        unit_ = null;
-        unitBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder getUnitBuilder() {
-      
-      onChanged();
-      return getUnitFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    public io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder getUnitOrBuilder() {
-      if (unitBuilder_ != null) {
-        return unitBuilder_.getMessageOrBuilder();
-      } else {
-        return unit_ == null ?
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance() : unit_;
-      }
-    }
-    /**
-     * <pre>
-     * -- descriptors
-     * </pre>
-     *
-     * <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.UnitPricingDescriptor, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder, io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder> 
-        getUnitFieldBuilder() {
-      if (unitBuilder_ == null) {
-        unitBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.product.struct.UnitPricingDescriptor, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder, io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder>(
-                getUnit(),
-                getParentForChildren(),
-                isClean());
-        unit_ = null;
-      }
-      return unitBuilder_;
-    }
-
-    private io.bloombox.schema.product.struct.WeightedPricingDescriptor weighted_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.WeightedPricingDescriptor, io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder, io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder> weightedBuilder_;
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public boolean hasWeighted() {
-      return weightedBuilder_ != null || weighted_ != null;
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public io.bloombox.schema.product.struct.WeightedPricingDescriptor getWeighted() {
-      if (weightedBuilder_ == null) {
-        return weighted_ == null ? io.bloombox.schema.product.struct.WeightedPricingDescriptor.getDefaultInstance() : weighted_;
-      } else {
-        return weightedBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public Builder setWeighted(io.bloombox.schema.product.struct.WeightedPricingDescriptor value) {
-      if (weightedBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        weighted_ = value;
-        onChanged();
-      } else {
-        weightedBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public Builder setWeighted(
-        io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder builderForValue) {
-      if (weightedBuilder_ == null) {
-        weighted_ = builderForValue.build();
-        onChanged();
-      } else {
-        weightedBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public Builder mergeWeighted(io.bloombox.schema.product.struct.WeightedPricingDescriptor value) {
-      if (weightedBuilder_ == null) {
-        if (weighted_ != null) {
-          weighted_ =
-            io.bloombox.schema.product.struct.WeightedPricingDescriptor.newBuilder(weighted_).mergeFrom(value).buildPartial();
-        } else {
-          weighted_ = value;
-        }
-        onChanged();
-      } else {
-        weightedBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public Builder clearWeighted() {
-      if (weightedBuilder_ == null) {
-        weighted_ = null;
-        onChanged();
-      } else {
-        weighted_ = null;
-        weightedBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder getWeightedBuilder() {
-      
-      onChanged();
-      return getWeightedFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    public io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder getWeightedOrBuilder() {
-      if (weightedBuilder_ != null) {
-        return weightedBuilder_.getMessageOrBuilder();
-      } else {
-        return weighted_ == null ?
-            io.bloombox.schema.product.struct.WeightedPricingDescriptor.getDefaultInstance() : weighted_;
-      }
-    }
-    /**
-     * <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.WeightedPricingDescriptor, io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder, io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder> 
-        getWeightedFieldBuilder() {
-      if (weightedBuilder_ == null) {
-        weightedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.product.struct.WeightedPricingDescriptor, io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder, io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder>(
-                getWeighted(),
-                getParentForChildren(),
-                isClean());
-        weighted_ = null;
-      }
-      return weightedBuilder_;
-    }
-
-    private io.bloombox.schema.product.struct.FreebiePricingDescriptor freebie_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.FreebiePricingDescriptor, io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder, io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder> freebieBuilder_;
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public boolean hasFreebie() {
-      return freebieBuilder_ != null || freebie_ != null;
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FreebiePricingDescriptor getFreebie() {
-      if (freebieBuilder_ == null) {
-        return freebie_ == null ? io.bloombox.schema.product.struct.FreebiePricingDescriptor.getDefaultInstance() : freebie_;
-      } else {
-        return freebieBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public Builder setFreebie(io.bloombox.schema.product.struct.FreebiePricingDescriptor value) {
-      if (freebieBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        freebie_ = value;
-        onChanged();
-      } else {
-        freebieBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public Builder setFreebie(
-        io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder builderForValue) {
-      if (freebieBuilder_ == null) {
-        freebie_ = builderForValue.build();
-        onChanged();
-      } else {
-        freebieBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public Builder mergeFreebie(io.bloombox.schema.product.struct.FreebiePricingDescriptor value) {
-      if (freebieBuilder_ == null) {
-        if (freebie_ != null) {
-          freebie_ =
-            io.bloombox.schema.product.struct.FreebiePricingDescriptor.newBuilder(freebie_).mergeFrom(value).buildPartial();
-        } else {
-          freebie_ = value;
-        }
-        onChanged();
-      } else {
-        freebieBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public Builder clearFreebie() {
-      if (freebieBuilder_ == null) {
-        freebie_ = null;
-        onChanged();
-      } else {
-        freebie_ = null;
-        freebieBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder getFreebieBuilder() {
-      
-      onChanged();
-      return getFreebieFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    public io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder getFreebieOrBuilder() {
-      if (freebieBuilder_ != null) {
-        return freebieBuilder_.getMessageOrBuilder();
-      } else {
-        return freebie_ == null ?
-            io.bloombox.schema.product.struct.FreebiePricingDescriptor.getDefaultInstance() : freebie_;
-      }
-    }
-    /**
-     * <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.FreebiePricingDescriptor, io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder, io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder> 
-        getFreebieFieldBuilder() {
-      if (freebieBuilder_ == null) {
-        freebieBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.product.struct.FreebiePricingDescriptor, io.bloombox.schema.product.struct.FreebiePricingDescriptor.Builder, io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder>(
-                getFreebie(),
-                getParentForChildren(),
-                isClean());
-        freebie_ = null;
-      }
-      return freebieBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:PricingDescriptor)
-  }
-
-  // @@protoc_insertion_point(class_scope:PricingDescriptor)
-  private static final io.bloombox.schema.product.struct.PricingDescriptor DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.PricingDescriptor();
-  }
-
-  public static io.bloombox.schema.product.struct.PricingDescriptor getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<PricingDescriptor>
-      PARSER = new com.google.protobuf.AbstractParser<PricingDescriptor>() {
-    public PricingDescriptor parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PricingDescriptor(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<PricingDescriptor> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<PricingDescriptor> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.PricingDescriptor getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingDescriptorOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/PricingDescriptorOrBuilder.java
deleted file mode 100644
index 7a0497d..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingDescriptorOrBuilder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface PricingDescriptorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:PricingDescriptor)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.PricingType type = 1;</code>
-   */
-  int getTypeValue();
-  /**
-   * <code>.PricingType type = 1;</code>
-   */
-  io.bloombox.schema.product.struct.PricingType getType();
-
-  /**
-   * <pre>
-   * -- descriptors
-   * </pre>
-   *
-   * <code>.UnitPricingDescriptor unit = 20;</code>
-   */
-  boolean hasUnit();
-  /**
-   * <pre>
-   * -- descriptors
-   * </pre>
-   *
-   * <code>.UnitPricingDescriptor unit = 20;</code>
-   */
-  io.bloombox.schema.product.struct.UnitPricingDescriptor getUnit();
-  /**
-   * <pre>
-   * -- descriptors
-   * </pre>
-   *
-   * <code>.UnitPricingDescriptor unit = 20;</code>
-   */
-  io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder getUnitOrBuilder();
-
-  /**
-   * <code>.WeightedPricingDescriptor weighted = 21;</code>
-   */
-  boolean hasWeighted();
-  /**
-   * <code>.WeightedPricingDescriptor weighted = 21;</code>
-   */
-  io.bloombox.schema.product.struct.WeightedPricingDescriptor getWeighted();
-  /**
-   * <code>.WeightedPricingDescriptor weighted = 21;</code>
-   */
-  io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder getWeightedOrBuilder();
-
-  /**
-   * <code>.FreebiePricingDescriptor freebie = 22;</code>
-   */
-  boolean hasFreebie();
-  /**
-   * <code>.FreebiePricingDescriptor freebie = 22;</code>
-   */
-  io.bloombox.schema.product.struct.FreebiePricingDescriptor getFreebie();
-  /**
-   * <code>.FreebiePricingDescriptor freebie = 22;</code>
-   */
-  io.bloombox.schema.product.struct.FreebiePricingDescriptorOrBuilder getFreebieOrBuilder();
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingDescriptorOuterClass.java b/languages/java/io/bloombox/schema/product/struct/PricingDescriptorOuterClass.java
deleted file mode 100644
index a6eac0b..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingDescriptorOuterClass.java
+++ /dev/null
@@ -1,134 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class PricingDescriptorOuterClass {
-  private PricingDescriptorOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_PricingTierAvailability_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PricingTierAvailability_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_UnitPricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_UnitPricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_WeightedPricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_WeightedPricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_FreebiePricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_FreebiePricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_PricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductPricing_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductPricing_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\'structs/pricing/PricingDescriptor.prot" +
-      "o\032$structs/pricing/SaleDescriptor.proto\"" +
-      "=\n\027PricingTierAvailability\022\017\n\007offered\030\001 " +
-      "\001(\010\022\021\n\tavailable\030\002 \001(\010\"z\n\025UnitPricingDes" +
-      "criptor\022\023\n\013price_value\030\001 \001(\002\022(\n\006status\030\002" +
-      " \001(\0132\030.PricingTierAvailability\022\"\n\tdiscou" +
-      "nts\030\003 \003(\0132\017.SaleDescriptor\"|\n\031WeightedPr" +
-      "icingDescriptor\022\"\n\006weight\030\001 \001(\0162\022.Pricin" +
-      "gWeightTier\022$\n\004tier\030\002 \001(\0132\026.UnitPricingD" +
-      "escriptor\022\025\n\rweightInGrams\030\003 \001(\002\"\032\n\030Free",
-      "biePricingDescriptor\"\257\001\n\021PricingDescript" +
-      "or\022\032\n\004type\030\001 \001(\0162\014.PricingType\022$\n\004unit\030\024" +
-      " \001(\0132\026.UnitPricingDescriptor\022,\n\010weighted" +
-      "\030\025 \001(\0132\032.WeightedPricingDescriptor\022*\n\007fr" +
-      "eebie\030\026 \001(\0132\031.FreebiePricingDescriptor\"Z" +
-      "\n\016ProductPricing\022\"\n\tdiscounts\030\001 \003(\0132\017.Sa" +
-      "leDescriptor\022$\n\010manifest\030\002 \003(\0132\022.Pricing" +
-      "Descriptor*2\n\013PricingType\022\010\n\004UNIT\020\000\022\014\n\010W" +
-      "EIGHTED\020\001\022\013\n\007FREEBIE\020\002*\211\001\n\021PricingWeight" +
-      "Tier\022\t\n\005OTHER\020\000\022\010\n\004GRAM\020\001\022\014\n\010HALFGRAM\020\002\022",
-      "\017\n\013QUARTERGRAM\020\003\022\007\n\003DUB\020\004\022\n\n\006EIGHTH\020\005\022\013\n" +
-      "\007QUARTER\020\006\022\010\n\004HALF\020\007\022\t\n\005OUNCE\020\010\022\t\n\005POUND" +
-      "\020\tB%\n!io.bloombox.schema.product.structP" +
-      "\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.product.struct.SaleDescriptorOuterClass.getDescriptor(),
-        }, assigner);
-    internal_static_PricingTierAvailability_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_PricingTierAvailability_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PricingTierAvailability_descriptor,
-        new java.lang.String[] { "Offered", "Available", });
-    internal_static_UnitPricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_UnitPricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_UnitPricingDescriptor_descriptor,
-        new java.lang.String[] { "PriceValue", "Status", "Discounts", });
-    internal_static_WeightedPricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_WeightedPricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_WeightedPricingDescriptor_descriptor,
-        new java.lang.String[] { "Weight", "Tier", "WeightInGrams", });
-    internal_static_FreebiePricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_FreebiePricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_FreebiePricingDescriptor_descriptor,
-        new java.lang.String[] { });
-    internal_static_PricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(4);
-    internal_static_PricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PricingDescriptor_descriptor,
-        new java.lang.String[] { "Type", "Unit", "Weighted", "Freebie", });
-    internal_static_ProductPricing_descriptor =
-      getDescriptor().getMessageTypes().get(5);
-    internal_static_ProductPricing_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductPricing_descriptor,
-        new java.lang.String[] { "Discounts", "Manifest", });
-    io.bloombox.schema.product.struct.SaleDescriptorOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingTierAvailability.java b/languages/java/io/bloombox/schema/product/struct/PricingTierAvailability.java
deleted file mode 100644
index 8f601e7..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingTierAvailability.java
+++ /dev/null
@@ -1,504 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code PricingTierAvailability}
- */
-public  final class PricingTierAvailability extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:PricingTierAvailability)
-    PricingTierAvailabilityOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use PricingTierAvailability.newBuilder() to construct.
-  private PricingTierAvailability(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private PricingTierAvailability() {
-    offered_ = false;
-    available_ = false;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private PricingTierAvailability(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            offered_ = input.readBool();
-            break;
-          }
-          case 16: {
-
-            available_ = input.readBool();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingTierAvailability_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingTierAvailability_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.PricingTierAvailability.class, io.bloombox.schema.product.struct.PricingTierAvailability.Builder.class);
-  }
-
-  public static final int OFFERED_FIELD_NUMBER = 1;
-  private boolean offered_;
-  /**
-   * <code>bool offered = 1;</code>
-   */
-  public boolean getOffered() {
-    return offered_;
-  }
-
-  public static final int AVAILABLE_FIELD_NUMBER = 2;
-  private boolean available_;
-  /**
-   * <code>bool available = 2;</code>
-   */
-  public boolean getAvailable() {
-    return available_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (offered_ != false) {
-      output.writeBool(1, offered_);
-    }
-    if (available_ != false) {
-      output.writeBool(2, available_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (offered_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(1, offered_);
-    }
-    if (available_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(2, available_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.PricingTierAvailability)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.PricingTierAvailability other = (io.bloombox.schema.product.struct.PricingTierAvailability) obj;
-
-    boolean result = true;
-    result = result && (getOffered()
-        == other.getOffered());
-    result = result && (getAvailable()
-        == other.getAvailable());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + OFFERED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getOffered());
-    hash = (37 * hash) + AVAILABLE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getAvailable());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.PricingTierAvailability parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.PricingTierAvailability prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code PricingTierAvailability}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:PricingTierAvailability)
-      io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingTierAvailability_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingTierAvailability_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.PricingTierAvailability.class, io.bloombox.schema.product.struct.PricingTierAvailability.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.PricingTierAvailability.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      offered_ = false;
-
-      available_ = false;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_PricingTierAvailability_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.PricingTierAvailability getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.PricingTierAvailability.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.PricingTierAvailability build() {
-      io.bloombox.schema.product.struct.PricingTierAvailability result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.PricingTierAvailability buildPartial() {
-      io.bloombox.schema.product.struct.PricingTierAvailability result = new io.bloombox.schema.product.struct.PricingTierAvailability(this);
-      result.offered_ = offered_;
-      result.available_ = available_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.PricingTierAvailability) {
-        return mergeFrom((io.bloombox.schema.product.struct.PricingTierAvailability)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.PricingTierAvailability other) {
-      if (other == io.bloombox.schema.product.struct.PricingTierAvailability.getDefaultInstance()) return this;
-      if (other.getOffered() != false) {
-        setOffered(other.getOffered());
-      }
-      if (other.getAvailable() != false) {
-        setAvailable(other.getAvailable());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.PricingTierAvailability parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.PricingTierAvailability) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private boolean offered_ ;
-    /**
-     * <code>bool offered = 1;</code>
-     */
-    public boolean getOffered() {
-      return offered_;
-    }
-    /**
-     * <code>bool offered = 1;</code>
-     */
-    public Builder setOffered(boolean value) {
-      
-      offered_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool offered = 1;</code>
-     */
-    public Builder clearOffered() {
-      
-      offered_ = false;
-      onChanged();
-      return this;
-    }
-
-    private boolean available_ ;
-    /**
-     * <code>bool available = 2;</code>
-     */
-    public boolean getAvailable() {
-      return available_;
-    }
-    /**
-     * <code>bool available = 2;</code>
-     */
-    public Builder setAvailable(boolean value) {
-      
-      available_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool available = 2;</code>
-     */
-    public Builder clearAvailable() {
-      
-      available_ = false;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:PricingTierAvailability)
-  }
-
-  // @@protoc_insertion_point(class_scope:PricingTierAvailability)
-  private static final io.bloombox.schema.product.struct.PricingTierAvailability DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.PricingTierAvailability();
-  }
-
-  public static io.bloombox.schema.product.struct.PricingTierAvailability getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<PricingTierAvailability>
-      PARSER = new com.google.protobuf.AbstractParser<PricingTierAvailability>() {
-    public PricingTierAvailability parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PricingTierAvailability(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<PricingTierAvailability> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<PricingTierAvailability> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.PricingTierAvailability getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingTierAvailabilityOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/PricingTierAvailabilityOrBuilder.java
deleted file mode 100644
index b185906..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingTierAvailabilityOrBuilder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface PricingTierAvailabilityOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:PricingTierAvailability)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>bool offered = 1;</code>
-   */
-  boolean getOffered();
-
-  /**
-   * <code>bool available = 2;</code>
-   */
-  boolean getAvailable();
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingType.java b/languages/java/io/bloombox/schema/product/struct/PricingType.java
deleted file mode 100644
index a669fd5..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingType.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * <pre>
- * -- Pricing: Objects
- * </pre>
- *
- * Protobuf enum {@code PricingType}
- */
-public enum PricingType
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>UNIT = 0;</code>
-   */
-  UNIT(0),
-  /**
-   * <code>WEIGHTED = 1;</code>
-   */
-  WEIGHTED(1),
-  /**
-   * <code>FREEBIE = 2;</code>
-   */
-  FREEBIE(2),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>UNIT = 0;</code>
-   */
-  public static final int UNIT_VALUE = 0;
-  /**
-   * <code>WEIGHTED = 1;</code>
-   */
-  public static final int WEIGHTED_VALUE = 1;
-  /**
-   * <code>FREEBIE = 2;</code>
-   */
-  public static final int FREEBIE_VALUE = 2;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static PricingType valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static PricingType forNumber(int value) {
-    switch (value) {
-      case 0: return UNIT;
-      case 1: return WEIGHTED;
-      case 2: return FREEBIE;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<PricingType>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      PricingType> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<PricingType>() {
-          public PricingType findValueByNumber(int number) {
-            return PricingType.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final PricingType[] VALUES = values();
-
-  public static PricingType valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private PricingType(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:PricingType)
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/PricingWeightTier.java b/languages/java/io/bloombox/schema/product/struct/PricingWeightTier.java
deleted file mode 100644
index 602e1f6..0000000
--- a/languages/java/io/bloombox/schema/product/struct/PricingWeightTier.java
+++ /dev/null
@@ -1,175 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf enum {@code PricingWeightTier}
- */
-public enum PricingWeightTier
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>OTHER = 0;</code>
-   */
-  OTHER(0),
-  /**
-   * <code>GRAM = 1;</code>
-   */
-  GRAM(1),
-  /**
-   * <code>HALFGRAM = 2;</code>
-   */
-  HALFGRAM(2),
-  /**
-   * <code>QUARTERGRAM = 3;</code>
-   */
-  QUARTERGRAM(3),
-  /**
-   * <code>DUB = 4;</code>
-   */
-  DUB(4),
-  /**
-   * <code>EIGHTH = 5;</code>
-   */
-  EIGHTH(5),
-  /**
-   * <code>QUARTER = 6;</code>
-   */
-  QUARTER(6),
-  /**
-   * <code>HALF = 7;</code>
-   */
-  HALF(7),
-  /**
-   * <code>OUNCE = 8;</code>
-   */
-  OUNCE(8),
-  /**
-   * <code>POUND = 9;</code>
-   */
-  POUND(9),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>OTHER = 0;</code>
-   */
-  public static final int OTHER_VALUE = 0;
-  /**
-   * <code>GRAM = 1;</code>
-   */
-  public static final int GRAM_VALUE = 1;
-  /**
-   * <code>HALFGRAM = 2;</code>
-   */
-  public static final int HALFGRAM_VALUE = 2;
-  /**
-   * <code>QUARTERGRAM = 3;</code>
-   */
-  public static final int QUARTERGRAM_VALUE = 3;
-  /**
-   * <code>DUB = 4;</code>
-   */
-  public static final int DUB_VALUE = 4;
-  /**
-   * <code>EIGHTH = 5;</code>
-   */
-  public static final int EIGHTH_VALUE = 5;
-  /**
-   * <code>QUARTER = 6;</code>
-   */
-  public static final int QUARTER_VALUE = 6;
-  /**
-   * <code>HALF = 7;</code>
-   */
-  public static final int HALF_VALUE = 7;
-  /**
-   * <code>OUNCE = 8;</code>
-   */
-  public static final int OUNCE_VALUE = 8;
-  /**
-   * <code>POUND = 9;</code>
-   */
-  public static final int POUND_VALUE = 9;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static PricingWeightTier valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static PricingWeightTier forNumber(int value) {
-    switch (value) {
-      case 0: return OTHER;
-      case 1: return GRAM;
-      case 2: return HALFGRAM;
-      case 3: return QUARTERGRAM;
-      case 4: return DUB;
-      case 5: return EIGHTH;
-      case 6: return QUARTER;
-      case 7: return HALF;
-      case 8: return OUNCE;
-      case 9: return POUND;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<PricingWeightTier>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      PricingWeightTier> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<PricingWeightTier>() {
-          public PricingWeightTier findValueByNumber(int number) {
-            return PricingWeightTier.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.getDescriptor().getEnumTypes().get(1);
-  }
-
-  private static final PricingWeightTier[] VALUES = values();
-
-  public static PricingWeightTier valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private PricingWeightTier(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:PricingWeightTier)
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductDiscount.java b/languages/java/io/bloombox/schema/product/struct/ProductDiscount.java
deleted file mode 100644
index e72079a..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductDiscount.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class ProductDiscount {
-  private ProductDiscount() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_SaleDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_SaleDescriptor_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n$structs/pricing/SaleDescriptor.proto\"\307" +
-      "\001\n\016SaleDescriptor\022\027\n\004type\030\001 \001(\0162\t.SaleTy" +
-      "pe\022\021\n\teffective\030\002 \001(\004\022\022\n\nexpiration\030\003 \001(" +
-      "\004\022\031\n\021percentage_amount\030\024 \001(\r\022\024\n\014bogo_tri" +
-      "gger\030\025 \001(\r\022\023\n\013bogo_reward\030\026 \001(\r\022\027\n\017loyal" +
-      "ty_trigger\030\027 \001(\r\022\026\n\016loyalty_reward\030\030 \001(\r" +
-      "*1\n\010SaleType\022\016\n\nPERCENTAGE\020\000\022\010\n\004BOGO\020\001\022\013" +
-      "\n\007LOYALTY\020\002B;\n!io.bloombox.schema.produc" +
-      "t.structB\017ProductDiscountH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_SaleDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_SaleDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_SaleDescriptor_descriptor,
-        new java.lang.String[] { "Type", "Effective", "Expiration", "PercentageAmount", "BogoTrigger", "BogoReward", "LoyaltyTrigger", "LoyaltyReward", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductFlag.java b/languages/java/io/bloombox/schema/product/struct/ProductFlag.java
deleted file mode 100644
index ff81f93..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductFlag.java
+++ /dev/null
@@ -1,130 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf enum {@code ProductFlag}
- */
-public enum ProductFlag
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>VISIBLE = 0;</code>
-   */
-  VISIBLE(0),
-  /**
-   * <code>PREMIUM = 1;</code>
-   */
-  PREMIUM(1),
-  /**
-   * <code>FEATURED = 2;</code>
-   */
-  FEATURED(2),
-  /**
-   * <code>LASTCHANCE = 3;</code>
-   */
-  LASTCHANCE(3),
-  /**
-   * <code>INHOUSE = 4;</code>
-   */
-  INHOUSE(4),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>VISIBLE = 0;</code>
-   */
-  public static final int VISIBLE_VALUE = 0;
-  /**
-   * <code>PREMIUM = 1;</code>
-   */
-  public static final int PREMIUM_VALUE = 1;
-  /**
-   * <code>FEATURED = 2;</code>
-   */
-  public static final int FEATURED_VALUE = 2;
-  /**
-   * <code>LASTCHANCE = 3;</code>
-   */
-  public static final int LASTCHANCE_VALUE = 3;
-  /**
-   * <code>INHOUSE = 4;</code>
-   */
-  public static final int INHOUSE_VALUE = 4;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static ProductFlag valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static ProductFlag forNumber(int value) {
-    switch (value) {
-      case 0: return VISIBLE;
-      case 1: return PREMIUM;
-      case 2: return FEATURED;
-      case 3: return LASTCHANCE;
-      case 4: return INHOUSE;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<ProductFlag>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      ProductFlag> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<ProductFlag>() {
-          public ProductFlag findValueByNumber(int number) {
-            return ProductFlag.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.BaseStructs.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final ProductFlag[] VALUES = values();
-
-  public static ProductFlag valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private ProductFlag(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:ProductFlag)
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductFlagValue.java b/languages/java/io/bloombox/schema/product/struct/ProductFlagValue.java
deleted file mode 100644
index 97824ba..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductFlagValue.java
+++ /dev/null
@@ -1,528 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code ProductFlagValue}
- */
-public  final class ProductFlagValue extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ProductFlagValue)
-    ProductFlagValueOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ProductFlagValue.newBuilder() to construct.
-  private ProductFlagValue(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ProductFlagValue() {
-    type_ = 0;
-    value_ = false;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ProductFlagValue(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            type_ = rawValue;
-            break;
-          }
-          case 16: {
-
-            value_ = input.readBool();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagValue_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagValue_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.ProductFlagValue.class, io.bloombox.schema.product.struct.ProductFlagValue.Builder.class);
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_;
-  /**
-   * <code>.ProductFlag type = 1;</code>
-   */
-  public int getTypeValue() {
-    return type_;
-  }
-  /**
-   * <code>.ProductFlag type = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.ProductFlag getType() {
-    io.bloombox.schema.product.struct.ProductFlag result = io.bloombox.schema.product.struct.ProductFlag.valueOf(type_);
-    return result == null ? io.bloombox.schema.product.struct.ProductFlag.UNRECOGNIZED : result;
-  }
-
-  public static final int VALUE_FIELD_NUMBER = 2;
-  private boolean value_;
-  /**
-   * <code>bool value = 2;</code>
-   */
-  public boolean getValue() {
-    return value_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (type_ != io.bloombox.schema.product.struct.ProductFlag.VISIBLE.getNumber()) {
-      output.writeEnum(1, type_);
-    }
-    if (value_ != false) {
-      output.writeBool(2, value_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (type_ != io.bloombox.schema.product.struct.ProductFlag.VISIBLE.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, type_);
-    }
-    if (value_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(2, value_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.ProductFlagValue)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.ProductFlagValue other = (io.bloombox.schema.product.struct.ProductFlagValue) obj;
-
-    boolean result = true;
-    result = result && type_ == other.type_;
-    result = result && (getValue()
-        == other.getValue());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TYPE_FIELD_NUMBER;
-    hash = (53 * hash) + type_;
-    hash = (37 * hash) + VALUE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getValue());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagValue parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.ProductFlagValue prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code ProductFlagValue}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ProductFlagValue)
-      io.bloombox.schema.product.struct.ProductFlagValueOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagValue_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagValue_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.ProductFlagValue.class, io.bloombox.schema.product.struct.ProductFlagValue.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.ProductFlagValue.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      type_ = 0;
-
-      value_ = false;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagValue_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.ProductFlagValue getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.ProductFlagValue.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.ProductFlagValue build() {
-      io.bloombox.schema.product.struct.ProductFlagValue result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.ProductFlagValue buildPartial() {
-      io.bloombox.schema.product.struct.ProductFlagValue result = new io.bloombox.schema.product.struct.ProductFlagValue(this);
-      result.type_ = type_;
-      result.value_ = value_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.ProductFlagValue) {
-        return mergeFrom((io.bloombox.schema.product.struct.ProductFlagValue)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.ProductFlagValue other) {
-      if (other == io.bloombox.schema.product.struct.ProductFlagValue.getDefaultInstance()) return this;
-      if (other.type_ != 0) {
-        setTypeValue(other.getTypeValue());
-      }
-      if (other.getValue() != false) {
-        setValue(other.getValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.ProductFlagValue parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.ProductFlagValue) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int type_ = 0;
-    /**
-     * <code>.ProductFlag type = 1;</code>
-     */
-    public int getTypeValue() {
-      return type_;
-    }
-    /**
-     * <code>.ProductFlag type = 1;</code>
-     */
-    public Builder setTypeValue(int value) {
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.ProductFlag type = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductFlag getType() {
-      io.bloombox.schema.product.struct.ProductFlag result = io.bloombox.schema.product.struct.ProductFlag.valueOf(type_);
-      return result == null ? io.bloombox.schema.product.struct.ProductFlag.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.ProductFlag type = 1;</code>
-     */
-    public Builder setType(io.bloombox.schema.product.struct.ProductFlag value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      type_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.ProductFlag type = 1;</code>
-     */
-    public Builder clearType() {
-      
-      type_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private boolean value_ ;
-    /**
-     * <code>bool value = 2;</code>
-     */
-    public boolean getValue() {
-      return value_;
-    }
-    /**
-     * <code>bool value = 2;</code>
-     */
-    public Builder setValue(boolean value) {
-      
-      value_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool value = 2;</code>
-     */
-    public Builder clearValue() {
-      
-      value_ = false;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ProductFlagValue)
-  }
-
-  // @@protoc_insertion_point(class_scope:ProductFlagValue)
-  private static final io.bloombox.schema.product.struct.ProductFlagValue DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.ProductFlagValue();
-  }
-
-  public static io.bloombox.schema.product.struct.ProductFlagValue getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ProductFlagValue>
-      PARSER = new com.google.protobuf.AbstractParser<ProductFlagValue>() {
-    public ProductFlagValue parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductFlagValue(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ProductFlagValue> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ProductFlagValue> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.ProductFlagValue getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductFlagValueOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/ProductFlagValueOrBuilder.java
deleted file mode 100644
index 637625d..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductFlagValueOrBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface ProductFlagValueOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ProductFlagValue)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.ProductFlag type = 1;</code>
-   */
-  int getTypeValue();
-  /**
-   * <code>.ProductFlag type = 1;</code>
-   */
-  io.bloombox.schema.product.struct.ProductFlag getType();
-
-  /**
-   * <code>bool value = 2;</code>
-   */
-  boolean getValue();
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductFlagset.java b/languages/java/io/bloombox/schema/product/struct/ProductFlagset.java
deleted file mode 100644
index 4506bc7..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductFlagset.java
+++ /dev/null
@@ -1,731 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code ProductFlagset}
- */
-public  final class ProductFlagset extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ProductFlagset)
-    ProductFlagsetOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ProductFlagset.newBuilder() to construct.
-  private ProductFlagset(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ProductFlagset() {
-    flags_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ProductFlagset(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              flags_ = new java.util.ArrayList<io.bloombox.schema.product.struct.ProductFlagValue>();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            flags_.add(
-                input.readMessage(io.bloombox.schema.product.struct.ProductFlagValue.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        flags_ = java.util.Collections.unmodifiableList(flags_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagset_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagset_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.ProductFlagset.class, io.bloombox.schema.product.struct.ProductFlagset.Builder.class);
-  }
-
-  public static final int FLAGS_FIELD_NUMBER = 1;
-  private java.util.List<io.bloombox.schema.product.struct.ProductFlagValue> flags_;
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  public java.util.List<io.bloombox.schema.product.struct.ProductFlagValue> getFlagsList() {
-    return flags_;
-  }
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  public java.util.List<? extends io.bloombox.schema.product.struct.ProductFlagValueOrBuilder> 
-      getFlagsOrBuilderList() {
-    return flags_;
-  }
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  public int getFlagsCount() {
-    return flags_.size();
-  }
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.ProductFlagValue getFlags(int index) {
-    return flags_.get(index);
-  }
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.ProductFlagValueOrBuilder getFlagsOrBuilder(
-      int index) {
-    return flags_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < flags_.size(); i++) {
-      output.writeMessage(1, flags_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < flags_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, flags_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.ProductFlagset)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.ProductFlagset other = (io.bloombox.schema.product.struct.ProductFlagset) obj;
-
-    boolean result = true;
-    result = result && getFlagsList()
-        .equals(other.getFlagsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getFlagsCount() > 0) {
-      hash = (37 * hash) + FLAGS_FIELD_NUMBER;
-      hash = (53 * hash) + getFlagsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductFlagset parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.ProductFlagset prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code ProductFlagset}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ProductFlagset)
-      io.bloombox.schema.product.struct.ProductFlagsetOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagset_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagset_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.ProductFlagset.class, io.bloombox.schema.product.struct.ProductFlagset.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.ProductFlagset.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getFlagsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (flagsBuilder_ == null) {
-        flags_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        flagsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.BaseStructs.internal_static_ProductFlagset_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.ProductFlagset getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.ProductFlagset.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.ProductFlagset build() {
-      io.bloombox.schema.product.struct.ProductFlagset result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.ProductFlagset buildPartial() {
-      io.bloombox.schema.product.struct.ProductFlagset result = new io.bloombox.schema.product.struct.ProductFlagset(this);
-      int from_bitField0_ = bitField0_;
-      if (flagsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          flags_ = java.util.Collections.unmodifiableList(flags_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.flags_ = flags_;
-      } else {
-        result.flags_ = flagsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.ProductFlagset) {
-        return mergeFrom((io.bloombox.schema.product.struct.ProductFlagset)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.ProductFlagset other) {
-      if (other == io.bloombox.schema.product.struct.ProductFlagset.getDefaultInstance()) return this;
-      if (flagsBuilder_ == null) {
-        if (!other.flags_.isEmpty()) {
-          if (flags_.isEmpty()) {
-            flags_ = other.flags_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureFlagsIsMutable();
-            flags_.addAll(other.flags_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.flags_.isEmpty()) {
-          if (flagsBuilder_.isEmpty()) {
-            flagsBuilder_.dispose();
-            flagsBuilder_ = null;
-            flags_ = other.flags_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            flagsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFlagsFieldBuilder() : null;
-          } else {
-            flagsBuilder_.addAllMessages(other.flags_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.ProductFlagset parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.ProductFlagset) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List<io.bloombox.schema.product.struct.ProductFlagValue> flags_ =
-      java.util.Collections.emptyList();
-    private void ensureFlagsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        flags_ = new java.util.ArrayList<io.bloombox.schema.product.struct.ProductFlagValue>(flags_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.ProductFlagValue, io.bloombox.schema.product.struct.ProductFlagValue.Builder, io.bloombox.schema.product.struct.ProductFlagValueOrBuilder> flagsBuilder_;
-
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.ProductFlagValue> getFlagsList() {
-      if (flagsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(flags_);
-      } else {
-        return flagsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public int getFlagsCount() {
-      if (flagsBuilder_ == null) {
-        return flags_.size();
-      } else {
-        return flagsBuilder_.getCount();
-      }
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductFlagValue getFlags(int index) {
-      if (flagsBuilder_ == null) {
-        return flags_.get(index);
-      } else {
-        return flagsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder setFlags(
-        int index, io.bloombox.schema.product.struct.ProductFlagValue value) {
-      if (flagsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFlagsIsMutable();
-        flags_.set(index, value);
-        onChanged();
-      } else {
-        flagsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder setFlags(
-        int index, io.bloombox.schema.product.struct.ProductFlagValue.Builder builderForValue) {
-      if (flagsBuilder_ == null) {
-        ensureFlagsIsMutable();
-        flags_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        flagsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder addFlags(io.bloombox.schema.product.struct.ProductFlagValue value) {
-      if (flagsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFlagsIsMutable();
-        flags_.add(value);
-        onChanged();
-      } else {
-        flagsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder addFlags(
-        int index, io.bloombox.schema.product.struct.ProductFlagValue value) {
-      if (flagsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFlagsIsMutable();
-        flags_.add(index, value);
-        onChanged();
-      } else {
-        flagsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder addFlags(
-        io.bloombox.schema.product.struct.ProductFlagValue.Builder builderForValue) {
-      if (flagsBuilder_ == null) {
-        ensureFlagsIsMutable();
-        flags_.add(builderForValue.build());
-        onChanged();
-      } else {
-        flagsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder addFlags(
-        int index, io.bloombox.schema.product.struct.ProductFlagValue.Builder builderForValue) {
-      if (flagsBuilder_ == null) {
-        ensureFlagsIsMutable();
-        flags_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        flagsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder addAllFlags(
-        java.lang.Iterable<? extends io.bloombox.schema.product.struct.ProductFlagValue> values) {
-      if (flagsBuilder_ == null) {
-        ensureFlagsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, flags_);
-        onChanged();
-      } else {
-        flagsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder clearFlags() {
-      if (flagsBuilder_ == null) {
-        flags_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        flagsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public Builder removeFlags(int index) {
-      if (flagsBuilder_ == null) {
-        ensureFlagsIsMutable();
-        flags_.remove(index);
-        onChanged();
-      } else {
-        flagsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductFlagValue.Builder getFlagsBuilder(
-        int index) {
-      return getFlagsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductFlagValueOrBuilder getFlagsOrBuilder(
-        int index) {
-      if (flagsBuilder_ == null) {
-        return flags_.get(index);  } else {
-        return flagsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public java.util.List<? extends io.bloombox.schema.product.struct.ProductFlagValueOrBuilder> 
-         getFlagsOrBuilderList() {
-      if (flagsBuilder_ != null) {
-        return flagsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(flags_);
-      }
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductFlagValue.Builder addFlagsBuilder() {
-      return getFlagsFieldBuilder().addBuilder(
-          io.bloombox.schema.product.struct.ProductFlagValue.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.ProductFlagValue.Builder addFlagsBuilder(
-        int index) {
-      return getFlagsFieldBuilder().addBuilder(
-          index, io.bloombox.schema.product.struct.ProductFlagValue.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.ProductFlagValue.Builder> 
-         getFlagsBuilderList() {
-      return getFlagsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.ProductFlagValue, io.bloombox.schema.product.struct.ProductFlagValue.Builder, io.bloombox.schema.product.struct.ProductFlagValueOrBuilder> 
-        getFlagsFieldBuilder() {
-      if (flagsBuilder_ == null) {
-        flagsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            io.bloombox.schema.product.struct.ProductFlagValue, io.bloombox.schema.product.struct.ProductFlagValue.Builder, io.bloombox.schema.product.struct.ProductFlagValueOrBuilder>(
-                flags_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        flags_ = null;
-      }
-      return flagsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ProductFlagset)
-  }
-
-  // @@protoc_insertion_point(class_scope:ProductFlagset)
-  private static final io.bloombox.schema.product.struct.ProductFlagset DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.ProductFlagset();
-  }
-
-  public static io.bloombox.schema.product.struct.ProductFlagset getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ProductFlagset>
-      PARSER = new com.google.protobuf.AbstractParser<ProductFlagset>() {
-    public ProductFlagset parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductFlagset(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ProductFlagset> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ProductFlagset> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.ProductFlagset getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductFlagsetOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/ProductFlagsetOrBuilder.java
deleted file mode 100644
index 89e7688..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductFlagsetOrBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface ProductFlagsetOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ProductFlagset)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  java.util.List<io.bloombox.schema.product.struct.ProductFlagValue> 
-      getFlagsList();
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  io.bloombox.schema.product.struct.ProductFlagValue getFlags(int index);
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  int getFlagsCount();
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  java.util.List<? extends io.bloombox.schema.product.struct.ProductFlagValueOrBuilder> 
-      getFlagsOrBuilderList();
-  /**
-   * <code>repeated .ProductFlagValue flags = 1;</code>
-   */
-  io.bloombox.schema.product.struct.ProductFlagValueOrBuilder getFlagsOrBuilder(
-      int index);
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductPricing.java b/languages/java/io/bloombox/schema/product/struct/ProductPricing.java
deleted file mode 100644
index ddd9487..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductPricing.java
+++ /dev/null
@@ -1,1082 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * <pre>
- * -- Pricing: Product-level Object
- * </pre>
- *
- * Protobuf type {@code ProductPricing}
- */
-public  final class ProductPricing extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:ProductPricing)
-    ProductPricingOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ProductPricing.newBuilder() to construct.
-  private ProductPricing(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ProductPricing() {
-    discounts_ = java.util.Collections.emptyList();
-    manifest_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ProductPricing(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              discounts_ = new java.util.ArrayList<io.bloombox.schema.product.struct.SaleDescriptor>();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            discounts_.add(
-                input.readMessage(io.bloombox.schema.product.struct.SaleDescriptor.parser(), extensionRegistry));
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              manifest_ = new java.util.ArrayList<io.bloombox.schema.product.struct.PricingDescriptor>();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            manifest_.add(
-                input.readMessage(io.bloombox.schema.product.struct.PricingDescriptor.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        discounts_ = java.util.Collections.unmodifiableList(discounts_);
-      }
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        manifest_ = java.util.Collections.unmodifiableList(manifest_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_ProductPricing_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_ProductPricing_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.ProductPricing.class, io.bloombox.schema.product.struct.ProductPricing.Builder.class);
-  }
-
-  public static final int DISCOUNTS_FIELD_NUMBER = 1;
-  private java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> discounts_;
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  public java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> getDiscountsList() {
-    return discounts_;
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  public java.util.List<? extends io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-      getDiscountsOrBuilderList() {
-    return discounts_;
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  public int getDiscountsCount() {
-    return discounts_.size();
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.SaleDescriptor getDiscounts(int index) {
-    return discounts_.get(index);
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.SaleDescriptorOrBuilder getDiscountsOrBuilder(
-      int index) {
-    return discounts_.get(index);
-  }
-
-  public static final int MANIFEST_FIELD_NUMBER = 2;
-  private java.util.List<io.bloombox.schema.product.struct.PricingDescriptor> manifest_;
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  public java.util.List<io.bloombox.schema.product.struct.PricingDescriptor> getManifestList() {
-    return manifest_;
-  }
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  public java.util.List<? extends io.bloombox.schema.product.struct.PricingDescriptorOrBuilder> 
-      getManifestOrBuilderList() {
-    return manifest_;
-  }
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  public int getManifestCount() {
-    return manifest_.size();
-  }
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.PricingDescriptor getManifest(int index) {
-    return manifest_.get(index);
-  }
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.PricingDescriptorOrBuilder getManifestOrBuilder(
-      int index) {
-    return manifest_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < discounts_.size(); i++) {
-      output.writeMessage(1, discounts_.get(i));
-    }
-    for (int i = 0; i < manifest_.size(); i++) {
-      output.writeMessage(2, manifest_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < discounts_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, discounts_.get(i));
-    }
-    for (int i = 0; i < manifest_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, manifest_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.ProductPricing)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.ProductPricing other = (io.bloombox.schema.product.struct.ProductPricing) obj;
-
-    boolean result = true;
-    result = result && getDiscountsList()
-        .equals(other.getDiscountsList());
-    result = result && getManifestList()
-        .equals(other.getManifestList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getDiscountsCount() > 0) {
-      hash = (37 * hash) + DISCOUNTS_FIELD_NUMBER;
-      hash = (53 * hash) + getDiscountsList().hashCode();
-    }
-    if (getManifestCount() > 0) {
-      hash = (37 * hash) + MANIFEST_FIELD_NUMBER;
-      hash = (53 * hash) + getManifestList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.ProductPricing parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.ProductPricing prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Pricing: Product-level Object
-   * </pre>
-   *
-   * Protobuf type {@code ProductPricing}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:ProductPricing)
-      io.bloombox.schema.product.struct.ProductPricingOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_ProductPricing_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_ProductPricing_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.ProductPricing.class, io.bloombox.schema.product.struct.ProductPricing.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.ProductPricing.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getDiscountsFieldBuilder();
-        getManifestFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (discountsBuilder_ == null) {
-        discounts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        discountsBuilder_.clear();
-      }
-      if (manifestBuilder_ == null) {
-        manifest_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        manifestBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_ProductPricing_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.ProductPricing getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.ProductPricing build() {
-      io.bloombox.schema.product.struct.ProductPricing result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.ProductPricing buildPartial() {
-      io.bloombox.schema.product.struct.ProductPricing result = new io.bloombox.schema.product.struct.ProductPricing(this);
-      int from_bitField0_ = bitField0_;
-      if (discountsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          discounts_ = java.util.Collections.unmodifiableList(discounts_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.discounts_ = discounts_;
-      } else {
-        result.discounts_ = discountsBuilder_.build();
-      }
-      if (manifestBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          manifest_ = java.util.Collections.unmodifiableList(manifest_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.manifest_ = manifest_;
-      } else {
-        result.manifest_ = manifestBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.ProductPricing) {
-        return mergeFrom((io.bloombox.schema.product.struct.ProductPricing)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.ProductPricing other) {
-      if (other == io.bloombox.schema.product.struct.ProductPricing.getDefaultInstance()) return this;
-      if (discountsBuilder_ == null) {
-        if (!other.discounts_.isEmpty()) {
-          if (discounts_.isEmpty()) {
-            discounts_ = other.discounts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureDiscountsIsMutable();
-            discounts_.addAll(other.discounts_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.discounts_.isEmpty()) {
-          if (discountsBuilder_.isEmpty()) {
-            discountsBuilder_.dispose();
-            discountsBuilder_ = null;
-            discounts_ = other.discounts_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            discountsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getDiscountsFieldBuilder() : null;
-          } else {
-            discountsBuilder_.addAllMessages(other.discounts_);
-          }
-        }
-      }
-      if (manifestBuilder_ == null) {
-        if (!other.manifest_.isEmpty()) {
-          if (manifest_.isEmpty()) {
-            manifest_ = other.manifest_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureManifestIsMutable();
-            manifest_.addAll(other.manifest_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.manifest_.isEmpty()) {
-          if (manifestBuilder_.isEmpty()) {
-            manifestBuilder_.dispose();
-            manifestBuilder_ = null;
-            manifest_ = other.manifest_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            manifestBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getManifestFieldBuilder() : null;
-          } else {
-            manifestBuilder_.addAllMessages(other.manifest_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.ProductPricing parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.ProductPricing) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> discounts_ =
-      java.util.Collections.emptyList();
-    private void ensureDiscountsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        discounts_ = new java.util.ArrayList<io.bloombox.schema.product.struct.SaleDescriptor>(discounts_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.SaleDescriptor, io.bloombox.schema.product.struct.SaleDescriptor.Builder, io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> discountsBuilder_;
-
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> getDiscountsList() {
-      if (discountsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(discounts_);
-      } else {
-        return discountsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public int getDiscountsCount() {
-      if (discountsBuilder_ == null) {
-        return discounts_.size();
-      } else {
-        return discountsBuilder_.getCount();
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor getDiscounts(int index) {
-      if (discountsBuilder_ == null) {
-        return discounts_.get(index);
-      } else {
-        return discountsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder setDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor value) {
-      if (discountsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureDiscountsIsMutable();
-        discounts_.set(index, value);
-        onChanged();
-      } else {
-        discountsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder setDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor.Builder builderForValue) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        discountsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder addDiscounts(io.bloombox.schema.product.struct.SaleDescriptor value) {
-      if (discountsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureDiscountsIsMutable();
-        discounts_.add(value);
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder addDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor value) {
-      if (discountsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureDiscountsIsMutable();
-        discounts_.add(index, value);
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder addDiscounts(
-        io.bloombox.schema.product.struct.SaleDescriptor.Builder builderForValue) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.add(builderForValue.build());
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder addDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor.Builder builderForValue) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder addAllDiscounts(
-        java.lang.Iterable<? extends io.bloombox.schema.product.struct.SaleDescriptor> values) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, discounts_);
-        onChanged();
-      } else {
-        discountsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder clearDiscounts() {
-      if (discountsBuilder_ == null) {
-        discounts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        discountsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public Builder removeDiscounts(int index) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.remove(index);
-        onChanged();
-      } else {
-        discountsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor.Builder getDiscountsBuilder(
-        int index) {
-      return getDiscountsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptorOrBuilder getDiscountsOrBuilder(
-        int index) {
-      if (discountsBuilder_ == null) {
-        return discounts_.get(index);  } else {
-        return discountsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public java.util.List<? extends io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-         getDiscountsOrBuilderList() {
-      if (discountsBuilder_ != null) {
-        return discountsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(discounts_);
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor.Builder addDiscountsBuilder() {
-      return getDiscountsFieldBuilder().addBuilder(
-          io.bloombox.schema.product.struct.SaleDescriptor.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor.Builder addDiscountsBuilder(
-        int index) {
-      return getDiscountsFieldBuilder().addBuilder(
-          index, io.bloombox.schema.product.struct.SaleDescriptor.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.SaleDescriptor.Builder> 
-         getDiscountsBuilderList() {
-      return getDiscountsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.SaleDescriptor, io.bloombox.schema.product.struct.SaleDescriptor.Builder, io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-        getDiscountsFieldBuilder() {
-      if (discountsBuilder_ == null) {
-        discountsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            io.bloombox.schema.product.struct.SaleDescriptor, io.bloombox.schema.product.struct.SaleDescriptor.Builder, io.bloombox.schema.product.struct.SaleDescriptorOrBuilder>(
-                discounts_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        discounts_ = null;
-      }
-      return discountsBuilder_;
-    }
-
-    private java.util.List<io.bloombox.schema.product.struct.PricingDescriptor> manifest_ =
-      java.util.Collections.emptyList();
-    private void ensureManifestIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        manifest_ = new java.util.ArrayList<io.bloombox.schema.product.struct.PricingDescriptor>(manifest_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.PricingDescriptor, io.bloombox.schema.product.struct.PricingDescriptor.Builder, io.bloombox.schema.product.struct.PricingDescriptorOrBuilder> manifestBuilder_;
-
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.PricingDescriptor> getManifestList() {
-      if (manifestBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(manifest_);
-      } else {
-        return manifestBuilder_.getMessageList();
-      }
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public int getManifestCount() {
-      if (manifestBuilder_ == null) {
-        return manifest_.size();
-      } else {
-        return manifestBuilder_.getCount();
-      }
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingDescriptor getManifest(int index) {
-      if (manifestBuilder_ == null) {
-        return manifest_.get(index);
-      } else {
-        return manifestBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder setManifest(
-        int index, io.bloombox.schema.product.struct.PricingDescriptor value) {
-      if (manifestBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureManifestIsMutable();
-        manifest_.set(index, value);
-        onChanged();
-      } else {
-        manifestBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder setManifest(
-        int index, io.bloombox.schema.product.struct.PricingDescriptor.Builder builderForValue) {
-      if (manifestBuilder_ == null) {
-        ensureManifestIsMutable();
-        manifest_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        manifestBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder addManifest(io.bloombox.schema.product.struct.PricingDescriptor value) {
-      if (manifestBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureManifestIsMutable();
-        manifest_.add(value);
-        onChanged();
-      } else {
-        manifestBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder addManifest(
-        int index, io.bloombox.schema.product.struct.PricingDescriptor value) {
-      if (manifestBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureManifestIsMutable();
-        manifest_.add(index, value);
-        onChanged();
-      } else {
-        manifestBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder addManifest(
-        io.bloombox.schema.product.struct.PricingDescriptor.Builder builderForValue) {
-      if (manifestBuilder_ == null) {
-        ensureManifestIsMutable();
-        manifest_.add(builderForValue.build());
-        onChanged();
-      } else {
-        manifestBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder addManifest(
-        int index, io.bloombox.schema.product.struct.PricingDescriptor.Builder builderForValue) {
-      if (manifestBuilder_ == null) {
-        ensureManifestIsMutable();
-        manifest_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        manifestBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder addAllManifest(
-        java.lang.Iterable<? extends io.bloombox.schema.product.struct.PricingDescriptor> values) {
-      if (manifestBuilder_ == null) {
-        ensureManifestIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, manifest_);
-        onChanged();
-      } else {
-        manifestBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder clearManifest() {
-      if (manifestBuilder_ == null) {
-        manifest_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        manifestBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public Builder removeManifest(int index) {
-      if (manifestBuilder_ == null) {
-        ensureManifestIsMutable();
-        manifest_.remove(index);
-        onChanged();
-      } else {
-        manifestBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingDescriptor.Builder getManifestBuilder(
-        int index) {
-      return getManifestFieldBuilder().getBuilder(index);
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingDescriptorOrBuilder getManifestOrBuilder(
-        int index) {
-      if (manifestBuilder_ == null) {
-        return manifest_.get(index);  } else {
-        return manifestBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public java.util.List<? extends io.bloombox.schema.product.struct.PricingDescriptorOrBuilder> 
-         getManifestOrBuilderList() {
-      if (manifestBuilder_ != null) {
-        return manifestBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(manifest_);
-      }
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingDescriptor.Builder addManifestBuilder() {
-      return getManifestFieldBuilder().addBuilder(
-          io.bloombox.schema.product.struct.PricingDescriptor.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingDescriptor.Builder addManifestBuilder(
-        int index) {
-      return getManifestFieldBuilder().addBuilder(
-          index, io.bloombox.schema.product.struct.PricingDescriptor.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.PricingDescriptor.Builder> 
-         getManifestBuilderList() {
-      return getManifestFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.PricingDescriptor, io.bloombox.schema.product.struct.PricingDescriptor.Builder, io.bloombox.schema.product.struct.PricingDescriptorOrBuilder> 
-        getManifestFieldBuilder() {
-      if (manifestBuilder_ == null) {
-        manifestBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            io.bloombox.schema.product.struct.PricingDescriptor, io.bloombox.schema.product.struct.PricingDescriptor.Builder, io.bloombox.schema.product.struct.PricingDescriptorOrBuilder>(
-                manifest_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        manifest_ = null;
-      }
-      return manifestBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:ProductPricing)
-  }
-
-  // @@protoc_insertion_point(class_scope:ProductPricing)
-  private static final io.bloombox.schema.product.struct.ProductPricing DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.ProductPricing();
-  }
-
-  public static io.bloombox.schema.product.struct.ProductPricing getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ProductPricing>
-      PARSER = new com.google.protobuf.AbstractParser<ProductPricing>() {
-    public ProductPricing parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductPricing(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ProductPricing> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ProductPricing> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.ProductPricing getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductPricingOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/ProductPricingOrBuilder.java
deleted file mode 100644
index 22e2da5..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductPricingOrBuilder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface ProductPricingOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:ProductPricing)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> 
-      getDiscountsList();
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  io.bloombox.schema.product.struct.SaleDescriptor getDiscounts(int index);
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  int getDiscountsCount();
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  java.util.List<? extends io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-      getDiscountsOrBuilderList();
-  /**
-   * <code>repeated .SaleDescriptor discounts = 1;</code>
-   */
-  io.bloombox.schema.product.struct.SaleDescriptorOrBuilder getDiscountsOrBuilder(
-      int index);
-
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  java.util.List<io.bloombox.schema.product.struct.PricingDescriptor> 
-      getManifestList();
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  io.bloombox.schema.product.struct.PricingDescriptor getManifest(int index);
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  int getManifestCount();
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  java.util.List<? extends io.bloombox.schema.product.struct.PricingDescriptorOrBuilder> 
-      getManifestOrBuilderList();
-  /**
-   * <code>repeated .PricingDescriptor manifest = 2;</code>
-   */
-  io.bloombox.schema.product.struct.PricingDescriptorOrBuilder getManifestOrBuilder(
-      int index);
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/ProductPricingSpec.java b/languages/java/io/bloombox/schema/product/struct/ProductPricingSpec.java
deleted file mode 100644
index 9424510..0000000
--- a/languages/java/io/bloombox/schema/product/struct/ProductPricingSpec.java
+++ /dev/null
@@ -1,134 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class ProductPricingSpec {
-  private ProductPricingSpec() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_PricingTierAvailability_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PricingTierAvailability_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_UnitPricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_UnitPricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_WeightedPricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_WeightedPricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_FreebiePricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_FreebiePricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_PricingDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PricingDescriptor_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProductPricing_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ProductPricing_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\'structs/pricing/PricingDescriptor.prot" +
-      "o\032$structs/pricing/SaleDescriptor.proto\"" +
-      "=\n\027PricingTierAvailability\022\017\n\007offered\030\001 " +
-      "\001(\010\022\021\n\tavailable\030\002 \001(\010\"z\n\025UnitPricingDes" +
-      "criptor\022\023\n\013price_value\030\001 \001(\002\022(\n\006status\030\002" +
-      " \001(\0132\030.PricingTierAvailability\022\"\n\tdiscou" +
-      "nts\030\003 \003(\0132\017.SaleDescriptor\"|\n\031WeightedPr" +
-      "icingDescriptor\022\"\n\006weight\030\001 \001(\0162\022.Pricin" +
-      "gWeightTier\022$\n\004tier\030\002 \001(\0132\026.UnitPricingD" +
-      "escriptor\022\025\n\rweightInGrams\030\003 \001(\002\"\032\n\030Free",
-      "biePricingDescriptor\"\257\001\n\021PricingDescript" +
-      "or\022\032\n\004type\030\001 \001(\0162\014.PricingType\022$\n\004unit\030\024" +
-      " \001(\0132\026.UnitPricingDescriptor\022,\n\010weighted" +
-      "\030\025 \001(\0132\032.WeightedPricingDescriptor\022*\n\007fr" +
-      "eebie\030\026 \001(\0132\031.FreebiePricingDescriptor\"Z" +
-      "\n\016ProductPricing\022\"\n\tdiscounts\030\001 \003(\0132\017.Sa" +
-      "leDescriptor\022$\n\010manifest\030\002 \003(\0132\022.Pricing" +
-      "Descriptor*2\n\013PricingType\022\010\n\004UNIT\020\000\022\014\n\010W" +
-      "EIGHTED\020\001\022\013\n\007FREEBIE\020\002*\211\001\n\021PricingWeight" +
-      "Tier\022\t\n\005OTHER\020\000\022\010\n\004GRAM\020\001\022\014\n\010HALFGRAM\020\002\022",
-      "\017\n\013QUARTERGRAM\020\003\022\007\n\003DUB\020\004\022\n\n\006EIGHTH\020\005\022\013\n" +
-      "\007QUARTER\020\006\022\010\n\004HALF\020\007\022\t\n\005OUNCE\020\010\022\t\n\005POUND" +
-      "\020\tB>\n!io.bloombox.schema.product.structB" +
-      "\022ProductPricingSpecH\001P\001\370\001\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          io.bloombox.schema.product.struct.ProductDiscount.getDescriptor(),
-        }, assigner);
-    internal_static_PricingTierAvailability_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_PricingTierAvailability_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PricingTierAvailability_descriptor,
-        new java.lang.String[] { "Offered", "Available", });
-    internal_static_UnitPricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_UnitPricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_UnitPricingDescriptor_descriptor,
-        new java.lang.String[] { "PriceValue", "Status", "Discounts", });
-    internal_static_WeightedPricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_WeightedPricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_WeightedPricingDescriptor_descriptor,
-        new java.lang.String[] { "Weight", "Tier", "WeightInGrams", });
-    internal_static_FreebiePricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_FreebiePricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_FreebiePricingDescriptor_descriptor,
-        new java.lang.String[] { });
-    internal_static_PricingDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(4);
-    internal_static_PricingDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PricingDescriptor_descriptor,
-        new java.lang.String[] { "Type", "Unit", "Weighted", "Freebie", });
-    internal_static_ProductPricing_descriptor =
-      getDescriptor().getMessageTypes().get(5);
-    internal_static_ProductPricing_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ProductPricing_descriptor,
-        new java.lang.String[] { "Discounts", "Manifest", });
-    io.bloombox.schema.product.struct.ProductDiscount.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/SaleDescriptor.java b/languages/java/io/bloombox/schema/product/struct/SaleDescriptor.java
deleted file mode 100644
index 1e50c4e..0000000
--- a/languages/java/io/bloombox/schema/product/struct/SaleDescriptor.java
+++ /dev/null
@@ -1,921 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code SaleDescriptor}
- */
-public  final class SaleDescriptor extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:SaleDescriptor)
-    SaleDescriptorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use SaleDescriptor.newBuilder() to construct.
-  private SaleDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private SaleDescriptor() {
-    type_ = 0;
-    effective_ = 0L;
-    expiration_ = 0L;
-    percentageAmount_ = 0;
-    bogoTrigger_ = 0;
-    bogoReward_ = 0;
-    loyaltyTrigger_ = 0;
-    loyaltyReward_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private SaleDescriptor(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            type_ = rawValue;
-            break;
-          }
-          case 16: {
-
-            effective_ = input.readUInt64();
-            break;
-          }
-          case 24: {
-
-            expiration_ = input.readUInt64();
-            break;
-          }
-          case 160: {
-
-            percentageAmount_ = input.readUInt32();
-            break;
-          }
-          case 168: {
-
-            bogoTrigger_ = input.readUInt32();
-            break;
-          }
-          case 176: {
-
-            bogoReward_ = input.readUInt32();
-            break;
-          }
-          case 184: {
-
-            loyaltyTrigger_ = input.readUInt32();
-            break;
-          }
-          case 192: {
-
-            loyaltyReward_ = input.readUInt32();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductDiscount.internal_static_SaleDescriptor_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductDiscount.internal_static_SaleDescriptor_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.SaleDescriptor.class, io.bloombox.schema.product.struct.SaleDescriptor.Builder.class);
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_;
-  /**
-   * <pre>
-   * sale metadata
-   * </pre>
-   *
-   * <code>.SaleType type = 1;</code>
-   */
-  public int getTypeValue() {
-    return type_;
-  }
-  /**
-   * <pre>
-   * sale metadata
-   * </pre>
-   *
-   * <code>.SaleType type = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.SaleType getType() {
-    io.bloombox.schema.product.struct.SaleType result = io.bloombox.schema.product.struct.SaleType.valueOf(type_);
-    return result == null ? io.bloombox.schema.product.struct.SaleType.UNRECOGNIZED : result;
-  }
-
-  public static final int EFFECTIVE_FIELD_NUMBER = 2;
-  private long effective_;
-  /**
-   * <code>uint64 effective = 2;</code>
-   */
-  public long getEffective() {
-    return effective_;
-  }
-
-  public static final int EXPIRATION_FIELD_NUMBER = 3;
-  private long expiration_;
-  /**
-   * <code>uint64 expiration = 3;</code>
-   */
-  public long getExpiration() {
-    return expiration_;
-  }
-
-  public static final int PERCENTAGE_AMOUNT_FIELD_NUMBER = 20;
-  private int percentageAmount_;
-  /**
-   * <pre>
-   * sale amount and trigger properties
-   * </pre>
-   *
-   * <code>uint32 percentage_amount = 20;</code>
-   */
-  public int getPercentageAmount() {
-    return percentageAmount_;
-  }
-
-  public static final int BOGO_TRIGGER_FIELD_NUMBER = 21;
-  private int bogoTrigger_;
-  /**
-   * <code>uint32 bogo_trigger = 21;</code>
-   */
-  public int getBogoTrigger() {
-    return bogoTrigger_;
-  }
-
-  public static final int BOGO_REWARD_FIELD_NUMBER = 22;
-  private int bogoReward_;
-  /**
-   * <code>uint32 bogo_reward = 22;</code>
-   */
-  public int getBogoReward() {
-    return bogoReward_;
-  }
-
-  public static final int LOYALTY_TRIGGER_FIELD_NUMBER = 23;
-  private int loyaltyTrigger_;
-  /**
-   * <code>uint32 loyalty_trigger = 23;</code>
-   */
-  public int getLoyaltyTrigger() {
-    return loyaltyTrigger_;
-  }
-
-  public static final int LOYALTY_REWARD_FIELD_NUMBER = 24;
-  private int loyaltyReward_;
-  /**
-   * <code>uint32 loyalty_reward = 24;</code>
-   */
-  public int getLoyaltyReward() {
-    return loyaltyReward_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (type_ != io.bloombox.schema.product.struct.SaleType.PERCENTAGE.getNumber()) {
-      output.writeEnum(1, type_);
-    }
-    if (effective_ != 0L) {
-      output.writeUInt64(2, effective_);
-    }
-    if (expiration_ != 0L) {
-      output.writeUInt64(3, expiration_);
-    }
-    if (percentageAmount_ != 0) {
-      output.writeUInt32(20, percentageAmount_);
-    }
-    if (bogoTrigger_ != 0) {
-      output.writeUInt32(21, bogoTrigger_);
-    }
-    if (bogoReward_ != 0) {
-      output.writeUInt32(22, bogoReward_);
-    }
-    if (loyaltyTrigger_ != 0) {
-      output.writeUInt32(23, loyaltyTrigger_);
-    }
-    if (loyaltyReward_ != 0) {
-      output.writeUInt32(24, loyaltyReward_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (type_ != io.bloombox.schema.product.struct.SaleType.PERCENTAGE.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, type_);
-    }
-    if (effective_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt64Size(2, effective_);
-    }
-    if (expiration_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt64Size(3, expiration_);
-    }
-    if (percentageAmount_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt32Size(20, percentageAmount_);
-    }
-    if (bogoTrigger_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt32Size(21, bogoTrigger_);
-    }
-    if (bogoReward_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt32Size(22, bogoReward_);
-    }
-    if (loyaltyTrigger_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt32Size(23, loyaltyTrigger_);
-    }
-    if (loyaltyReward_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeUInt32Size(24, loyaltyReward_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.SaleDescriptor)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.SaleDescriptor other = (io.bloombox.schema.product.struct.SaleDescriptor) obj;
-
-    boolean result = true;
-    result = result && type_ == other.type_;
-    result = result && (getEffective()
-        == other.getEffective());
-    result = result && (getExpiration()
-        == other.getExpiration());
-    result = result && (getPercentageAmount()
-        == other.getPercentageAmount());
-    result = result && (getBogoTrigger()
-        == other.getBogoTrigger());
-    result = result && (getBogoReward()
-        == other.getBogoReward());
-    result = result && (getLoyaltyTrigger()
-        == other.getLoyaltyTrigger());
-    result = result && (getLoyaltyReward()
-        == other.getLoyaltyReward());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TYPE_FIELD_NUMBER;
-    hash = (53 * hash) + type_;
-    hash = (37 * hash) + EFFECTIVE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getEffective());
-    hash = (37 * hash) + EXPIRATION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getExpiration());
-    hash = (37 * hash) + PERCENTAGE_AMOUNT_FIELD_NUMBER;
-    hash = (53 * hash) + getPercentageAmount();
-    hash = (37 * hash) + BOGO_TRIGGER_FIELD_NUMBER;
-    hash = (53 * hash) + getBogoTrigger();
-    hash = (37 * hash) + BOGO_REWARD_FIELD_NUMBER;
-    hash = (53 * hash) + getBogoReward();
-    hash = (37 * hash) + LOYALTY_TRIGGER_FIELD_NUMBER;
-    hash = (53 * hash) + getLoyaltyTrigger();
-    hash = (37 * hash) + LOYALTY_REWARD_FIELD_NUMBER;
-    hash = (53 * hash) + getLoyaltyReward();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.SaleDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.SaleDescriptor prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code SaleDescriptor}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:SaleDescriptor)
-      io.bloombox.schema.product.struct.SaleDescriptorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductDiscount.internal_static_SaleDescriptor_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductDiscount.internal_static_SaleDescriptor_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.SaleDescriptor.class, io.bloombox.schema.product.struct.SaleDescriptor.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.SaleDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      type_ = 0;
-
-      effective_ = 0L;
-
-      expiration_ = 0L;
-
-      percentageAmount_ = 0;
-
-      bogoTrigger_ = 0;
-
-      bogoReward_ = 0;
-
-      loyaltyTrigger_ = 0;
-
-      loyaltyReward_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductDiscount.internal_static_SaleDescriptor_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.SaleDescriptor getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.SaleDescriptor.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.SaleDescriptor build() {
-      io.bloombox.schema.product.struct.SaleDescriptor result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.SaleDescriptor buildPartial() {
-      io.bloombox.schema.product.struct.SaleDescriptor result = new io.bloombox.schema.product.struct.SaleDescriptor(this);
-      result.type_ = type_;
-      result.effective_ = effective_;
-      result.expiration_ = expiration_;
-      result.percentageAmount_ = percentageAmount_;
-      result.bogoTrigger_ = bogoTrigger_;
-      result.bogoReward_ = bogoReward_;
-      result.loyaltyTrigger_ = loyaltyTrigger_;
-      result.loyaltyReward_ = loyaltyReward_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.SaleDescriptor) {
-        return mergeFrom((io.bloombox.schema.product.struct.SaleDescriptor)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.SaleDescriptor other) {
-      if (other == io.bloombox.schema.product.struct.SaleDescriptor.getDefaultInstance()) return this;
-      if (other.type_ != 0) {
-        setTypeValue(other.getTypeValue());
-      }
-      if (other.getEffective() != 0L) {
-        setEffective(other.getEffective());
-      }
-      if (other.getExpiration() != 0L) {
-        setExpiration(other.getExpiration());
-      }
-      if (other.getPercentageAmount() != 0) {
-        setPercentageAmount(other.getPercentageAmount());
-      }
-      if (other.getBogoTrigger() != 0) {
-        setBogoTrigger(other.getBogoTrigger());
-      }
-      if (other.getBogoReward() != 0) {
-        setBogoReward(other.getBogoReward());
-      }
-      if (other.getLoyaltyTrigger() != 0) {
-        setLoyaltyTrigger(other.getLoyaltyTrigger());
-      }
-      if (other.getLoyaltyReward() != 0) {
-        setLoyaltyReward(other.getLoyaltyReward());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.SaleDescriptor parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.SaleDescriptor) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int type_ = 0;
-    /**
-     * <pre>
-     * sale metadata
-     * </pre>
-     *
-     * <code>.SaleType type = 1;</code>
-     */
-    public int getTypeValue() {
-      return type_;
-    }
-    /**
-     * <pre>
-     * sale metadata
-     * </pre>
-     *
-     * <code>.SaleType type = 1;</code>
-     */
-    public Builder setTypeValue(int value) {
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * sale metadata
-     * </pre>
-     *
-     * <code>.SaleType type = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleType getType() {
-      io.bloombox.schema.product.struct.SaleType result = io.bloombox.schema.product.struct.SaleType.valueOf(type_);
-      return result == null ? io.bloombox.schema.product.struct.SaleType.UNRECOGNIZED : result;
-    }
-    /**
-     * <pre>
-     * sale metadata
-     * </pre>
-     *
-     * <code>.SaleType type = 1;</code>
-     */
-    public Builder setType(io.bloombox.schema.product.struct.SaleType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      type_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * sale metadata
-     * </pre>
-     *
-     * <code>.SaleType type = 1;</code>
-     */
-    public Builder clearType() {
-      
-      type_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private long effective_ ;
-    /**
-     * <code>uint64 effective = 2;</code>
-     */
-    public long getEffective() {
-      return effective_;
-    }
-    /**
-     * <code>uint64 effective = 2;</code>
-     */
-    public Builder setEffective(long value) {
-      
-      effective_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>uint64 effective = 2;</code>
-     */
-    public Builder clearEffective() {
-      
-      effective_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private long expiration_ ;
-    /**
-     * <code>uint64 expiration = 3;</code>
-     */
-    public long getExpiration() {
-      return expiration_;
-    }
-    /**
-     * <code>uint64 expiration = 3;</code>
-     */
-    public Builder setExpiration(long value) {
-      
-      expiration_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>uint64 expiration = 3;</code>
-     */
-    public Builder clearExpiration() {
-      
-      expiration_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private int percentageAmount_ ;
-    /**
-     * <pre>
-     * sale amount and trigger properties
-     * </pre>
-     *
-     * <code>uint32 percentage_amount = 20;</code>
-     */
-    public int getPercentageAmount() {
-      return percentageAmount_;
-    }
-    /**
-     * <pre>
-     * sale amount and trigger properties
-     * </pre>
-     *
-     * <code>uint32 percentage_amount = 20;</code>
-     */
-    public Builder setPercentageAmount(int value) {
-      
-      percentageAmount_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <pre>
-     * sale amount and trigger properties
-     * </pre>
-     *
-     * <code>uint32 percentage_amount = 20;</code>
-     */
-    public Builder clearPercentageAmount() {
-      
-      percentageAmount_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int bogoTrigger_ ;
-    /**
-     * <code>uint32 bogo_trigger = 21;</code>
-     */
-    public int getBogoTrigger() {
-      return bogoTrigger_;
-    }
-    /**
-     * <code>uint32 bogo_trigger = 21;</code>
-     */
-    public Builder setBogoTrigger(int value) {
-      
-      bogoTrigger_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>uint32 bogo_trigger = 21;</code>
-     */
-    public Builder clearBogoTrigger() {
-      
-      bogoTrigger_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int bogoReward_ ;
-    /**
-     * <code>uint32 bogo_reward = 22;</code>
-     */
-    public int getBogoReward() {
-      return bogoReward_;
-    }
-    /**
-     * <code>uint32 bogo_reward = 22;</code>
-     */
-    public Builder setBogoReward(int value) {
-      
-      bogoReward_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>uint32 bogo_reward = 22;</code>
-     */
-    public Builder clearBogoReward() {
-      
-      bogoReward_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int loyaltyTrigger_ ;
-    /**
-     * <code>uint32 loyalty_trigger = 23;</code>
-     */
-    public int getLoyaltyTrigger() {
-      return loyaltyTrigger_;
-    }
-    /**
-     * <code>uint32 loyalty_trigger = 23;</code>
-     */
-    public Builder setLoyaltyTrigger(int value) {
-      
-      loyaltyTrigger_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>uint32 loyalty_trigger = 23;</code>
-     */
-    public Builder clearLoyaltyTrigger() {
-      
-      loyaltyTrigger_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int loyaltyReward_ ;
-    /**
-     * <code>uint32 loyalty_reward = 24;</code>
-     */
-    public int getLoyaltyReward() {
-      return loyaltyReward_;
-    }
-    /**
-     * <code>uint32 loyalty_reward = 24;</code>
-     */
-    public Builder setLoyaltyReward(int value) {
-      
-      loyaltyReward_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>uint32 loyalty_reward = 24;</code>
-     */
-    public Builder clearLoyaltyReward() {
-      
-      loyaltyReward_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:SaleDescriptor)
-  }
-
-  // @@protoc_insertion_point(class_scope:SaleDescriptor)
-  private static final io.bloombox.schema.product.struct.SaleDescriptor DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.SaleDescriptor();
-  }
-
-  public static io.bloombox.schema.product.struct.SaleDescriptor getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<SaleDescriptor>
-      PARSER = new com.google.protobuf.AbstractParser<SaleDescriptor>() {
-    public SaleDescriptor parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SaleDescriptor(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<SaleDescriptor> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<SaleDescriptor> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.SaleDescriptor getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/SaleDescriptorOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/SaleDescriptorOrBuilder.java
deleted file mode 100644
index 6fbc800..0000000
--- a/languages/java/io/bloombox/schema/product/struct/SaleDescriptorOrBuilder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface SaleDescriptorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:SaleDescriptor)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <pre>
-   * sale metadata
-   * </pre>
-   *
-   * <code>.SaleType type = 1;</code>
-   */
-  int getTypeValue();
-  /**
-   * <pre>
-   * sale metadata
-   * </pre>
-   *
-   * <code>.SaleType type = 1;</code>
-   */
-  io.bloombox.schema.product.struct.SaleType getType();
-
-  /**
-   * <code>uint64 effective = 2;</code>
-   */
-  long getEffective();
-
-  /**
-   * <code>uint64 expiration = 3;</code>
-   */
-  long getExpiration();
-
-  /**
-   * <pre>
-   * sale amount and trigger properties
-   * </pre>
-   *
-   * <code>uint32 percentage_amount = 20;</code>
-   */
-  int getPercentageAmount();
-
-  /**
-   * <code>uint32 bogo_trigger = 21;</code>
-   */
-  int getBogoTrigger();
-
-  /**
-   * <code>uint32 bogo_reward = 22;</code>
-   */
-  int getBogoReward();
-
-  /**
-   * <code>uint32 loyalty_trigger = 23;</code>
-   */
-  int getLoyaltyTrigger();
-
-  /**
-   * <code>uint32 loyalty_reward = 24;</code>
-   */
-  int getLoyaltyReward();
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/SaleDescriptorOuterClass.java b/languages/java/io/bloombox/schema/product/struct/SaleDescriptorOuterClass.java
deleted file mode 100644
index ce40cb1..0000000
--- a/languages/java/io/bloombox/schema/product/struct/SaleDescriptorOuterClass.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class SaleDescriptorOuterClass {
-  private SaleDescriptorOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_SaleDescriptor_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_SaleDescriptor_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n$structs/pricing/SaleDescriptor.proto\"\307" +
-      "\001\n\016SaleDescriptor\022\027\n\004type\030\001 \001(\0162\t.SaleTy" +
-      "pe\022\021\n\teffective\030\002 \001(\004\022\022\n\nexpiration\030\003 \001(" +
-      "\004\022\031\n\021percentage_amount\030\024 \001(\r\022\024\n\014bogo_tri" +
-      "gger\030\025 \001(\r\022\023\n\013bogo_reward\030\026 \001(\r\022\027\n\017loyal" +
-      "ty_trigger\030\027 \001(\r\022\026\n\016loyalty_reward\030\030 \001(\r" +
-      "*1\n\010SaleType\022\016\n\nPERCENTAGE\020\000\022\010\n\004BOGO\020\001\022\013" +
-      "\n\007LOYALTY\020\002B%\n!io.bloombox.schema.produc" +
-      "t.structP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_SaleDescriptor_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_SaleDescriptor_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_SaleDescriptor_descriptor,
-        new java.lang.String[] { "Type", "Effective", "Expiration", "PercentageAmount", "BogoTrigger", "BogoReward", "LoyaltyTrigger", "LoyaltyReward", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/SaleType.java b/languages/java/io/bloombox/schema/product/struct/SaleType.java
deleted file mode 100644
index eb93b3f..0000000
--- a/languages/java/io/bloombox/schema/product/struct/SaleType.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf enum {@code SaleType}
- */
-public enum SaleType
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>PERCENTAGE = 0;</code>
-   */
-  PERCENTAGE(0),
-  /**
-   * <code>BOGO = 1;</code>
-   */
-  BOGO(1),
-  /**
-   * <code>LOYALTY = 2;</code>
-   */
-  LOYALTY(2),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>PERCENTAGE = 0;</code>
-   */
-  public static final int PERCENTAGE_VALUE = 0;
-  /**
-   * <code>BOGO = 1;</code>
-   */
-  public static final int BOGO_VALUE = 1;
-  /**
-   * <code>LOYALTY = 2;</code>
-   */
-  public static final int LOYALTY_VALUE = 2;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static SaleType valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static SaleType forNumber(int value) {
-    switch (value) {
-      case 0: return PERCENTAGE;
-      case 1: return BOGO;
-      case 2: return LOYALTY;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<SaleType>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      SaleType> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<SaleType>() {
-          public SaleType findValueByNumber(int number) {
-            return SaleType.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductDiscount.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final SaleType[] VALUES = values();
-
-  public static SaleType valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private SaleType(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:SaleType)
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/Species.java b/languages/java/io/bloombox/schema/product/struct/Species.java
deleted file mode 100644
index aa82f91..0000000
--- a/languages/java/io/bloombox/schema/product/struct/Species.java
+++ /dev/null
@@ -1,139 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf enum {@code Species}
- */
-public enum Species
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <code>UNSPECIFIED = 0;</code>
-   */
-  UNSPECIFIED(0),
-  /**
-   * <code>SATIVA = 1;</code>
-   */
-  SATIVA(1),
-  /**
-   * <code>HYBRID_SATIVA = 2;</code>
-   */
-  HYBRID_SATIVA(2),
-  /**
-   * <code>HYBRID = 3;</code>
-   */
-  HYBRID(3),
-  /**
-   * <code>HYBRID_INDICA = 4;</code>
-   */
-  HYBRID_INDICA(4),
-  /**
-   * <code>INDICA = 5;</code>
-   */
-  INDICA(5),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <code>UNSPECIFIED = 0;</code>
-   */
-  public static final int UNSPECIFIED_VALUE = 0;
-  /**
-   * <code>SATIVA = 1;</code>
-   */
-  public static final int SATIVA_VALUE = 1;
-  /**
-   * <code>HYBRID_SATIVA = 2;</code>
-   */
-  public static final int HYBRID_SATIVA_VALUE = 2;
-  /**
-   * <code>HYBRID = 3;</code>
-   */
-  public static final int HYBRID_VALUE = 3;
-  /**
-   * <code>HYBRID_INDICA = 4;</code>
-   */
-  public static final int HYBRID_INDICA_VALUE = 4;
-  /**
-   * <code>INDICA = 5;</code>
-   */
-  public static final int INDICA_VALUE = 5;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static Species valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static Species forNumber(int value) {
-    switch (value) {
-      case 0: return UNSPECIFIED;
-      case 1: return SATIVA;
-      case 2: return HYBRID_SATIVA;
-      case 3: return HYBRID;
-      case 4: return HYBRID_INDICA;
-      case 5: return INDICA;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<Species>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      Species> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<Species>() {
-          public Species findValueByNumber(int number) {
-            return Species.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.MaterialSpecies.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final Species[] VALUES = values();
-
-  public static Species valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private Species(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:Species)
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/SpeciesOuterClass.java b/languages/java/io/bloombox/schema/product/struct/SpeciesOuterClass.java
deleted file mode 100644
index 99d2f40..0000000
--- a/languages/java/io/bloombox/schema/product/struct/SpeciesOuterClass.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-package io.bloombox.schema.product.struct;
-
-public final class SpeciesOuterClass {
-  private SpeciesOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\025structs/Species.proto*d\n\007Species\022\017\n\013UN" +
-      "SPECIFIED\020\000\022\n\n\006SATIVA\020\001\022\021\n\rHYBRID_SATIVA" +
-      "\020\002\022\n\n\006HYBRID\020\003\022\021\n\rHYBRID_INDICA\020\004\022\n\n\006IND" +
-      "ICA\020\005B%\n!io.bloombox.schema.product.stru" +
-      "ctP\001b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/UnitPricingDescriptor.java b/languages/java/io/bloombox/schema/product/struct/UnitPricingDescriptor.java
deleted file mode 100644
index 3678e63..0000000
--- a/languages/java/io/bloombox/schema/product/struct/UnitPricingDescriptor.java
+++ /dev/null
@@ -1,984 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * <pre>
- * -- Pricing: Typed Descriptors
- * </pre>
- *
- * Protobuf type {@code UnitPricingDescriptor}
- */
-public  final class UnitPricingDescriptor extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:UnitPricingDescriptor)
-    UnitPricingDescriptorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use UnitPricingDescriptor.newBuilder() to construct.
-  private UnitPricingDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private UnitPricingDescriptor() {
-    priceValue_ = 0F;
-    discounts_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private UnitPricingDescriptor(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 13: {
-
-            priceValue_ = input.readFloat();
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.product.struct.PricingTierAvailability.Builder subBuilder = null;
-            if (status_ != null) {
-              subBuilder = status_.toBuilder();
-            }
-            status_ = input.readMessage(io.bloombox.schema.product.struct.PricingTierAvailability.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(status_);
-              status_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              discounts_ = new java.util.ArrayList<io.bloombox.schema.product.struct.SaleDescriptor>();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            discounts_.add(
-                input.readMessage(io.bloombox.schema.product.struct.SaleDescriptor.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        discounts_ = java.util.Collections.unmodifiableList(discounts_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_UnitPricingDescriptor_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_UnitPricingDescriptor_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.class, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int PRICE_VALUE_FIELD_NUMBER = 1;
-  private float priceValue_;
-  /**
-   * <code>float price_value = 1;</code>
-   */
-  public float getPriceValue() {
-    return priceValue_;
-  }
-
-  public static final int STATUS_FIELD_NUMBER = 2;
-  private io.bloombox.schema.product.struct.PricingTierAvailability status_;
-  /**
-   * <code>.PricingTierAvailability status = 2;</code>
-   */
-  public boolean hasStatus() {
-    return status_ != null;
-  }
-  /**
-   * <code>.PricingTierAvailability status = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.PricingTierAvailability getStatus() {
-    return status_ == null ? io.bloombox.schema.product.struct.PricingTierAvailability.getDefaultInstance() : status_;
-  }
-  /**
-   * <code>.PricingTierAvailability status = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder getStatusOrBuilder() {
-    return getStatus();
-  }
-
-  public static final int DISCOUNTS_FIELD_NUMBER = 3;
-  private java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> discounts_;
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  public java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> getDiscountsList() {
-    return discounts_;
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  public java.util.List<? extends io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-      getDiscountsOrBuilderList() {
-    return discounts_;
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  public int getDiscountsCount() {
-    return discounts_.size();
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  public io.bloombox.schema.product.struct.SaleDescriptor getDiscounts(int index) {
-    return discounts_.get(index);
-  }
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  public io.bloombox.schema.product.struct.SaleDescriptorOrBuilder getDiscountsOrBuilder(
-      int index) {
-    return discounts_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (priceValue_ != 0F) {
-      output.writeFloat(1, priceValue_);
-    }
-    if (status_ != null) {
-      output.writeMessage(2, getStatus());
-    }
-    for (int i = 0; i < discounts_.size(); i++) {
-      output.writeMessage(3, discounts_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (priceValue_ != 0F) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeFloatSize(1, priceValue_);
-    }
-    if (status_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getStatus());
-    }
-    for (int i = 0; i < discounts_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, discounts_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.UnitPricingDescriptor)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.UnitPricingDescriptor other = (io.bloombox.schema.product.struct.UnitPricingDescriptor) obj;
-
-    boolean result = true;
-    result = result && (
-        java.lang.Float.floatToIntBits(getPriceValue())
-        == java.lang.Float.floatToIntBits(
-            other.getPriceValue()));
-    result = result && (hasStatus() == other.hasStatus());
-    if (hasStatus()) {
-      result = result && getStatus()
-          .equals(other.getStatus());
-    }
-    result = result && getDiscountsList()
-        .equals(other.getDiscountsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PRICE_VALUE_FIELD_NUMBER;
-    hash = (53 * hash) + java.lang.Float.floatToIntBits(
-        getPriceValue());
-    if (hasStatus()) {
-      hash = (37 * hash) + STATUS_FIELD_NUMBER;
-      hash = (53 * hash) + getStatus().hashCode();
-    }
-    if (getDiscountsCount() > 0) {
-      hash = (37 * hash) + DISCOUNTS_FIELD_NUMBER;
-      hash = (53 * hash) + getDiscountsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.UnitPricingDescriptor prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * -- Pricing: Typed Descriptors
-   * </pre>
-   *
-   * Protobuf type {@code UnitPricingDescriptor}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:UnitPricingDescriptor)
-      io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_UnitPricingDescriptor_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_UnitPricingDescriptor_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.UnitPricingDescriptor.class, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.UnitPricingDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getDiscountsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      priceValue_ = 0F;
-
-      if (statusBuilder_ == null) {
-        status_ = null;
-      } else {
-        status_ = null;
-        statusBuilder_ = null;
-      }
-      if (discountsBuilder_ == null) {
-        discounts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        discountsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_UnitPricingDescriptor_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor build() {
-      io.bloombox.schema.product.struct.UnitPricingDescriptor result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor buildPartial() {
-      io.bloombox.schema.product.struct.UnitPricingDescriptor result = new io.bloombox.schema.product.struct.UnitPricingDescriptor(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      result.priceValue_ = priceValue_;
-      if (statusBuilder_ == null) {
-        result.status_ = status_;
-      } else {
-        result.status_ = statusBuilder_.build();
-      }
-      if (discountsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          discounts_ = java.util.Collections.unmodifiableList(discounts_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.discounts_ = discounts_;
-      } else {
-        result.discounts_ = discountsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.UnitPricingDescriptor) {
-        return mergeFrom((io.bloombox.schema.product.struct.UnitPricingDescriptor)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.UnitPricingDescriptor other) {
-      if (other == io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance()) return this;
-      if (other.getPriceValue() != 0F) {
-        setPriceValue(other.getPriceValue());
-      }
-      if (other.hasStatus()) {
-        mergeStatus(other.getStatus());
-      }
-      if (discountsBuilder_ == null) {
-        if (!other.discounts_.isEmpty()) {
-          if (discounts_.isEmpty()) {
-            discounts_ = other.discounts_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureDiscountsIsMutable();
-            discounts_.addAll(other.discounts_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.discounts_.isEmpty()) {
-          if (discountsBuilder_.isEmpty()) {
-            discountsBuilder_.dispose();
-            discountsBuilder_ = null;
-            discounts_ = other.discounts_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            discountsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getDiscountsFieldBuilder() : null;
-          } else {
-            discountsBuilder_.addAllMessages(other.discounts_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.UnitPricingDescriptor parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.UnitPricingDescriptor) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private float priceValue_ ;
-    /**
-     * <code>float price_value = 1;</code>
-     */
-    public float getPriceValue() {
-      return priceValue_;
-    }
-    /**
-     * <code>float price_value = 1;</code>
-     */
-    public Builder setPriceValue(float value) {
-      
-      priceValue_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>float price_value = 1;</code>
-     */
-    public Builder clearPriceValue() {
-      
-      priceValue_ = 0F;
-      onChanged();
-      return this;
-    }
-
-    private io.bloombox.schema.product.struct.PricingTierAvailability status_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.PricingTierAvailability, io.bloombox.schema.product.struct.PricingTierAvailability.Builder, io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder> statusBuilder_;
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public boolean hasStatus() {
-      return statusBuilder_ != null || status_ != null;
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingTierAvailability getStatus() {
-      if (statusBuilder_ == null) {
-        return status_ == null ? io.bloombox.schema.product.struct.PricingTierAvailability.getDefaultInstance() : status_;
-      } else {
-        return statusBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public Builder setStatus(io.bloombox.schema.product.struct.PricingTierAvailability value) {
-      if (statusBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        status_ = value;
-        onChanged();
-      } else {
-        statusBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public Builder setStatus(
-        io.bloombox.schema.product.struct.PricingTierAvailability.Builder builderForValue) {
-      if (statusBuilder_ == null) {
-        status_ = builderForValue.build();
-        onChanged();
-      } else {
-        statusBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public Builder mergeStatus(io.bloombox.schema.product.struct.PricingTierAvailability value) {
-      if (statusBuilder_ == null) {
-        if (status_ != null) {
-          status_ =
-            io.bloombox.schema.product.struct.PricingTierAvailability.newBuilder(status_).mergeFrom(value).buildPartial();
-        } else {
-          status_ = value;
-        }
-        onChanged();
-      } else {
-        statusBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public Builder clearStatus() {
-      if (statusBuilder_ == null) {
-        status_ = null;
-        onChanged();
-      } else {
-        status_ = null;
-        statusBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingTierAvailability.Builder getStatusBuilder() {
-      
-      onChanged();
-      return getStatusFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder getStatusOrBuilder() {
-      if (statusBuilder_ != null) {
-        return statusBuilder_.getMessageOrBuilder();
-      } else {
-        return status_ == null ?
-            io.bloombox.schema.product.struct.PricingTierAvailability.getDefaultInstance() : status_;
-      }
-    }
-    /**
-     * <code>.PricingTierAvailability status = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.PricingTierAvailability, io.bloombox.schema.product.struct.PricingTierAvailability.Builder, io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder> 
-        getStatusFieldBuilder() {
-      if (statusBuilder_ == null) {
-        statusBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.product.struct.PricingTierAvailability, io.bloombox.schema.product.struct.PricingTierAvailability.Builder, io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder>(
-                getStatus(),
-                getParentForChildren(),
-                isClean());
-        status_ = null;
-      }
-      return statusBuilder_;
-    }
-
-    private java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> discounts_ =
-      java.util.Collections.emptyList();
-    private void ensureDiscountsIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        discounts_ = new java.util.ArrayList<io.bloombox.schema.product.struct.SaleDescriptor>(discounts_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.SaleDescriptor, io.bloombox.schema.product.struct.SaleDescriptor.Builder, io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> discountsBuilder_;
-
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> getDiscountsList() {
-      if (discountsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(discounts_);
-      } else {
-        return discountsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public int getDiscountsCount() {
-      if (discountsBuilder_ == null) {
-        return discounts_.size();
-      } else {
-        return discountsBuilder_.getCount();
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor getDiscounts(int index) {
-      if (discountsBuilder_ == null) {
-        return discounts_.get(index);
-      } else {
-        return discountsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder setDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor value) {
-      if (discountsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureDiscountsIsMutable();
-        discounts_.set(index, value);
-        onChanged();
-      } else {
-        discountsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder setDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor.Builder builderForValue) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        discountsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder addDiscounts(io.bloombox.schema.product.struct.SaleDescriptor value) {
-      if (discountsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureDiscountsIsMutable();
-        discounts_.add(value);
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder addDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor value) {
-      if (discountsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureDiscountsIsMutable();
-        discounts_.add(index, value);
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder addDiscounts(
-        io.bloombox.schema.product.struct.SaleDescriptor.Builder builderForValue) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.add(builderForValue.build());
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder addDiscounts(
-        int index, io.bloombox.schema.product.struct.SaleDescriptor.Builder builderForValue) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        discountsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder addAllDiscounts(
-        java.lang.Iterable<? extends io.bloombox.schema.product.struct.SaleDescriptor> values) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, discounts_);
-        onChanged();
-      } else {
-        discountsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder clearDiscounts() {
-      if (discountsBuilder_ == null) {
-        discounts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        discountsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public Builder removeDiscounts(int index) {
-      if (discountsBuilder_ == null) {
-        ensureDiscountsIsMutable();
-        discounts_.remove(index);
-        onChanged();
-      } else {
-        discountsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor.Builder getDiscountsBuilder(
-        int index) {
-      return getDiscountsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptorOrBuilder getDiscountsOrBuilder(
-        int index) {
-      if (discountsBuilder_ == null) {
-        return discounts_.get(index);  } else {
-        return discountsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public java.util.List<? extends io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-         getDiscountsOrBuilderList() {
-      if (discountsBuilder_ != null) {
-        return discountsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(discounts_);
-      }
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor.Builder addDiscountsBuilder() {
-      return getDiscountsFieldBuilder().addBuilder(
-          io.bloombox.schema.product.struct.SaleDescriptor.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public io.bloombox.schema.product.struct.SaleDescriptor.Builder addDiscountsBuilder(
-        int index) {
-      return getDiscountsFieldBuilder().addBuilder(
-          index, io.bloombox.schema.product.struct.SaleDescriptor.getDefaultInstance());
-    }
-    /**
-     * <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    public java.util.List<io.bloombox.schema.product.struct.SaleDescriptor.Builder> 
-         getDiscountsBuilderList() {
-      return getDiscountsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        io.bloombox.schema.product.struct.SaleDescriptor, io.bloombox.schema.product.struct.SaleDescriptor.Builder, io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-        getDiscountsFieldBuilder() {
-      if (discountsBuilder_ == null) {
-        discountsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            io.bloombox.schema.product.struct.SaleDescriptor, io.bloombox.schema.product.struct.SaleDescriptor.Builder, io.bloombox.schema.product.struct.SaleDescriptorOrBuilder>(
-                discounts_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        discounts_ = null;
-      }
-      return discountsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:UnitPricingDescriptor)
-  }
-
-  // @@protoc_insertion_point(class_scope:UnitPricingDescriptor)
-  private static final io.bloombox.schema.product.struct.UnitPricingDescriptor DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.UnitPricingDescriptor();
-  }
-
-  public static io.bloombox.schema.product.struct.UnitPricingDescriptor getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<UnitPricingDescriptor>
-      PARSER = new com.google.protobuf.AbstractParser<UnitPricingDescriptor>() {
-    public UnitPricingDescriptor parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new UnitPricingDescriptor(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<UnitPricingDescriptor> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<UnitPricingDescriptor> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.UnitPricingDescriptor getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/UnitPricingDescriptorOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/UnitPricingDescriptorOrBuilder.java
deleted file mode 100644
index f2aaa98..0000000
--- a/languages/java/io/bloombox/schema/product/struct/UnitPricingDescriptorOrBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface UnitPricingDescriptorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:UnitPricingDescriptor)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>float price_value = 1;</code>
-   */
-  float getPriceValue();
-
-  /**
-   * <code>.PricingTierAvailability status = 2;</code>
-   */
-  boolean hasStatus();
-  /**
-   * <code>.PricingTierAvailability status = 2;</code>
-   */
-  io.bloombox.schema.product.struct.PricingTierAvailability getStatus();
-  /**
-   * <code>.PricingTierAvailability status = 2;</code>
-   */
-  io.bloombox.schema.product.struct.PricingTierAvailabilityOrBuilder getStatusOrBuilder();
-
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  java.util.List<io.bloombox.schema.product.struct.SaleDescriptor> 
-      getDiscountsList();
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  io.bloombox.schema.product.struct.SaleDescriptor getDiscounts(int index);
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  int getDiscountsCount();
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  java.util.List<? extends io.bloombox.schema.product.struct.SaleDescriptorOrBuilder> 
-      getDiscountsOrBuilderList();
-  /**
-   * <code>repeated .SaleDescriptor discounts = 3;</code>
-   */
-  io.bloombox.schema.product.struct.SaleDescriptorOrBuilder getDiscountsOrBuilder(
-      int index);
-}
diff --git a/languages/java/io/bloombox/schema/product/struct/WeightedPricingDescriptor.java b/languages/java/io/bloombox/schema/product/struct/WeightedPricingDescriptor.java
deleted file mode 100644
index 7b37cf2..0000000
--- a/languages/java/io/bloombox/schema/product/struct/WeightedPricingDescriptor.java
+++ /dev/null
@@ -1,711 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-/**
- * Protobuf type {@code WeightedPricingDescriptor}
- */
-public  final class WeightedPricingDescriptor extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:WeightedPricingDescriptor)
-    WeightedPricingDescriptorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use WeightedPricingDescriptor.newBuilder() to construct.
-  private WeightedPricingDescriptor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private WeightedPricingDescriptor() {
-    weight_ = 0;
-    weightInGrams_ = 0F;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private WeightedPricingDescriptor(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            weight_ = rawValue;
-            break;
-          }
-          case 18: {
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder subBuilder = null;
-            if (tier_ != null) {
-              subBuilder = tier_.toBuilder();
-            }
-            tier_ = input.readMessage(io.bloombox.schema.product.struct.UnitPricingDescriptor.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(tier_);
-              tier_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 29: {
-
-            weightInGrams_ = input.readFloat();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_WeightedPricingDescriptor_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_WeightedPricingDescriptor_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.bloombox.schema.product.struct.WeightedPricingDescriptor.class, io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder.class);
-  }
-
-  public static final int WEIGHT_FIELD_NUMBER = 1;
-  private int weight_;
-  /**
-   * <code>.PricingWeightTier weight = 1;</code>
-   */
-  public int getWeightValue() {
-    return weight_;
-  }
-  /**
-   * <code>.PricingWeightTier weight = 1;</code>
-   */
-  public io.bloombox.schema.product.struct.PricingWeightTier getWeight() {
-    io.bloombox.schema.product.struct.PricingWeightTier result = io.bloombox.schema.product.struct.PricingWeightTier.valueOf(weight_);
-    return result == null ? io.bloombox.schema.product.struct.PricingWeightTier.UNRECOGNIZED : result;
-  }
-
-  public static final int TIER_FIELD_NUMBER = 2;
-  private io.bloombox.schema.product.struct.UnitPricingDescriptor tier_;
-  /**
-   * <code>.UnitPricingDescriptor tier = 2;</code>
-   */
-  public boolean hasTier() {
-    return tier_ != null;
-  }
-  /**
-   * <code>.UnitPricingDescriptor tier = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.UnitPricingDescriptor getTier() {
-    return tier_ == null ? io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance() : tier_;
-  }
-  /**
-   * <code>.UnitPricingDescriptor tier = 2;</code>
-   */
-  public io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder getTierOrBuilder() {
-    return getTier();
-  }
-
-  public static final int WEIGHTINGRAMS_FIELD_NUMBER = 3;
-  private float weightInGrams_;
-  /**
-   * <code>float weightInGrams = 3;</code>
-   */
-  public float getWeightInGrams() {
-    return weightInGrams_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (weight_ != io.bloombox.schema.product.struct.PricingWeightTier.OTHER.getNumber()) {
-      output.writeEnum(1, weight_);
-    }
-    if (tier_ != null) {
-      output.writeMessage(2, getTier());
-    }
-    if (weightInGrams_ != 0F) {
-      output.writeFloat(3, weightInGrams_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (weight_ != io.bloombox.schema.product.struct.PricingWeightTier.OTHER.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, weight_);
-    }
-    if (tier_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getTier());
-    }
-    if (weightInGrams_ != 0F) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeFloatSize(3, weightInGrams_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.bloombox.schema.product.struct.WeightedPricingDescriptor)) {
-      return super.equals(obj);
-    }
-    io.bloombox.schema.product.struct.WeightedPricingDescriptor other = (io.bloombox.schema.product.struct.WeightedPricingDescriptor) obj;
-
-    boolean result = true;
-    result = result && weight_ == other.weight_;
-    result = result && (hasTier() == other.hasTier());
-    if (hasTier()) {
-      result = result && getTier()
-          .equals(other.getTier());
-    }
-    result = result && (
-        java.lang.Float.floatToIntBits(getWeightInGrams())
-        == java.lang.Float.floatToIntBits(
-            other.getWeightInGrams()));
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + WEIGHT_FIELD_NUMBER;
-    hash = (53 * hash) + weight_;
-    if (hasTier()) {
-      hash = (37 * hash) + TIER_FIELD_NUMBER;
-      hash = (53 * hash) + getTier().hashCode();
-    }
-    hash = (37 * hash) + WEIGHTINGRAMS_FIELD_NUMBER;
-    hash = (53 * hash) + java.lang.Float.floatToIntBits(
-        getWeightInGrams());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.bloombox.schema.product.struct.WeightedPricingDescriptor prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code WeightedPricingDescriptor}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:WeightedPricingDescriptor)
-      io.bloombox.schema.product.struct.WeightedPricingDescriptorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_WeightedPricingDescriptor_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_WeightedPricingDescriptor_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.bloombox.schema.product.struct.WeightedPricingDescriptor.class, io.bloombox.schema.product.struct.WeightedPricingDescriptor.Builder.class);
-    }
-
-    // Construct using io.bloombox.schema.product.struct.WeightedPricingDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      weight_ = 0;
-
-      if (tierBuilder_ == null) {
-        tier_ = null;
-      } else {
-        tier_ = null;
-        tierBuilder_ = null;
-      }
-      weightInGrams_ = 0F;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.bloombox.schema.product.struct.ProductPricingSpec.internal_static_WeightedPricingDescriptor_descriptor;
-    }
-
-    public io.bloombox.schema.product.struct.WeightedPricingDescriptor getDefaultInstanceForType() {
-      return io.bloombox.schema.product.struct.WeightedPricingDescriptor.getDefaultInstance();
-    }
-
-    public io.bloombox.schema.product.struct.WeightedPricingDescriptor build() {
-      io.bloombox.schema.product.struct.WeightedPricingDescriptor result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.bloombox.schema.product.struct.WeightedPricingDescriptor buildPartial() {
-      io.bloombox.schema.product.struct.WeightedPricingDescriptor result = new io.bloombox.schema.product.struct.WeightedPricingDescriptor(this);
-      result.weight_ = weight_;
-      if (tierBuilder_ == null) {
-        result.tier_ = tier_;
-      } else {
-        result.tier_ = tierBuilder_.build();
-      }
-      result.weightInGrams_ = weightInGrams_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.bloombox.schema.product.struct.WeightedPricingDescriptor) {
-        return mergeFrom((io.bloombox.schema.product.struct.WeightedPricingDescriptor)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.bloombox.schema.product.struct.WeightedPricingDescriptor other) {
-      if (other == io.bloombox.schema.product.struct.WeightedPricingDescriptor.getDefaultInstance()) return this;
-      if (other.weight_ != 0) {
-        setWeightValue(other.getWeightValue());
-      }
-      if (other.hasTier()) {
-        mergeTier(other.getTier());
-      }
-      if (other.getWeightInGrams() != 0F) {
-        setWeightInGrams(other.getWeightInGrams());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.bloombox.schema.product.struct.WeightedPricingDescriptor parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.bloombox.schema.product.struct.WeightedPricingDescriptor) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int weight_ = 0;
-    /**
-     * <code>.PricingWeightTier weight = 1;</code>
-     */
-    public int getWeightValue() {
-      return weight_;
-    }
-    /**
-     * <code>.PricingWeightTier weight = 1;</code>
-     */
-    public Builder setWeightValue(int value) {
-      weight_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.PricingWeightTier weight = 1;</code>
-     */
-    public io.bloombox.schema.product.struct.PricingWeightTier getWeight() {
-      io.bloombox.schema.product.struct.PricingWeightTier result = io.bloombox.schema.product.struct.PricingWeightTier.valueOf(weight_);
-      return result == null ? io.bloombox.schema.product.struct.PricingWeightTier.UNRECOGNIZED : result;
-    }
-    /**
-     * <code>.PricingWeightTier weight = 1;</code>
-     */
-    public Builder setWeight(io.bloombox.schema.product.struct.PricingWeightTier value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      weight_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>.PricingWeightTier weight = 1;</code>
-     */
-    public Builder clearWeight() {
-      
-      weight_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private io.bloombox.schema.product.struct.UnitPricingDescriptor tier_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.UnitPricingDescriptor, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder, io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder> tierBuilder_;
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public boolean hasTier() {
-      return tierBuilder_ != null || tier_ != null;
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor getTier() {
-      if (tierBuilder_ == null) {
-        return tier_ == null ? io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance() : tier_;
-      } else {
-        return tierBuilder_.getMessage();
-      }
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public Builder setTier(io.bloombox.schema.product.struct.UnitPricingDescriptor value) {
-      if (tierBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        tier_ = value;
-        onChanged();
-      } else {
-        tierBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public Builder setTier(
-        io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder builderForValue) {
-      if (tierBuilder_ == null) {
-        tier_ = builderForValue.build();
-        onChanged();
-      } else {
-        tierBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public Builder mergeTier(io.bloombox.schema.product.struct.UnitPricingDescriptor value) {
-      if (tierBuilder_ == null) {
-        if (tier_ != null) {
-          tier_ =
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.newBuilder(tier_).mergeFrom(value).buildPartial();
-        } else {
-          tier_ = value;
-        }
-        onChanged();
-      } else {
-        tierBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public Builder clearTier() {
-      if (tierBuilder_ == null) {
-        tier_ = null;
-        onChanged();
-      } else {
-        tier_ = null;
-        tierBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder getTierBuilder() {
-      
-      onChanged();
-      return getTierFieldBuilder().getBuilder();
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    public io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder getTierOrBuilder() {
-      if (tierBuilder_ != null) {
-        return tierBuilder_.getMessageOrBuilder();
-      } else {
-        return tier_ == null ?
-            io.bloombox.schema.product.struct.UnitPricingDescriptor.getDefaultInstance() : tier_;
-      }
-    }
-    /**
-     * <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        io.bloombox.schema.product.struct.UnitPricingDescriptor, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder, io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder> 
-        getTierFieldBuilder() {
-      if (tierBuilder_ == null) {
-        tierBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.bloombox.schema.product.struct.UnitPricingDescriptor, io.bloombox.schema.product.struct.UnitPricingDescriptor.Builder, io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder>(
-                getTier(),
-                getParentForChildren(),
-                isClean());
-        tier_ = null;
-      }
-      return tierBuilder_;
-    }
-
-    private float weightInGrams_ ;
-    /**
-     * <code>float weightInGrams = 3;</code>
-     */
-    public float getWeightInGrams() {
-      return weightInGrams_;
-    }
-    /**
-     * <code>float weightInGrams = 3;</code>
-     */
-    public Builder setWeightInGrams(float value) {
-      
-      weightInGrams_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>float weightInGrams = 3;</code>
-     */
-    public Builder clearWeightInGrams() {
-      
-      weightInGrams_ = 0F;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:WeightedPricingDescriptor)
-  }
-
-  // @@protoc_insertion_point(class_scope:WeightedPricingDescriptor)
-  private static final io.bloombox.schema.product.struct.WeightedPricingDescriptor DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.bloombox.schema.product.struct.WeightedPricingDescriptor();
-  }
-
-  public static io.bloombox.schema.product.struct.WeightedPricingDescriptor getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<WeightedPricingDescriptor>
-      PARSER = new com.google.protobuf.AbstractParser<WeightedPricingDescriptor>() {
-    public WeightedPricingDescriptor parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WeightedPricingDescriptor(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<WeightedPricingDescriptor> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<WeightedPricingDescriptor> getParserForType() {
-    return PARSER;
-  }
-
-  public io.bloombox.schema.product.struct.WeightedPricingDescriptor getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/languages/java/io/bloombox/schema/product/struct/WeightedPricingDescriptorOrBuilder.java b/languages/java/io/bloombox/schema/product/struct/WeightedPricingDescriptorOrBuilder.java
deleted file mode 100644
index 6dc6041..0000000
--- a/languages/java/io/bloombox/schema/product/struct/WeightedPricingDescriptorOrBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-package io.bloombox.schema.product.struct;
-
-public interface WeightedPricingDescriptorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:WeightedPricingDescriptor)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>.PricingWeightTier weight = 1;</code>
-   */
-  int getWeightValue();
-  /**
-   * <code>.PricingWeightTier weight = 1;</code>
-   */
-  io.bloombox.schema.product.struct.PricingWeightTier getWeight();
-
-  /**
-   * <code>.UnitPricingDescriptor tier = 2;</code>
-   */
-  boolean hasTier();
-  /**
-   * <code>.UnitPricingDescriptor tier = 2;</code>
-   */
-  io.bloombox.schema.product.struct.UnitPricingDescriptor getTier();
-  /**
-   * <code>.UnitPricingDescriptor tier = 2;</code>
-   */
-  io.bloombox.schema.product.struct.UnitPricingDescriptorOrBuilder getTierOrBuilder();
-
-  /**
-   * <code>float weightInGrams = 3;</code>
-   */
-  float getWeightInGrams();
-}
diff --git a/languages/javanano/io/bloombox/schema/base/nano/BaseLanguage.java b/languages/javanano/io/bloombox/schema/base/nano/BaseLanguage.java
deleted file mode 100644
index 4bede9e..0000000
--- a/languages/javanano/io/bloombox/schema/base/nano/BaseLanguage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.base.nano;
-
-@SuppressWarnings("hiding")
-public interface BaseLanguage {
-
-  // enum Language
-  public static final int ENGLISH = 0;
-  public static final int SPANISH = 1;
-  public static final int FRENCH = 2;
-}
diff --git a/languages/javanano/io/bloombox/schema/base/nano/BaseProductKind.java b/languages/javanano/io/bloombox/schema/base/nano/BaseProductKind.java
deleted file mode 100644
index 82be325..0000000
--- a/languages/javanano/io/bloombox/schema/base/nano/BaseProductKind.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.base.nano;
-
-@SuppressWarnings("hiding")
-public interface BaseProductKind {
-
-  // enum ProductKind
-  public static final int FLOWERS = 0;
-  public static final int EDIBLES = 1;
-  public static final int EXTRACTS = 2;
-  public static final int PREROLLS = 3;
-  public static final int APOTHECARY = 4;
-  public static final int CARTRIDGES = 5;
-  public static final int PLANTS = 6;
-  public static final int MERCHANDISE = 7;
-}
diff --git a/languages/javanano/io/bloombox/schema/base/nano/Compression.java b/languages/javanano/io/bloombox/schema/base/nano/Compression.java
deleted file mode 100644
index c283c1f..0000000
--- a/languages/javanano/io/bloombox/schema/base/nano/Compression.java
+++ /dev/null
@@ -1,111 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.base.nano;
-
-@SuppressWarnings("hiding")
-public final class Compression extends
-    com.google.protobuf.nano.MessageNano {
-
-  // enum Type
-  public static final int GZIP = 0;
-
-  private static volatile Compression[] _emptyArray;
-  public static Compression[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new Compression[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // bool enabled = 1;
-  public boolean enabled;
-
-  // .Compression.Type type = 2;
-  public int type;
-
-  public Compression() {
-    clear();
-  }
-
-  public Compression clear() {
-    enabled = false;
-    type = io.bloombox.schema.base.nano.Compression.GZIP;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.enabled != false) {
-      output.writeBool(1, this.enabled);
-    }
-    if (this.type != io.bloombox.schema.base.nano.Compression.GZIP) {
-      output.writeInt32(2, this.type);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.enabled != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(1, this.enabled);
-    }
-    if (this.type != io.bloombox.schema.base.nano.Compression.GZIP) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(2, this.type);
-    }
-    return size;
-  }
-
-  @Override
-  public Compression mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          this.enabled = input.readBool();
-          break;
-        }
-        case 16: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.base.nano.Compression.GZIP:
-              this.type = value;
-              break;
-          }
-          break;
-        }
-      }
-    }
-  }
-
-  public static Compression parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new Compression(), data);
-  }
-
-  public static Compression parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new Compression().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/base/nano/Product.java b/languages/javanano/io/bloombox/schema/base/nano/Product.java
deleted file mode 100644
index 9b462a7..0000000
--- a/languages/javanano/io/bloombox/schema/base/nano/Product.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.base.nano;
-
-@SuppressWarnings("hiding")
-public final class Product extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile Product[] _emptyArray;
-  public static Product[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new Product[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .ProductKey key = 1;
-  public io.bloombox.schema.base.nano.ProductKey key;
-
-  // .ProductType type = 2;
-  public io.bloombox.schema.base.nano.ProductType type;
-
-  // .google.protobuf.Any data = 3;
-  public com.google.protobuf.nano.Any data;
-
-  public Product() {
-    clear();
-  }
-
-  public Product clear() {
-    key = null;
-    type = null;
-    data = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.key != null) {
-      output.writeMessage(1, this.key);
-    }
-    if (this.type != null) {
-      output.writeMessage(2, this.type);
-    }
-    if (this.data != null) {
-      output.writeMessage(3, this.data);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.key != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(1, this.key);
-    }
-    if (this.type != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.type);
-    }
-    if (this.data != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(3, this.data);
-    }
-    return size;
-  }
-
-  @Override
-  public Product mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          if (this.key == null) {
-            this.key = new io.bloombox.schema.base.nano.ProductKey();
-          }
-          input.readMessage(this.key);
-          break;
-        }
-        case 18: {
-          if (this.type == null) {
-            this.type = new io.bloombox.schema.base.nano.ProductType();
-          }
-          input.readMessage(this.type);
-          break;
-        }
-        case 26: {
-          if (this.data == null) {
-            this.data = new com.google.protobuf.nano.Any();
-          }
-          input.readMessage(this.data);
-          break;
-        }
-      }
-    }
-  }
-
-  public static Product parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new Product(), data);
-  }
-
-  public static Product parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new Product().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/base/nano/ProductKey.java b/languages/javanano/io/bloombox/schema/base/nano/ProductKey.java
deleted file mode 100644
index fc9e71b..0000000
--- a/languages/javanano/io/bloombox/schema/base/nano/ProductKey.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.base.nano;
-
-@SuppressWarnings("hiding")
-public final class ProductKey extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile ProductKey[] _emptyArray;
-  public static ProductKey[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ProductKey[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // string id = 1;
-  public java.lang.String id;
-
-  public ProductKey() {
-    clear();
-  }
-
-  public ProductKey clear() {
-    id = "";
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (!this.id.equals("")) {
-      output.writeString(1, this.id);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (!this.id.equals("")) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeStringSize(1, this.id);
-    }
-    return size;
-  }
-
-  @Override
-  public ProductKey mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          this.id = input.readString();
-          break;
-        }
-      }
-    }
-  }
-
-  public static ProductKey parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ProductKey(), data);
-  }
-
-  public static ProductKey parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ProductKey().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/base/nano/ProductType.java b/languages/javanano/io/bloombox/schema/base/nano/ProductType.java
deleted file mode 100644
index 0b4b1fc..0000000
--- a/languages/javanano/io/bloombox/schema/base/nano/ProductType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.base.nano;
-
-@SuppressWarnings("hiding")
-public final class ProductType extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile ProductType[] _emptyArray;
-  public static ProductType[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ProductType[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .ProductKind kind = 1;
-  public int kind;
-
-  public ProductType() {
-    clear();
-  }
-
-  public ProductType clear() {
-    kind = io.bloombox.schema.base.nano.BaseProductKind.FLOWERS;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.kind != io.bloombox.schema.base.nano.BaseProductKind.FLOWERS) {
-      output.writeInt32(1, this.kind);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.kind != io.bloombox.schema.base.nano.BaseProductKind.FLOWERS) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.kind);
-    }
-    return size;
-  }
-
-  @Override
-  public ProductType mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.base.nano.BaseProductKind.FLOWERS:
-            case io.bloombox.schema.base.nano.BaseProductKind.EDIBLES:
-            case io.bloombox.schema.base.nano.BaseProductKind.EXTRACTS:
-            case io.bloombox.schema.base.nano.BaseProductKind.PREROLLS:
-            case io.bloombox.schema.base.nano.BaseProductKind.APOTHECARY:
-            case io.bloombox.schema.base.nano.BaseProductKind.CARTRIDGES:
-            case io.bloombox.schema.base.nano.BaseProductKind.PLANTS:
-            case io.bloombox.schema.base.nano.BaseProductKind.MERCHANDISE:
-              this.kind = value;
-              break;
-          }
-          break;
-        }
-      }
-    }
-  }
-
-  public static ProductType parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ProductType(), data);
-  }
-
-  public static ProductType parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ProductType().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/content/nano/Brand.java b/languages/javanano/io/bloombox/schema/content/nano/Brand.java
deleted file mode 100644
index 1560352..0000000
--- a/languages/javanano/io/bloombox/schema/content/nano/Brand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.content.nano;
-
-@SuppressWarnings("hiding")
-public final class Brand extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile Brand[] _emptyArray;
-  public static Brand[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new Brand[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .Name name = 1;
-  public io.bloombox.schema.content.nano.Name name;
-
-  // .Brand parent = 2;
-  public io.bloombox.schema.content.nano.Brand parent;
-
-  // .Content summary = 3;
-  public io.bloombox.schema.content.nano.Content summary;
-
-  // repeated .MediaItem media = 20;
-  public io.bloombox.schema.media.nano.MediaItem[] media;
-
-  public Brand() {
-    clear();
-  }
-
-  public Brand clear() {
-    name = null;
-    parent = null;
-    summary = null;
-    media = io.bloombox.schema.media.nano.MediaItem.emptyArray();
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.name != null) {
-      output.writeMessage(1, this.name);
-    }
-    if (this.parent != null) {
-      output.writeMessage(2, this.parent);
-    }
-    if (this.summary != null) {
-      output.writeMessage(3, this.summary);
-    }
-    if (this.media != null && this.media.length > 0) {
-      for (int i = 0; i < this.media.length; i++) {
-        io.bloombox.schema.media.nano.MediaItem element = this.media[i];
-        if (element != null) {
-          output.writeMessage(20, element);
-        }
-      }
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.name != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(1, this.name);
-    }
-    if (this.parent != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.parent);
-    }
-    if (this.summary != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(3, this.summary);
-    }
-    if (this.media != null && this.media.length > 0) {
-      for (int i = 0; i < this.media.length; i++) {
-        io.bloombox.schema.media.nano.MediaItem element = this.media[i];
-        if (element != null) {
-          size += com.google.protobuf.nano.CodedOutputByteBufferNano
-            .computeMessageSize(20, element);
-        }
-      }
-    }
-    return size;
-  }
-
-  @Override
-  public Brand mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          if (this.name == null) {
-            this.name = new io.bloombox.schema.content.nano.Name();
-          }
-          input.readMessage(this.name);
-          break;
-        }
-        case 18: {
-          if (this.parent == null) {
-            this.parent = new io.bloombox.schema.content.nano.Brand();
-          }
-          input.readMessage(this.parent);
-          break;
-        }
-        case 26: {
-          if (this.summary == null) {
-            this.summary = new io.bloombox.schema.content.nano.Content();
-          }
-          input.readMessage(this.summary);
-          break;
-        }
-        case 162: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 162);
-          int i = this.media == null ? 0 : this.media.length;
-          io.bloombox.schema.media.nano.MediaItem[] newArray =
-              new io.bloombox.schema.media.nano.MediaItem[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.media, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = new io.bloombox.schema.media.nano.MediaItem();
-            input.readMessage(newArray[i]);
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = new io.bloombox.schema.media.nano.MediaItem();
-          input.readMessage(newArray[i]);
-          this.media = newArray;
-          break;
-        }
-      }
-    }
-  }
-
-  public static Brand parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new Brand(), data);
-  }
-
-  public static Brand parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new Brand().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/content/nano/Content.java b/languages/javanano/io/bloombox/schema/content/nano/Content.java
deleted file mode 100644
index ef96289..0000000
--- a/languages/javanano/io/bloombox/schema/content/nano/Content.java
+++ /dev/null
@@ -1,178 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.content.nano;
-
-@SuppressWarnings("hiding")
-public final class Content extends
-    com.google.protobuf.nano.MessageNano {
-
-  // enum Type
-  public static final int TEXT = 0;
-  public static final int MARKDOWN = 1;
-  public static final int HTML = 2;
-
-  // enum Encoding
-  public static final int UTF8 = 0;
-
-  private static volatile Content[] _emptyArray;
-  public static Content[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new Content[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .Content.Type type = 1;
-  public int type;
-
-  // .Content.Encoding encoding = 2;
-  public int encoding;
-
-  // bytes content = 3;
-  public byte[] content;
-
-  // .Language language = 4;
-  public int language;
-
-  // .Compression compression = 5;
-  public io.bloombox.schema.base.nano.Compression compression;
-
-  public Content() {
-    clear();
-  }
-
-  public Content clear() {
-    type = io.bloombox.schema.content.nano.Content.TEXT;
-    encoding = io.bloombox.schema.content.nano.Content.UTF8;
-    content = com.google.protobuf.nano.WireFormatNano.EMPTY_BYTES;
-    language = io.bloombox.schema.base.nano.BaseLanguage.ENGLISH;
-    compression = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.type != io.bloombox.schema.content.nano.Content.TEXT) {
-      output.writeInt32(1, this.type);
-    }
-    if (this.encoding != io.bloombox.schema.content.nano.Content.UTF8) {
-      output.writeInt32(2, this.encoding);
-    }
-    if (!java.util.Arrays.equals(this.content, com.google.protobuf.nano.WireFormatNano.EMPTY_BYTES)) {
-      output.writeBytes(3, this.content);
-    }
-    if (this.language != io.bloombox.schema.base.nano.BaseLanguage.ENGLISH) {
-      output.writeInt32(4, this.language);
-    }
-    if (this.compression != null) {
-      output.writeMessage(5, this.compression);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.type != io.bloombox.schema.content.nano.Content.TEXT) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.type);
-    }
-    if (this.encoding != io.bloombox.schema.content.nano.Content.UTF8) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(2, this.encoding);
-    }
-    if (!java.util.Arrays.equals(this.content, com.google.protobuf.nano.WireFormatNano.EMPTY_BYTES)) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBytesSize(3, this.content);
-    }
-    if (this.language != io.bloombox.schema.base.nano.BaseLanguage.ENGLISH) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(4, this.language);
-    }
-    if (this.compression != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(5, this.compression);
-    }
-    return size;
-  }
-
-  @Override
-  public Content mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.content.nano.Content.TEXT:
-            case io.bloombox.schema.content.nano.Content.MARKDOWN:
-            case io.bloombox.schema.content.nano.Content.HTML:
-              this.type = value;
-              break;
-          }
-          break;
-        }
-        case 16: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.content.nano.Content.UTF8:
-              this.encoding = value;
-              break;
-          }
-          break;
-        }
-        case 26: {
-          this.content = input.readBytes();
-          break;
-        }
-        case 32: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.base.nano.BaseLanguage.ENGLISH:
-            case io.bloombox.schema.base.nano.BaseLanguage.SPANISH:
-            case io.bloombox.schema.base.nano.BaseLanguage.FRENCH:
-              this.language = value;
-              break;
-          }
-          break;
-        }
-        case 42: {
-          if (this.compression == null) {
-            this.compression = new io.bloombox.schema.base.nano.Compression();
-          }
-          input.readMessage(this.compression);
-          break;
-        }
-      }
-    }
-  }
-
-  public static Content parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new Content(), data);
-  }
-
-  public static Content parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new Content().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/content/nano/MaterialsData.java b/languages/javanano/io/bloombox/schema/content/nano/MaterialsData.java
deleted file mode 100644
index 8a7d6c9..0000000
--- a/languages/javanano/io/bloombox/schema/content/nano/MaterialsData.java
+++ /dev/null
@@ -1,182 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.content.nano;
-
-@SuppressWarnings("hiding")
-public final class MaterialsData extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile MaterialsData[] _emptyArray;
-  public static MaterialsData[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new MaterialsData[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // repeated string ingredients = 1;
-  public java.lang.String[] ingredients;
-
-  // .Grow grow = 2;
-  public int grow;
-
-  // .Species species = 3;
-  public int species;
-
-  // .Genetics genetics = 4;
-  public io.bloombox.schema.product.struct.nano.Genetics genetics;
-
-  public MaterialsData() {
-    clear();
-  }
-
-  public MaterialsData clear() {
-    ingredients = com.google.protobuf.nano.WireFormatNano.EMPTY_STRING_ARRAY;
-    grow = io.bloombox.schema.product.struct.nano.MaterialGrow.GENERIC;
-    species = io.bloombox.schema.product.struct.nano.MaterialSpecies.UNSPECIFIED;
-    genetics = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.ingredients != null && this.ingredients.length > 0) {
-      for (int i = 0; i < this.ingredients.length; i++) {
-        java.lang.String element = this.ingredients[i];
-        if (element != null) {
-          output.writeString(1, element);
-        }
-      }
-    }
-    if (this.grow != io.bloombox.schema.product.struct.nano.MaterialGrow.GENERIC) {
-      output.writeInt32(2, this.grow);
-    }
-    if (this.species != io.bloombox.schema.product.struct.nano.MaterialSpecies.UNSPECIFIED) {
-      output.writeInt32(3, this.species);
-    }
-    if (this.genetics != null) {
-      output.writeMessage(4, this.genetics);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.ingredients != null && this.ingredients.length > 0) {
-      int dataCount = 0;
-      int dataSize = 0;
-      for (int i = 0; i < this.ingredients.length; i++) {
-        java.lang.String element = this.ingredients[i];
-        if (element != null) {
-          dataCount++;
-          dataSize += com.google.protobuf.nano.CodedOutputByteBufferNano
-              .computeStringSizeNoTag(element);
-        }
-      }
-      size += dataSize;
-      size += 1 * dataCount;
-    }
-    if (this.grow != io.bloombox.schema.product.struct.nano.MaterialGrow.GENERIC) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(2, this.grow);
-    }
-    if (this.species != io.bloombox.schema.product.struct.nano.MaterialSpecies.UNSPECIFIED) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(3, this.species);
-    }
-    if (this.genetics != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(4, this.genetics);
-    }
-    return size;
-  }
-
-  @Override
-  public MaterialsData mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 10);
-          int i = this.ingredients == null ? 0 : this.ingredients.length;
-          java.lang.String[] newArray = new java.lang.String[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.ingredients, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = input.readString();
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = input.readString();
-          this.ingredients = newArray;
-          break;
-        }
-        case 16: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.product.struct.nano.MaterialGrow.GENERIC:
-            case io.bloombox.schema.product.struct.nano.MaterialGrow.INDOOR:
-            case io.bloombox.schema.product.struct.nano.MaterialGrow.GREENHOUSE:
-            case io.bloombox.schema.product.struct.nano.MaterialGrow.OUTDOOR:
-              this.grow = value;
-              break;
-          }
-          break;
-        }
-        case 24: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.product.struct.nano.MaterialSpecies.UNSPECIFIED:
-            case io.bloombox.schema.product.struct.nano.MaterialSpecies.SATIVA:
-            case io.bloombox.schema.product.struct.nano.MaterialSpecies.HYBRID_SATIVA:
-            case io.bloombox.schema.product.struct.nano.MaterialSpecies.HYBRID:
-            case io.bloombox.schema.product.struct.nano.MaterialSpecies.HYBRID_INDICA:
-            case io.bloombox.schema.product.struct.nano.MaterialSpecies.INDICA:
-              this.species = value;
-              break;
-          }
-          break;
-        }
-        case 34: {
-          if (this.genetics == null) {
-            this.genetics = new io.bloombox.schema.product.struct.nano.Genetics();
-          }
-          input.readMessage(this.genetics);
-          break;
-        }
-      }
-    }
-  }
-
-  public static MaterialsData parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new MaterialsData(), data);
-  }
-
-  public static MaterialsData parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new MaterialsData().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/content/nano/Name.java b/languages/javanano/io/bloombox/schema/content/nano/Name.java
deleted file mode 100644
index b2d6d49..0000000
--- a/languages/javanano/io/bloombox/schema/content/nano/Name.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.content.nano;
-
-@SuppressWarnings("hiding")
-public final class Name extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile Name[] _emptyArray;
-  public static Name[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new Name[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // string primary = 1;
-  public java.lang.String primary;
-
-  // string display = 2;
-  public java.lang.String display;
-
-  public Name() {
-    clear();
-  }
-
-  public Name clear() {
-    primary = "";
-    display = "";
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (!this.primary.equals("")) {
-      output.writeString(1, this.primary);
-    }
-    if (!this.display.equals("")) {
-      output.writeString(2, this.display);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (!this.primary.equals("")) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeStringSize(1, this.primary);
-    }
-    if (!this.display.equals("")) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeStringSize(2, this.display);
-    }
-    return size;
-  }
-
-  @Override
-  public Name mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          this.primary = input.readString();
-          break;
-        }
-        case 18: {
-          this.display = input.readString();
-          break;
-        }
-      }
-    }
-  }
-
-  public static Name parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new Name(), data);
-  }
-
-  public static Name parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new Name().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/content/nano/ProductContent.java b/languages/javanano/io/bloombox/schema/content/nano/ProductContent.java
deleted file mode 100644
index e9850d8..0000000
--- a/languages/javanano/io/bloombox/schema/content/nano/ProductContent.java
+++ /dev/null
@@ -1,222 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.content.nano;
-
-@SuppressWarnings("hiding")
-public final class ProductContent extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile ProductContent[] _emptyArray;
-  public static ProductContent[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ProductContent[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .Name name = 1;
-  public io.bloombox.schema.content.nano.Name name;
-
-  // .Content summary = 2;
-  public io.bloombox.schema.content.nano.Content summary;
-
-  // .Brand brand = 3;
-  public io.bloombox.schema.content.nano.Brand brand;
-
-  // repeated .MediaItem media = 20;
-  public io.bloombox.schema.media.nano.MediaItem[] media;
-
-  // .Content usage = 30;
-  public io.bloombox.schema.content.nano.Content usage;
-
-  // .Content dosage = 31;
-  public io.bloombox.schema.content.nano.Content dosage;
-
-  // .Content advice = 32;
-  public io.bloombox.schema.content.nano.Content advice;
-
-  public ProductContent() {
-    clear();
-  }
-
-  public ProductContent clear() {
-    name = null;
-    summary = null;
-    brand = null;
-    media = io.bloombox.schema.media.nano.MediaItem.emptyArray();
-    usage = null;
-    dosage = null;
-    advice = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.name != null) {
-      output.writeMessage(1, this.name);
-    }
-    if (this.summary != null) {
-      output.writeMessage(2, this.summary);
-    }
-    if (this.brand != null) {
-      output.writeMessage(3, this.brand);
-    }
-    if (this.media != null && this.media.length > 0) {
-      for (int i = 0; i < this.media.length; i++) {
-        io.bloombox.schema.media.nano.MediaItem element = this.media[i];
-        if (element != null) {
-          output.writeMessage(20, element);
-        }
-      }
-    }
-    if (this.usage != null) {
-      output.writeMessage(30, this.usage);
-    }
-    if (this.dosage != null) {
-      output.writeMessage(31, this.dosage);
-    }
-    if (this.advice != null) {
-      output.writeMessage(32, this.advice);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.name != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(1, this.name);
-    }
-    if (this.summary != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.summary);
-    }
-    if (this.brand != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(3, this.brand);
-    }
-    if (this.media != null && this.media.length > 0) {
-      for (int i = 0; i < this.media.length; i++) {
-        io.bloombox.schema.media.nano.MediaItem element = this.media[i];
-        if (element != null) {
-          size += com.google.protobuf.nano.CodedOutputByteBufferNano
-            .computeMessageSize(20, element);
-        }
-      }
-    }
-    if (this.usage != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(30, this.usage);
-    }
-    if (this.dosage != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(31, this.dosage);
-    }
-    if (this.advice != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(32, this.advice);
-    }
-    return size;
-  }
-
-  @Override
-  public ProductContent mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          if (this.name == null) {
-            this.name = new io.bloombox.schema.content.nano.Name();
-          }
-          input.readMessage(this.name);
-          break;
-        }
-        case 18: {
-          if (this.summary == null) {
-            this.summary = new io.bloombox.schema.content.nano.Content();
-          }
-          input.readMessage(this.summary);
-          break;
-        }
-        case 26: {
-          if (this.brand == null) {
-            this.brand = new io.bloombox.schema.content.nano.Brand();
-          }
-          input.readMessage(this.brand);
-          break;
-        }
-        case 162: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 162);
-          int i = this.media == null ? 0 : this.media.length;
-          io.bloombox.schema.media.nano.MediaItem[] newArray =
-              new io.bloombox.schema.media.nano.MediaItem[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.media, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = new io.bloombox.schema.media.nano.MediaItem();
-            input.readMessage(newArray[i]);
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = new io.bloombox.schema.media.nano.MediaItem();
-          input.readMessage(newArray[i]);
-          this.media = newArray;
-          break;
-        }
-        case 242: {
-          if (this.usage == null) {
-            this.usage = new io.bloombox.schema.content.nano.Content();
-          }
-          input.readMessage(this.usage);
-          break;
-        }
-        case 250: {
-          if (this.dosage == null) {
-            this.dosage = new io.bloombox.schema.content.nano.Content();
-          }
-          input.readMessage(this.dosage);
-          break;
-        }
-        case 258: {
-          if (this.advice == null) {
-            this.advice = new io.bloombox.schema.content.nano.Content();
-          }
-          input.readMessage(this.advice);
-          break;
-        }
-      }
-    }
-  }
-
-  public static ProductContent parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ProductContent(), data);
-  }
-
-  public static ProductContent parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ProductContent().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/media/nano/DocumentType.java b/languages/javanano/io/bloombox/schema/media/nano/DocumentType.java
deleted file mode 100644
index c4b9b5f..0000000
--- a/languages/javanano/io/bloombox/schema/media/nano/DocumentType.java
+++ /dev/null
@@ -1,117 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.media.nano;
-
-@SuppressWarnings("hiding")
-public final class DocumentType extends
-    com.google.protobuf.nano.MessageNano {
-
-  // enum DocumentKind
-  public static final int TXT = 0;
-  public static final int HTML = 1;
-  public static final int PDF = 2;
-  public static final int MARKDOWN = 3;
-
-  private static volatile DocumentType[] _emptyArray;
-  public static DocumentType[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new DocumentType[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .DocumentType.DocumentKind kind = 1;
-  public int kind;
-
-  // bool compressed = 2;
-  public boolean compressed;
-
-  public DocumentType() {
-    clear();
-  }
-
-  public DocumentType clear() {
-    kind = io.bloombox.schema.media.nano.DocumentType.TXT;
-    compressed = false;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.kind != io.bloombox.schema.media.nano.DocumentType.TXT) {
-      output.writeInt32(1, this.kind);
-    }
-    if (this.compressed != false) {
-      output.writeBool(2, this.compressed);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.kind != io.bloombox.schema.media.nano.DocumentType.TXT) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.kind);
-    }
-    if (this.compressed != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(2, this.compressed);
-    }
-    return size;
-  }
-
-  @Override
-  public DocumentType mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.media.nano.DocumentType.TXT:
-            case io.bloombox.schema.media.nano.DocumentType.HTML:
-            case io.bloombox.schema.media.nano.DocumentType.PDF:
-            case io.bloombox.schema.media.nano.DocumentType.MARKDOWN:
-              this.kind = value;
-              break;
-          }
-          break;
-        }
-        case 16: {
-          this.compressed = input.readBool();
-          break;
-        }
-      }
-    }
-  }
-
-  public static DocumentType parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new DocumentType(), data);
-  }
-
-  public static DocumentType parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new DocumentType().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/media/nano/ImageType.java b/languages/javanano/io/bloombox/schema/media/nano/ImageType.java
deleted file mode 100644
index a203303..0000000
--- a/languages/javanano/io/bloombox/schema/media/nano/ImageType.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.media.nano;
-
-@SuppressWarnings("hiding")
-public final class ImageType extends
-    com.google.protobuf.nano.MessageNano {
-
-  // enum ImageKind
-  public static final int PNG = 0;
-  public static final int JPG = 1;
-  public static final int GIF = 2;
-  public static final int SVG = 3;
-  public static final int WEBP = 4;
-
-  private static volatile ImageType[] _emptyArray;
-  public static ImageType[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ImageType[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .ImageType.ImageKind kind = 1;
-  public int kind;
-
-  public ImageType() {
-    clear();
-  }
-
-  public ImageType clear() {
-    kind = io.bloombox.schema.media.nano.ImageType.PNG;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.kind != io.bloombox.schema.media.nano.ImageType.PNG) {
-      output.writeInt32(1, this.kind);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.kind != io.bloombox.schema.media.nano.ImageType.PNG) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.kind);
-    }
-    return size;
-  }
-
-  @Override
-  public ImageType mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.media.nano.ImageType.PNG:
-            case io.bloombox.schema.media.nano.ImageType.JPG:
-            case io.bloombox.schema.media.nano.ImageType.GIF:
-            case io.bloombox.schema.media.nano.ImageType.SVG:
-            case io.bloombox.schema.media.nano.ImageType.WEBP:
-              this.kind = value;
-              break;
-          }
-          break;
-        }
-      }
-    }
-  }
-
-  public static ImageType parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ImageType(), data);
-  }
-
-  public static ImageType parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ImageType().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/media/nano/MediaItem.java b/languages/javanano/io/bloombox/schema/media/nano/MediaItem.java
deleted file mode 100644
index b45f357..0000000
--- a/languages/javanano/io/bloombox/schema/media/nano/MediaItem.java
+++ /dev/null
@@ -1,124 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.media.nano;
-
-@SuppressWarnings("hiding")
-public final class MediaItem extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile MediaItem[] _emptyArray;
-  public static MediaItem[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new MediaItem[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .MediaKey key = 1;
-  public io.bloombox.schema.media.nano.MediaKey key;
-
-  // .MediaType type = 2;
-  public io.bloombox.schema.media.nano.MediaType type;
-
-  // string name = 3;
-  public java.lang.String name;
-
-  public MediaItem() {
-    clear();
-  }
-
-  public MediaItem clear() {
-    key = null;
-    type = null;
-    name = "";
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.key != null) {
-      output.writeMessage(1, this.key);
-    }
-    if (this.type != null) {
-      output.writeMessage(2, this.type);
-    }
-    if (!this.name.equals("")) {
-      output.writeString(3, this.name);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.key != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(1, this.key);
-    }
-    if (this.type != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.type);
-    }
-    if (!this.name.equals("")) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeStringSize(3, this.name);
-    }
-    return size;
-  }
-
-  @Override
-  public MediaItem mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          if (this.key == null) {
-            this.key = new io.bloombox.schema.media.nano.MediaKey();
-          }
-          input.readMessage(this.key);
-          break;
-        }
-        case 18: {
-          if (this.type == null) {
-            this.type = new io.bloombox.schema.media.nano.MediaType();
-          }
-          input.readMessage(this.type);
-          break;
-        }
-        case 26: {
-          this.name = input.readString();
-          break;
-        }
-      }
-    }
-  }
-
-  public static MediaItem parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new MediaItem(), data);
-  }
-
-  public static MediaItem parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new MediaItem().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/media/nano/MediaKey.java b/languages/javanano/io/bloombox/schema/media/nano/MediaKey.java
deleted file mode 100644
index 7ce0859..0000000
--- a/languages/javanano/io/bloombox/schema/media/nano/MediaKey.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.media.nano;
-
-@SuppressWarnings("hiding")
-public final class MediaKey extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile MediaKey[] _emptyArray;
-  public static MediaKey[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new MediaKey[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // string id = 1;
-  public java.lang.String id;
-
-  public MediaKey() {
-    clear();
-  }
-
-  public MediaKey clear() {
-    id = "";
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (!this.id.equals("")) {
-      output.writeString(1, this.id);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (!this.id.equals("")) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeStringSize(1, this.id);
-    }
-    return size;
-  }
-
-  @Override
-  public MediaKey mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          this.id = input.readString();
-          break;
-        }
-      }
-    }
-  }
-
-  public static MediaKey parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new MediaKey(), data);
-  }
-
-  public static MediaKey parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new MediaKey().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/media/nano/MediaType.java b/languages/javanano/io/bloombox/schema/media/nano/MediaType.java
deleted file mode 100644
index dcf72da..0000000
--- a/languages/javanano/io/bloombox/schema/media/nano/MediaType.java
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.media.nano;
-
-@SuppressWarnings("hiding")
-public final class MediaType extends
-    com.google.protobuf.nano.MessageNano {
-
-  // enum Kind
-  public static final int LINK = 0;
-  public static final int IMAGE = 1;
-  public static final int DOCUMENT = 2;
-  public static final int VIDEO = 3;
-
-  private static volatile MediaType[] _emptyArray;
-  public static MediaType[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new MediaType[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .MediaType.Kind kind = 1;
-  public int kind;
-
-  // .ImageType image_type = 101;
-  public io.bloombox.schema.media.nano.ImageType imageType;
-
-  // .DocumentType document_type = 201;
-  public io.bloombox.schema.media.nano.DocumentType documentType;
-
-  // .VideoType video_type = 301;
-  public io.bloombox.schema.media.nano.VideoType videoType;
-
-  public MediaType() {
-    clear();
-  }
-
-  public MediaType clear() {
-    kind = io.bloombox.schema.media.nano.MediaType.LINK;
-    imageType = null;
-    documentType = null;
-    videoType = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.kind != io.bloombox.schema.media.nano.MediaType.LINK) {
-      output.writeInt32(1, this.kind);
-    }
-    if (this.imageType != null) {
-      output.writeMessage(101, this.imageType);
-    }
-    if (this.documentType != null) {
-      output.writeMessage(201, this.documentType);
-    }
-    if (this.videoType != null) {
-      output.writeMessage(301, this.videoType);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.kind != io.bloombox.schema.media.nano.MediaType.LINK) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.kind);
-    }
-    if (this.imageType != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(101, this.imageType);
-    }
-    if (this.documentType != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(201, this.documentType);
-    }
-    if (this.videoType != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(301, this.videoType);
-    }
-    return size;
-  }
-
-  @Override
-  public MediaType mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.media.nano.MediaType.LINK:
-            case io.bloombox.schema.media.nano.MediaType.IMAGE:
-            case io.bloombox.schema.media.nano.MediaType.DOCUMENT:
-            case io.bloombox.schema.media.nano.MediaType.VIDEO:
-              this.kind = value;
-              break;
-          }
-          break;
-        }
-        case 810: {
-          if (this.imageType == null) {
-            this.imageType = new io.bloombox.schema.media.nano.ImageType();
-          }
-          input.readMessage(this.imageType);
-          break;
-        }
-        case 1610: {
-          if (this.documentType == null) {
-            this.documentType = new io.bloombox.schema.media.nano.DocumentType();
-          }
-          input.readMessage(this.documentType);
-          break;
-        }
-        case 2410: {
-          if (this.videoType == null) {
-            this.videoType = new io.bloombox.schema.media.nano.VideoType();
-          }
-          input.readMessage(this.videoType);
-          break;
-        }
-      }
-    }
-  }
-
-  public static MediaType parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new MediaType(), data);
-  }
-
-  public static MediaType parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new MediaType().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/media/nano/VideoType.java b/languages/javanano/io/bloombox/schema/media/nano/VideoType.java
deleted file mode 100644
index 29ae75d..0000000
--- a/languages/javanano/io/bloombox/schema/media/nano/VideoType.java
+++ /dev/null
@@ -1,100 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.media.nano;
-
-@SuppressWarnings("hiding")
-public final class VideoType extends
-    com.google.protobuf.nano.MessageNano {
-
-  // enum VideoKind
-  public static final int MP4 = 0;
-  public static final int FLV = 1;
-  public static final int HLS = 2;
-
-  private static volatile VideoType[] _emptyArray;
-  public static VideoType[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new VideoType[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .VideoType.VideoKind kind = 1;
-  public int kind;
-
-  public VideoType() {
-    clear();
-  }
-
-  public VideoType clear() {
-    kind = io.bloombox.schema.media.nano.VideoType.MP4;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.kind != io.bloombox.schema.media.nano.VideoType.MP4) {
-      output.writeInt32(1, this.kind);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.kind != io.bloombox.schema.media.nano.VideoType.MP4) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.kind);
-    }
-    return size;
-  }
-
-  @Override
-  public VideoType mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.media.nano.VideoType.MP4:
-            case io.bloombox.schema.media.nano.VideoType.FLV:
-            case io.bloombox.schema.media.nano.VideoType.HLS:
-              this.kind = value;
-              break;
-          }
-          break;
-        }
-      }
-    }
-  }
-
-  public static VideoType parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new VideoType(), data);
-  }
-
-  public static VideoType parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new VideoType().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/nano/FlowerProduct.java b/languages/javanano/io/bloombox/schema/product/nano/FlowerProduct.java
deleted file mode 100644
index 42399b4..0000000
--- a/languages/javanano/io/bloombox/schema/product/nano/FlowerProduct.java
+++ /dev/null
@@ -1,166 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.nano;
-
-@SuppressWarnings("hiding")
-public interface FlowerProduct {
-
-  public static final class Flower extends
-      com.google.protobuf.nano.MessageNano {
-
-    private static volatile Flower[] _emptyArray;
-    public static Flower[] emptyArray() {
-      // Lazily initializes the empty array
-      if (_emptyArray == null) {
-        synchronized (
-            com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-          if (_emptyArray == null) {
-            _emptyArray = new Flower[0];
-          }
-        }
-      }
-      return _emptyArray;
-    }
-
-    // .ProductKey key = 1;
-    public io.bloombox.schema.base.nano.ProductKey key;
-
-    // .ProductContent product_data = 20;
-    public io.bloombox.schema.content.nano.ProductContent productData;
-
-    // .MaterialsData material_data = 21;
-    public io.bloombox.schema.content.nano.MaterialsData materialData;
-
-    // .FlagsDescriptor flags = 22;
-    public io.bloombox.schema.product.struct.nano.FlagsDescriptor flags;
-
-    // .ProductPricing pricing = 23;
-    public io.bloombox.schema.product.struct.nano.ProductPricing pricing;
-
-    public Flower() {
-      clear();
-    }
-
-    public Flower clear() {
-      key = null;
-      productData = null;
-      materialData = null;
-      flags = null;
-      pricing = null;
-      cachedSize = -1;
-      return this;
-    }
-
-    @Override
-    public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-        throws java.io.IOException {
-      if (this.key != null) {
-        output.writeMessage(1, this.key);
-      }
-      if (this.productData != null) {
-        output.writeMessage(20, this.productData);
-      }
-      if (this.materialData != null) {
-        output.writeMessage(21, this.materialData);
-      }
-      if (this.flags != null) {
-        output.writeMessage(22, this.flags);
-      }
-      if (this.pricing != null) {
-        output.writeMessage(23, this.pricing);
-      }
-      super.writeTo(output);
-    }
-
-    @Override
-    protected int computeSerializedSize() {
-      int size = super.computeSerializedSize();
-      if (this.key != null) {
-        size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeMessageSize(1, this.key);
-      }
-      if (this.productData != null) {
-        size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeMessageSize(20, this.productData);
-      }
-      if (this.materialData != null) {
-        size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeMessageSize(21, this.materialData);
-      }
-      if (this.flags != null) {
-        size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeMessageSize(22, this.flags);
-      }
-      if (this.pricing != null) {
-        size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeMessageSize(23, this.pricing);
-      }
-      return size;
-    }
-
-    @Override
-    public Flower mergeFrom(
-            com.google.protobuf.nano.CodedInputByteBufferNano input)
-        throws java.io.IOException {
-      while (true) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            return this;
-          default: {
-            if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-          case 10: {
-            if (this.key == null) {
-              this.key = new io.bloombox.schema.base.nano.ProductKey();
-            }
-            input.readMessage(this.key);
-            break;
-          }
-          case 162: {
-            if (this.productData == null) {
-              this.productData = new io.bloombox.schema.content.nano.ProductContent();
-            }
-            input.readMessage(this.productData);
-            break;
-          }
-          case 170: {
-            if (this.materialData == null) {
-              this.materialData = new io.bloombox.schema.content.nano.MaterialsData();
-            }
-            input.readMessage(this.materialData);
-            break;
-          }
-          case 178: {
-            if (this.flags == null) {
-              this.flags = new io.bloombox.schema.product.struct.nano.FlagsDescriptor();
-            }
-            input.readMessage(this.flags);
-            break;
-          }
-          case 186: {
-            if (this.pricing == null) {
-              this.pricing = new io.bloombox.schema.product.struct.nano.ProductPricing();
-            }
-            input.readMessage(this.pricing);
-            break;
-          }
-        }
-      }
-    }
-
-    public static Flower parseFrom(byte[] data)
-        throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-      return com.google.protobuf.nano.MessageNano.mergeFrom(new Flower(), data);
-    }
-
-    public static Flower parseFrom(
-            com.google.protobuf.nano.CodedInputByteBufferNano input)
-        throws java.io.IOException {
-      return new Flower().mergeFrom(input);
-    }
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/BaseStructs.java b/languages/javanano/io/bloombox/schema/product/struct/nano/BaseStructs.java
deleted file mode 100644
index 7a28e98..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/BaseStructs.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public interface BaseStructs {
-
-  // enum ProductFlag
-  public static final int VISIBLE = 0;
-  public static final int PREMIUM = 1;
-  public static final int FEATURED = 2;
-  public static final int LASTCHANCE = 3;
-  public static final int INHOUSE = 4;
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/FlagsDescriptor.java b/languages/javanano/io/bloombox/schema/product/struct/nano/FlagsDescriptor.java
deleted file mode 100644
index 62bfb13..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/FlagsDescriptor.java
+++ /dev/null
@@ -1,148 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class FlagsDescriptor extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile FlagsDescriptor[] _emptyArray;
-  public static FlagsDescriptor[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new FlagsDescriptor[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // bool visible = 1;
-  public boolean visible;
-
-  // bool premium = 2;
-  public boolean premium;
-
-  // bool featured = 3;
-  public boolean featured;
-
-  // bool lastchance = 4;
-  public boolean lastchance;
-
-  // bool inhouse = 5;
-  public boolean inhouse;
-
-  public FlagsDescriptor() {
-    clear();
-  }
-
-  public FlagsDescriptor clear() {
-    visible = false;
-    premium = false;
-    featured = false;
-    lastchance = false;
-    inhouse = false;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.visible != false) {
-      output.writeBool(1, this.visible);
-    }
-    if (this.premium != false) {
-      output.writeBool(2, this.premium);
-    }
-    if (this.featured != false) {
-      output.writeBool(3, this.featured);
-    }
-    if (this.lastchance != false) {
-      output.writeBool(4, this.lastchance);
-    }
-    if (this.inhouse != false) {
-      output.writeBool(5, this.inhouse);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.visible != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(1, this.visible);
-    }
-    if (this.premium != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(2, this.premium);
-    }
-    if (this.featured != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(3, this.featured);
-    }
-    if (this.lastchance != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(4, this.lastchance);
-    }
-    if (this.inhouse != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(5, this.inhouse);
-    }
-    return size;
-  }
-
-  @Override
-  public FlagsDescriptor mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          this.visible = input.readBool();
-          break;
-        }
-        case 16: {
-          this.premium = input.readBool();
-          break;
-        }
-        case 24: {
-          this.featured = input.readBool();
-          break;
-        }
-        case 32: {
-          this.lastchance = input.readBool();
-          break;
-        }
-        case 40: {
-          this.inhouse = input.readBool();
-          break;
-        }
-      }
-    }
-  }
-
-  public static FlagsDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new FlagsDescriptor(), data);
-  }
-
-  public static FlagsDescriptor parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new FlagsDescriptor().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/FreebiePricingDescriptor.java b/languages/javanano/io/bloombox/schema/product/struct/nano/FreebiePricingDescriptor.java
deleted file mode 100644
index f6ead2f..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/FreebiePricingDescriptor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class FreebiePricingDescriptor extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile FreebiePricingDescriptor[] _emptyArray;
-  public static FreebiePricingDescriptor[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new FreebiePricingDescriptor[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  public FreebiePricingDescriptor() {
-    clear();
-  }
-
-  public FreebiePricingDescriptor clear() {
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public FreebiePricingDescriptor mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-      }
-    }
-  }
-
-  public static FreebiePricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new FreebiePricingDescriptor(), data);
-  }
-
-  public static FreebiePricingDescriptor parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new FreebiePricingDescriptor().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/Genetics.java b/languages/javanano/io/bloombox/schema/product/struct/nano/Genetics.java
deleted file mode 100644
index c2f3405..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/Genetics.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class Genetics extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile Genetics[] _emptyArray;
-  public static Genetics[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new Genetics[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .Name male = 1;
-  public io.bloombox.schema.content.nano.Name male;
-
-  // .Name female = 2;
-  public io.bloombox.schema.content.nano.Name female;
-
-  public Genetics() {
-    clear();
-  }
-
-  public Genetics clear() {
-    male = null;
-    female = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.male != null) {
-      output.writeMessage(1, this.male);
-    }
-    if (this.female != null) {
-      output.writeMessage(2, this.female);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.male != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(1, this.male);
-    }
-    if (this.female != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.female);
-    }
-    return size;
-  }
-
-  @Override
-  public Genetics mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          if (this.male == null) {
-            this.male = new io.bloombox.schema.content.nano.Name();
-          }
-          input.readMessage(this.male);
-          break;
-        }
-        case 18: {
-          if (this.female == null) {
-            this.female = new io.bloombox.schema.content.nano.Name();
-          }
-          input.readMessage(this.female);
-          break;
-        }
-      }
-    }
-  }
-
-  public static Genetics parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new Genetics(), data);
-  }
-
-  public static Genetics parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new Genetics().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/MaterialGrow.java b/languages/javanano/io/bloombox/schema/product/struct/nano/MaterialGrow.java
deleted file mode 100644
index 615f9f2..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/MaterialGrow.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public interface MaterialGrow {
-
-  // enum Grow
-  public static final int GENERIC = 0;
-  public static final int INDOOR = 1;
-  public static final int GREENHOUSE = 2;
-  public static final int OUTDOOR = 3;
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/MaterialSpecies.java b/languages/javanano/io/bloombox/schema/product/struct/nano/MaterialSpecies.java
deleted file mode 100644
index b70c2ea..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/MaterialSpecies.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public interface MaterialSpecies {
-
-  // enum Species
-  public static final int UNSPECIFIED = 0;
-  public static final int SATIVA = 1;
-  public static final int HYBRID_SATIVA = 2;
-  public static final int HYBRID = 3;
-  public static final int HYBRID_INDICA = 4;
-  public static final int INDICA = 5;
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/PricingDescriptor.java b/languages/javanano/io/bloombox/schema/product/struct/nano/PricingDescriptor.java
deleted file mode 100644
index aca35ff..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/PricingDescriptor.java
+++ /dev/null
@@ -1,149 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class PricingDescriptor extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile PricingDescriptor[] _emptyArray;
-  public static PricingDescriptor[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new PricingDescriptor[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .PricingType type = 1;
-  public int type;
-
-  // .UnitPricingDescriptor unit = 20;
-  public io.bloombox.schema.product.struct.nano.UnitPricingDescriptor unit;
-
-  // .WeightedPricingDescriptor weighted = 21;
-  public io.bloombox.schema.product.struct.nano.WeightedPricingDescriptor weighted;
-
-  // .FreebiePricingDescriptor freebie = 22;
-  public io.bloombox.schema.product.struct.nano.FreebiePricingDescriptor freebie;
-
-  public PricingDescriptor() {
-    clear();
-  }
-
-  public PricingDescriptor clear() {
-    type = io.bloombox.schema.product.struct.nano.ProductPricingSpec.UNIT;
-    unit = null;
-    weighted = null;
-    freebie = null;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.type != io.bloombox.schema.product.struct.nano.ProductPricingSpec.UNIT) {
-      output.writeInt32(1, this.type);
-    }
-    if (this.unit != null) {
-      output.writeMessage(20, this.unit);
-    }
-    if (this.weighted != null) {
-      output.writeMessage(21, this.weighted);
-    }
-    if (this.freebie != null) {
-      output.writeMessage(22, this.freebie);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.type != io.bloombox.schema.product.struct.nano.ProductPricingSpec.UNIT) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.type);
-    }
-    if (this.unit != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(20, this.unit);
-    }
-    if (this.weighted != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(21, this.weighted);
-    }
-    if (this.freebie != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(22, this.freebie);
-    }
-    return size;
-  }
-
-  @Override
-  public PricingDescriptor mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.UNIT:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.WEIGHTED:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.FREEBIE:
-              this.type = value;
-              break;
-          }
-          break;
-        }
-        case 162: {
-          if (this.unit == null) {
-            this.unit = new io.bloombox.schema.product.struct.nano.UnitPricingDescriptor();
-          }
-          input.readMessage(this.unit);
-          break;
-        }
-        case 170: {
-          if (this.weighted == null) {
-            this.weighted = new io.bloombox.schema.product.struct.nano.WeightedPricingDescriptor();
-          }
-          input.readMessage(this.weighted);
-          break;
-        }
-        case 178: {
-          if (this.freebie == null) {
-            this.freebie = new io.bloombox.schema.product.struct.nano.FreebiePricingDescriptor();
-          }
-          input.readMessage(this.freebie);
-          break;
-        }
-      }
-    }
-  }
-
-  public static PricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new PricingDescriptor(), data);
-  }
-
-  public static PricingDescriptor parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new PricingDescriptor().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/PricingTierAvailability.java b/languages/javanano/io/bloombox/schema/product/struct/nano/PricingTierAvailability.java
deleted file mode 100644
index 41edf7c..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/PricingTierAvailability.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class PricingTierAvailability extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile PricingTierAvailability[] _emptyArray;
-  public static PricingTierAvailability[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new PricingTierAvailability[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // bool offered = 1;
-  public boolean offered;
-
-  // bool available = 2;
-  public boolean available;
-
-  public PricingTierAvailability() {
-    clear();
-  }
-
-  public PricingTierAvailability clear() {
-    offered = false;
-    available = false;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.offered != false) {
-      output.writeBool(1, this.offered);
-    }
-    if (this.available != false) {
-      output.writeBool(2, this.available);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.offered != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(1, this.offered);
-    }
-    if (this.available != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(2, this.available);
-    }
-    return size;
-  }
-
-  @Override
-  public PricingTierAvailability mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          this.offered = input.readBool();
-          break;
-        }
-        case 16: {
-          this.available = input.readBool();
-          break;
-        }
-      }
-    }
-  }
-
-  public static PricingTierAvailability parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new PricingTierAvailability(), data);
-  }
-
-  public static PricingTierAvailability parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new PricingTierAvailability().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductDiscount.java b/languages/javanano/io/bloombox/schema/product/struct/nano/ProductDiscount.java
deleted file mode 100644
index 7b1916d..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductDiscount.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public interface ProductDiscount {
-
-  // enum SaleType
-  public static final int PERCENTAGE = 0;
-  public static final int BOGO = 1;
-  public static final int LOYALTY = 2;
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductFlagValue.java b/languages/javanano/io/bloombox/schema/product/struct/nano/ProductFlagValue.java
deleted file mode 100644
index 4564629..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductFlagValue.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class ProductFlagValue extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile ProductFlagValue[] _emptyArray;
-  public static ProductFlagValue[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ProductFlagValue[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .ProductFlag type = 1;
-  public int type;
-
-  // bool value = 2;
-  public boolean value;
-
-  public ProductFlagValue() {
-    clear();
-  }
-
-  public ProductFlagValue clear() {
-    type = io.bloombox.schema.product.struct.nano.BaseStructs.VISIBLE;
-    value = false;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.type != io.bloombox.schema.product.struct.nano.BaseStructs.VISIBLE) {
-      output.writeInt32(1, this.type);
-    }
-    if (this.value != false) {
-      output.writeBool(2, this.value);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.type != io.bloombox.schema.product.struct.nano.BaseStructs.VISIBLE) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.type);
-    }
-    if (this.value != false) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeBoolSize(2, this.value);
-    }
-    return size;
-  }
-
-  @Override
-  public ProductFlagValue mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.product.struct.nano.BaseStructs.VISIBLE:
-            case io.bloombox.schema.product.struct.nano.BaseStructs.PREMIUM:
-            case io.bloombox.schema.product.struct.nano.BaseStructs.FEATURED:
-            case io.bloombox.schema.product.struct.nano.BaseStructs.LASTCHANCE:
-            case io.bloombox.schema.product.struct.nano.BaseStructs.INHOUSE:
-              this.type = value;
-              break;
-          }
-          break;
-        }
-        case 16: {
-          this.value = input.readBool();
-          break;
-        }
-      }
-    }
-  }
-
-  public static ProductFlagValue parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ProductFlagValue(), data);
-  }
-
-  public static ProductFlagValue parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ProductFlagValue().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductFlagset.java b/languages/javanano/io/bloombox/schema/product/struct/nano/ProductFlagset.java
deleted file mode 100644
index ff018a8..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductFlagset.java
+++ /dev/null
@@ -1,114 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class ProductFlagset extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile ProductFlagset[] _emptyArray;
-  public static ProductFlagset[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ProductFlagset[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // repeated .ProductFlagValue flags = 1;
-  public io.bloombox.schema.product.struct.nano.ProductFlagValue[] flags;
-
-  public ProductFlagset() {
-    clear();
-  }
-
-  public ProductFlagset clear() {
-    flags = io.bloombox.schema.product.struct.nano.ProductFlagValue.emptyArray();
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.flags != null && this.flags.length > 0) {
-      for (int i = 0; i < this.flags.length; i++) {
-        io.bloombox.schema.product.struct.nano.ProductFlagValue element = this.flags[i];
-        if (element != null) {
-          output.writeMessage(1, element);
-        }
-      }
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.flags != null && this.flags.length > 0) {
-      for (int i = 0; i < this.flags.length; i++) {
-        io.bloombox.schema.product.struct.nano.ProductFlagValue element = this.flags[i];
-        if (element != null) {
-          size += com.google.protobuf.nano.CodedOutputByteBufferNano
-            .computeMessageSize(1, element);
-        }
-      }
-    }
-    return size;
-  }
-
-  @Override
-  public ProductFlagset mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 10);
-          int i = this.flags == null ? 0 : this.flags.length;
-          io.bloombox.schema.product.struct.nano.ProductFlagValue[] newArray =
-              new io.bloombox.schema.product.struct.nano.ProductFlagValue[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.flags, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = new io.bloombox.schema.product.struct.nano.ProductFlagValue();
-            input.readMessage(newArray[i]);
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = new io.bloombox.schema.product.struct.nano.ProductFlagValue();
-          input.readMessage(newArray[i]);
-          this.flags = newArray;
-          break;
-        }
-      }
-    }
-  }
-
-  public static ProductFlagset parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ProductFlagset(), data);
-  }
-
-  public static ProductFlagset parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ProductFlagset().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductPricing.java b/languages/javanano/io/bloombox/schema/product/struct/nano/ProductPricing.java
deleted file mode 100644
index 537766e..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductPricing.java
+++ /dev/null
@@ -1,155 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class ProductPricing extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile ProductPricing[] _emptyArray;
-  public static ProductPricing[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new ProductPricing[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // repeated .SaleDescriptor discounts = 1;
-  public io.bloombox.schema.product.struct.nano.SaleDescriptor[] discounts;
-
-  // repeated .PricingDescriptor manifest = 2;
-  public io.bloombox.schema.product.struct.nano.PricingDescriptor[] manifest;
-
-  public ProductPricing() {
-    clear();
-  }
-
-  public ProductPricing clear() {
-    discounts = io.bloombox.schema.product.struct.nano.SaleDescriptor.emptyArray();
-    manifest = io.bloombox.schema.product.struct.nano.PricingDescriptor.emptyArray();
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.discounts != null && this.discounts.length > 0) {
-      for (int i = 0; i < this.discounts.length; i++) {
-        io.bloombox.schema.product.struct.nano.SaleDescriptor element = this.discounts[i];
-        if (element != null) {
-          output.writeMessage(1, element);
-        }
-      }
-    }
-    if (this.manifest != null && this.manifest.length > 0) {
-      for (int i = 0; i < this.manifest.length; i++) {
-        io.bloombox.schema.product.struct.nano.PricingDescriptor element = this.manifest[i];
-        if (element != null) {
-          output.writeMessage(2, element);
-        }
-      }
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.discounts != null && this.discounts.length > 0) {
-      for (int i = 0; i < this.discounts.length; i++) {
-        io.bloombox.schema.product.struct.nano.SaleDescriptor element = this.discounts[i];
-        if (element != null) {
-          size += com.google.protobuf.nano.CodedOutputByteBufferNano
-            .computeMessageSize(1, element);
-        }
-      }
-    }
-    if (this.manifest != null && this.manifest.length > 0) {
-      for (int i = 0; i < this.manifest.length; i++) {
-        io.bloombox.schema.product.struct.nano.PricingDescriptor element = this.manifest[i];
-        if (element != null) {
-          size += com.google.protobuf.nano.CodedOutputByteBufferNano
-            .computeMessageSize(2, element);
-        }
-      }
-    }
-    return size;
-  }
-
-  @Override
-  public ProductPricing mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 10: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 10);
-          int i = this.discounts == null ? 0 : this.discounts.length;
-          io.bloombox.schema.product.struct.nano.SaleDescriptor[] newArray =
-              new io.bloombox.schema.product.struct.nano.SaleDescriptor[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.discounts, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = new io.bloombox.schema.product.struct.nano.SaleDescriptor();
-            input.readMessage(newArray[i]);
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = new io.bloombox.schema.product.struct.nano.SaleDescriptor();
-          input.readMessage(newArray[i]);
-          this.discounts = newArray;
-          break;
-        }
-        case 18: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 18);
-          int i = this.manifest == null ? 0 : this.manifest.length;
-          io.bloombox.schema.product.struct.nano.PricingDescriptor[] newArray =
-              new io.bloombox.schema.product.struct.nano.PricingDescriptor[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.manifest, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = new io.bloombox.schema.product.struct.nano.PricingDescriptor();
-            input.readMessage(newArray[i]);
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = new io.bloombox.schema.product.struct.nano.PricingDescriptor();
-          input.readMessage(newArray[i]);
-          this.manifest = newArray;
-          break;
-        }
-      }
-    }
-  }
-
-  public static ProductPricing parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new ProductPricing(), data);
-  }
-
-  public static ProductPricing parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new ProductPricing().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductPricingSpec.java b/languages/javanano/io/bloombox/schema/product/struct/nano/ProductPricingSpec.java
deleted file mode 100644
index 810e57a..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/ProductPricingSpec.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public interface ProductPricingSpec {
-
-  // enum PricingType
-  public static final int UNIT = 0;
-  public static final int WEIGHTED = 1;
-  public static final int FREEBIE = 2;
-
-  // enum PricingWeightTier
-  public static final int OTHER = 0;
-  public static final int GRAM = 1;
-  public static final int HALFGRAM = 2;
-  public static final int QUARTERGRAM = 3;
-  public static final int DUB = 4;
-  public static final int EIGHTH = 5;
-  public static final int QUARTER = 6;
-  public static final int HALF = 7;
-  public static final int OUNCE = 8;
-  public static final int POUND = 9;
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/SaleDescriptor.java b/languages/javanano/io/bloombox/schema/product/struct/nano/SaleDescriptor.java
deleted file mode 100644
index 0eec6a9..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/SaleDescriptor.java
+++ /dev/null
@@ -1,200 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class SaleDescriptor extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile SaleDescriptor[] _emptyArray;
-  public static SaleDescriptor[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new SaleDescriptor[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .SaleType type = 1;
-  public int type;
-
-  // uint64 effective = 2;
-  public long effective;
-
-  // uint64 expiration = 3;
-  public long expiration;
-
-  // uint32 percentage_amount = 20;
-  public int percentageAmount;
-
-  // uint32 bogo_trigger = 21;
-  public int bogoTrigger;
-
-  // uint32 bogo_reward = 22;
-  public int bogoReward;
-
-  // uint32 loyalty_trigger = 23;
-  public int loyaltyTrigger;
-
-  // uint32 loyalty_reward = 24;
-  public int loyaltyReward;
-
-  public SaleDescriptor() {
-    clear();
-  }
-
-  public SaleDescriptor clear() {
-    type = io.bloombox.schema.product.struct.nano.ProductDiscount.PERCENTAGE;
-    effective = 0L;
-    expiration = 0L;
-    percentageAmount = 0;
-    bogoTrigger = 0;
-    bogoReward = 0;
-    loyaltyTrigger = 0;
-    loyaltyReward = 0;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.type != io.bloombox.schema.product.struct.nano.ProductDiscount.PERCENTAGE) {
-      output.writeInt32(1, this.type);
-    }
-    if (this.effective != 0L) {
-      output.writeUInt64(2, this.effective);
-    }
-    if (this.expiration != 0L) {
-      output.writeUInt64(3, this.expiration);
-    }
-    if (this.percentageAmount != 0) {
-      output.writeUInt32(20, this.percentageAmount);
-    }
-    if (this.bogoTrigger != 0) {
-      output.writeUInt32(21, this.bogoTrigger);
-    }
-    if (this.bogoReward != 0) {
-      output.writeUInt32(22, this.bogoReward);
-    }
-    if (this.loyaltyTrigger != 0) {
-      output.writeUInt32(23, this.loyaltyTrigger);
-    }
-    if (this.loyaltyReward != 0) {
-      output.writeUInt32(24, this.loyaltyReward);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.type != io.bloombox.schema.product.struct.nano.ProductDiscount.PERCENTAGE) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.type);
-    }
-    if (this.effective != 0L) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt64Size(2, this.effective);
-    }
-    if (this.expiration != 0L) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt64Size(3, this.expiration);
-    }
-    if (this.percentageAmount != 0) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt32Size(20, this.percentageAmount);
-    }
-    if (this.bogoTrigger != 0) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt32Size(21, this.bogoTrigger);
-    }
-    if (this.bogoReward != 0) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt32Size(22, this.bogoReward);
-    }
-    if (this.loyaltyTrigger != 0) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt32Size(23, this.loyaltyTrigger);
-    }
-    if (this.loyaltyReward != 0) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeUInt32Size(24, this.loyaltyReward);
-    }
-    return size;
-  }
-
-  @Override
-  public SaleDescriptor mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.product.struct.nano.ProductDiscount.PERCENTAGE:
-            case io.bloombox.schema.product.struct.nano.ProductDiscount.BOGO:
-            case io.bloombox.schema.product.struct.nano.ProductDiscount.LOYALTY:
-              this.type = value;
-              break;
-          }
-          break;
-        }
-        case 16: {
-          this.effective = input.readUInt64();
-          break;
-        }
-        case 24: {
-          this.expiration = input.readUInt64();
-          break;
-        }
-        case 160: {
-          this.percentageAmount = input.readUInt32();
-          break;
-        }
-        case 168: {
-          this.bogoTrigger = input.readUInt32();
-          break;
-        }
-        case 176: {
-          this.bogoReward = input.readUInt32();
-          break;
-        }
-        case 184: {
-          this.loyaltyTrigger = input.readUInt32();
-          break;
-        }
-        case 192: {
-          this.loyaltyReward = input.readUInt32();
-          break;
-        }
-      }
-    }
-  }
-
-  public static SaleDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new SaleDescriptor(), data);
-  }
-
-  public static SaleDescriptor parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new SaleDescriptor().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/UnitPricingDescriptor.java b/languages/javanano/io/bloombox/schema/product/struct/nano/UnitPricingDescriptor.java
deleted file mode 100644
index 22dc527..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/UnitPricingDescriptor.java
+++ /dev/null
@@ -1,149 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class UnitPricingDescriptor extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile UnitPricingDescriptor[] _emptyArray;
-  public static UnitPricingDescriptor[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new UnitPricingDescriptor[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // float price_value = 1;
-  public float priceValue;
-
-  // .PricingTierAvailability status = 2;
-  public io.bloombox.schema.product.struct.nano.PricingTierAvailability status;
-
-  // repeated .SaleDescriptor discounts = 3;
-  public io.bloombox.schema.product.struct.nano.SaleDescriptor[] discounts;
-
-  public UnitPricingDescriptor() {
-    clear();
-  }
-
-  public UnitPricingDescriptor clear() {
-    priceValue = 0F;
-    status = null;
-    discounts = io.bloombox.schema.product.struct.nano.SaleDescriptor.emptyArray();
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (java.lang.Float.floatToIntBits(this.priceValue)
-        != java.lang.Float.floatToIntBits(0F)) {
-      output.writeFloat(1, this.priceValue);
-    }
-    if (this.status != null) {
-      output.writeMessage(2, this.status);
-    }
-    if (this.discounts != null && this.discounts.length > 0) {
-      for (int i = 0; i < this.discounts.length; i++) {
-        io.bloombox.schema.product.struct.nano.SaleDescriptor element = this.discounts[i];
-        if (element != null) {
-          output.writeMessage(3, element);
-        }
-      }
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (java.lang.Float.floatToIntBits(this.priceValue)
-        != java.lang.Float.floatToIntBits(0F)) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeFloatSize(1, this.priceValue);
-    }
-    if (this.status != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.status);
-    }
-    if (this.discounts != null && this.discounts.length > 0) {
-      for (int i = 0; i < this.discounts.length; i++) {
-        io.bloombox.schema.product.struct.nano.SaleDescriptor element = this.discounts[i];
-        if (element != null) {
-          size += com.google.protobuf.nano.CodedOutputByteBufferNano
-            .computeMessageSize(3, element);
-        }
-      }
-    }
-    return size;
-  }
-
-  @Override
-  public UnitPricingDescriptor mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 13: {
-          this.priceValue = input.readFloat();
-          break;
-        }
-        case 18: {
-          if (this.status == null) {
-            this.status = new io.bloombox.schema.product.struct.nano.PricingTierAvailability();
-          }
-          input.readMessage(this.status);
-          break;
-        }
-        case 26: {
-          int arrayLength = com.google.protobuf.nano.WireFormatNano
-              .getRepeatedFieldArrayLength(input, 26);
-          int i = this.discounts == null ? 0 : this.discounts.length;
-          io.bloombox.schema.product.struct.nano.SaleDescriptor[] newArray =
-              new io.bloombox.schema.product.struct.nano.SaleDescriptor[i + arrayLength];
-          if (i != 0) {
-            java.lang.System.arraycopy(this.discounts, 0, newArray, 0, i);
-          }
-          for (; i < newArray.length - 1; i++) {
-            newArray[i] = new io.bloombox.schema.product.struct.nano.SaleDescriptor();
-            input.readMessage(newArray[i]);
-            input.readTag();
-          }
-          // Last one without readTag.
-          newArray[i] = new io.bloombox.schema.product.struct.nano.SaleDescriptor();
-          input.readMessage(newArray[i]);
-          this.discounts = newArray;
-          break;
-        }
-      }
-    }
-  }
-
-  public static UnitPricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new UnitPricingDescriptor(), data);
-  }
-
-  public static UnitPricingDescriptor parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new UnitPricingDescriptor().mergeFrom(input);
-  }
-}
diff --git a/languages/javanano/io/bloombox/schema/product/struct/nano/WeightedPricingDescriptor.java b/languages/javanano/io/bloombox/schema/product/struct/nano/WeightedPricingDescriptor.java
deleted file mode 100644
index ab22288..0000000
--- a/languages/javanano/io/bloombox/schema/product/struct/nano/WeightedPricingDescriptor.java
+++ /dev/null
@@ -1,137 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-package io.bloombox.schema.product.struct.nano;
-
-@SuppressWarnings("hiding")
-public final class WeightedPricingDescriptor extends
-    com.google.protobuf.nano.MessageNano {
-
-  private static volatile WeightedPricingDescriptor[] _emptyArray;
-  public static WeightedPricingDescriptor[] emptyArray() {
-    // Lazily initializes the empty array
-    if (_emptyArray == null) {
-      synchronized (
-          com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) {
-        if (_emptyArray == null) {
-          _emptyArray = new WeightedPricingDescriptor[0];
-        }
-      }
-    }
-    return _emptyArray;
-  }
-
-  // .PricingWeightTier weight = 1;
-  public int weight;
-
-  // .UnitPricingDescriptor tier = 2;
-  public io.bloombox.schema.product.struct.nano.UnitPricingDescriptor tier;
-
-  // float weightInGrams = 3;
-  public float weightInGrams;
-
-  public WeightedPricingDescriptor() {
-    clear();
-  }
-
-  public WeightedPricingDescriptor clear() {
-    weight = io.bloombox.schema.product.struct.nano.ProductPricingSpec.OTHER;
-    tier = null;
-    weightInGrams = 0F;
-    cachedSize = -1;
-    return this;
-  }
-
-  @Override
-  public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output)
-      throws java.io.IOException {
-    if (this.weight != io.bloombox.schema.product.struct.nano.ProductPricingSpec.OTHER) {
-      output.writeInt32(1, this.weight);
-    }
-    if (this.tier != null) {
-      output.writeMessage(2, this.tier);
-    }
-    if (java.lang.Float.floatToIntBits(this.weightInGrams)
-        != java.lang.Float.floatToIntBits(0F)) {
-      output.writeFloat(3, this.weightInGrams);
-    }
-    super.writeTo(output);
-  }
-
-  @Override
-  protected int computeSerializedSize() {
-    int size = super.computeSerializedSize();
-    if (this.weight != io.bloombox.schema.product.struct.nano.ProductPricingSpec.OTHER) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeInt32Size(1, this.weight);
-    }
-    if (this.tier != null) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-        .computeMessageSize(2, this.tier);
-    }
-    if (java.lang.Float.floatToIntBits(this.weightInGrams)
-        != java.lang.Float.floatToIntBits(0F)) {
-      size += com.google.protobuf.nano.CodedOutputByteBufferNano
-          .computeFloatSize(3, this.weightInGrams);
-    }
-    return size;
-  }
-
-  @Override
-  public WeightedPricingDescriptor mergeFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    while (true) {
-      int tag = input.readTag();
-      switch (tag) {
-        case 0:
-          return this;
-        default: {
-          if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) {
-            return this;
-          }
-          break;
-        }
-        case 8: {
-          int value = input.readInt32();
-          switch (value) {
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.OTHER:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.GRAM:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.HALFGRAM:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.QUARTERGRAM:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.DUB:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.EIGHTH:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.QUARTER:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.HALF:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.OUNCE:
-            case io.bloombox.schema.product.struct.nano.ProductPricingSpec.POUND:
-              this.weight = value;
-              break;
-          }
-          break;
-        }
-        case 18: {
-          if (this.tier == null) {
-            this.tier = new io.bloombox.schema.product.struct.nano.UnitPricingDescriptor();
-          }
-          input.readMessage(this.tier);
-          break;
-        }
-        case 29: {
-          this.weightInGrams = input.readFloat();
-          break;
-        }
-      }
-    }
-  }
-
-  public static WeightedPricingDescriptor parseFrom(byte[] data)
-      throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {
-    return com.google.protobuf.nano.MessageNano.mergeFrom(new WeightedPricingDescriptor(), data);
-  }
-
-  public static WeightedPricingDescriptor parseFrom(
-          com.google.protobuf.nano.CodedInputByteBufferNano input)
-      throws java.io.IOException {
-    return new WeightedPricingDescriptor().mergeFrom(input);
-  }
-}
diff --git a/languages/js/brand.js b/languages/js/brand.js
deleted file mode 100644
index 8626e02..0000000
--- a/languages/js/brand.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Brand');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.Content');
-goog.require('proto.MediaItem');
-goog.require('proto.Name');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
diff --git a/languages/js/browser/Product_pb.js b/languages/js/browser/Product_pb.js
deleted file mode 100644
index efb4722..0000000
--- a/languages/js/browser/Product_pb.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Product', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
diff --git a/languages/js/browser/base/Compression_pb.js b/languages/js/browser/base/Compression_pb.js
deleted file mode 100644
index b4cdaea..0000000
--- a/languages/js/browser/base/Compression_pb.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Compression', null, global);
-goog.exportSymbol('proto.Compression.Type', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/browser/base/Language_pb.js b/languages/js/browser/base/Language_pb.js
deleted file mode 100644
index 975cfbe..0000000
--- a/languages/js/browser/base/Language_pb.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Language', null, global);
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
diff --git a/languages/js/browser/base/ProductKey_pb.js b/languages/js/browser/base/ProductKey_pb.js
deleted file mode 100644
index fb41a21..0000000
--- a/languages/js/browser/base/ProductKey_pb.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductKey', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/browser/base/ProductKind_pb.js b/languages/js/browser/base/ProductKind_pb.js
deleted file mode 100644
index 1f6699b..0000000
--- a/languages/js/browser/base/ProductKind_pb.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductKind', null, global);
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
diff --git a/languages/js/browser/base/ProductType_pb.js b/languages/js/browser/base/ProductType_pb.js
deleted file mode 100644
index 5ae0459..0000000
--- a/languages/js/browser/base/ProductType_pb.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductType', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/browser/content/Brand_pb.js b/languages/js/browser/content/Brand_pb.js
deleted file mode 100644
index 0cb57ab..0000000
--- a/languages/js/browser/content/Brand_pb.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Brand', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
diff --git a/languages/js/browser/content/Content_pb.js b/languages/js/browser/content/Content_pb.js
deleted file mode 100644
index 883792e..0000000
--- a/languages/js/browser/content/Content_pb.js
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Content', null, global);
-goog.exportSymbol('proto.Content.Encoding', null, global);
-goog.exportSymbol('proto.Content.Type', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {string}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
diff --git a/languages/js/browser/content/MaterialsData_pb.js b/languages/js/browser/content/MaterialsData_pb.js
deleted file mode 100644
index 4564fb8..0000000
--- a/languages/js/browser/content/MaterialsData_pb.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.MaterialsData', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getRepeatedField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getRepeatedField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
diff --git a/languages/js/browser/content/Name_pb.js b/languages/js/browser/content/Name_pb.js
deleted file mode 100644
index 4908fbf..0000000
--- a/languages/js/browser/content/Name_pb.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Name', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/browser/content/ProductContent_pb.js b/languages/js/browser/content/ProductContent_pb.js
deleted file mode 100644
index 1498090..0000000
--- a/languages/js/browser/content/ProductContent_pb.js
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductContent', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
diff --git a/languages/js/browser/geo/Address_pb.js b/languages/js/browser/geo/Address_pb.js
deleted file mode 100644
index 509593c..0000000
--- a/languages/js/browser/geo/Address_pb.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Address', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Address = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Address, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Address.displayName = 'proto.Address';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Address.prototype.toObject = function(opt_includeInstance) {
-  return proto.Address.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Address} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    firstLine: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    secondLine: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    city: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    state: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    zipcode: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    country: jspb.Message.getFieldWithDefault(msg, 6, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Address;
-  return proto.Address.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Address} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setFirstLine(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSecondLine(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCity(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setState(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setZipcode(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCountry(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Address.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Address.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Address} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFirstLine();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getSecondLine();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getCity();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getState();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getZipcode();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getCountry();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string first_line = 1;
- * @return {string}
- */
-proto.Address.prototype.getFirstLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setFirstLine = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string second_line = 2;
- * @return {string}
- */
-proto.Address.prototype.getSecondLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setSecondLine = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional string city = 3;
- * @return {string}
- */
-proto.Address.prototype.getCity = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCity = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional string state = 4;
- * @return {string}
- */
-proto.Address.prototype.getState = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setState = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional string zipcode = 5;
- * @return {string}
- */
-proto.Address.prototype.getZipcode = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setZipcode = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * optional string country = 6;
- * @return {string}
- */
-proto.Address.prototype.getCountry = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCountry = function(value) {
-  jspb.Message.setField(this, 6, value);
-};
-
-
diff --git a/languages/js/browser/media/MediaItem_pb.js b/languages/js/browser/media/MediaItem_pb.js
deleted file mode 100644
index fe8389c..0000000
--- a/languages/js/browser/media/MediaItem_pb.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.MediaItem', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
diff --git a/languages/js/browser/media/MediaKey_pb.js b/languages/js/browser/media/MediaKey_pb.js
deleted file mode 100644
index 51e1e10..0000000
--- a/languages/js/browser/media/MediaKey_pb.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.MediaKey', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/browser/media/MediaType_pb.js b/languages/js/browser/media/MediaType_pb.js
deleted file mode 100644
index 588fbd2..0000000
--- a/languages/js/browser/media/MediaType_pb.js
+++ /dev/null
@@ -1,786 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.DocumentType', null, global);
-goog.exportSymbol('proto.DocumentType.DocumentKind', null, global);
-goog.exportSymbol('proto.ImageType', null, global);
-goog.exportSymbol('proto.ImageType.ImageKind', null, global);
-goog.exportSymbol('proto.MediaType', null, global);
-goog.exportSymbol('proto.MediaType.Kind', null, global);
-goog.exportSymbol('proto.VideoType', null, global);
-goog.exportSymbol('proto.VideoType.VideoKind', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/browser/products/Flower_pb.js b/languages/js/browser/products/Flower_pb.js
deleted file mode 100644
index 7e4686c..0000000
--- a/languages/js/browser/products/Flower_pb.js
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Flower', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/browser/structs/FlagsDescriptor_pb.js b/languages/js/browser/structs/FlagsDescriptor_pb.js
deleted file mode 100644
index 099042d..0000000
--- a/languages/js/browser/structs/FlagsDescriptor_pb.js
+++ /dev/null
@@ -1,623 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.FlagsDescriptor', null, global);
-goog.exportSymbol('proto.ProductFlag', null, global);
-goog.exportSymbol('proto.ProductFlagValue', null, global);
-goog.exportSymbol('proto.ProductFlagset', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
diff --git a/languages/js/browser/structs/Genetics_pb.js b/languages/js/browser/structs/Genetics_pb.js
deleted file mode 100644
index 832ab7f..0000000
--- a/languages/js/browser/structs/Genetics_pb.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Genetics', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
diff --git a/languages/js/browser/structs/Grow_pb.js b/languages/js/browser/structs/Grow_pb.js
deleted file mode 100644
index 39f28d2..0000000
--- a/languages/js/browser/structs/Grow_pb.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Grow', null, global);
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
diff --git a/languages/js/browser/structs/Species_pb.js b/languages/js/browser/structs/Species_pb.js
deleted file mode 100644
index fb4e9b4..0000000
--- a/languages/js/browser/structs/Species_pb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Species', null, global);
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
diff --git a/languages/js/browser/structs/pricing/PricingDescriptor_pb.js b/languages/js/browser/structs/pricing/PricingDescriptor_pb.js
deleted file mode 100644
index c162d44..0000000
--- a/languages/js/browser/structs/pricing/PricingDescriptor_pb.js
+++ /dev/null
@@ -1,1271 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.FreebiePricingDescriptor', null, global);
-goog.exportSymbol('proto.PricingDescriptor', null, global);
-goog.exportSymbol('proto.PricingTierAvailability', null, global);
-goog.exportSymbol('proto.PricingType', null, global);
-goog.exportSymbol('proto.PricingWeightTier', null, global);
-goog.exportSymbol('proto.ProductPricing', null, global);
-goog.exportSymbol('proto.UnitPricingDescriptor', null, global);
-goog.exportSymbol('proto.WeightedPricingDescriptor', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
diff --git a/languages/js/browser/structs/pricing/SaleDescriptor_pb.js b/languages/js/browser/structs/pricing/SaleDescriptor_pb.js
deleted file mode 100644
index 5dfe5ba..0000000
--- a/languages/js/browser/structs/pricing/SaleDescriptor_pb.js
+++ /dev/null
@@ -1,351 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.SaleDescriptor', null, global);
-goog.exportSymbol('proto.SaleType', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
diff --git a/languages/js/closure/addresspb.js b/languages/js/closure/addresspb.js
deleted file mode 100644
index 8f69f8b..0000000
--- a/languages/js/closure/addresspb.js
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Address');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Address = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Address, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Address.displayName = 'proto.Address';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Address.prototype.toObject = function(opt_includeInstance) {
-  return proto.Address.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Address} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    firstLine: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    secondLine: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    city: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    state: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    zipcode: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    country: jspb.Message.getFieldWithDefault(msg, 6, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Address;
-  return proto.Address.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Address} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setFirstLine(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSecondLine(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCity(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setState(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setZipcode(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCountry(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Address.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Address.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Address} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFirstLine();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getSecondLine();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getCity();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getState();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getZipcode();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getCountry();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string first_line = 1;
- * @return {string}
- */
-proto.Address.prototype.getFirstLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setFirstLine = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string second_line = 2;
- * @return {string}
- */
-proto.Address.prototype.getSecondLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setSecondLine = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional string city = 3;
- * @return {string}
- */
-proto.Address.prototype.getCity = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCity = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional string state = 4;
- * @return {string}
- */
-proto.Address.prototype.getState = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setState = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional string zipcode = 5;
- * @return {string}
- */
-proto.Address.prototype.getZipcode = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setZipcode = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * optional string country = 6;
- * @return {string}
- */
-proto.Address.prototype.getCountry = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCountry = function(value) {
-  jspb.Message.setField(this, 6, value);
-};
-
-
diff --git a/languages/js/closure/brandpb.js b/languages/js/closure/brandpb.js
deleted file mode 100644
index 4840cd4..0000000
--- a/languages/js/closure/brandpb.js
+++ /dev/null
@@ -1,318 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Brand');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.Content');
-goog.require('proto.MediaItem');
-goog.require('proto.Name');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
diff --git a/languages/js/closure/compressionpb.js b/languages/js/closure/compressionpb.js
deleted file mode 100644
index 34d8c21..0000000
--- a/languages/js/closure/compressionpb.js
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Compression');
-goog.provide('proto.Compression.Type');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/closure/contentpb.js b/languages/js/closure/contentpb.js
deleted file mode 100644
index 1ccefd3..0000000
--- a/languages/js/closure/contentpb.js
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Content');
-goog.provide('proto.Content.Encoding');
-goog.provide('proto.Content.Type');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.Compression');
-
-goog.forwardDeclare('proto.Language');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {string}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
diff --git a/languages/js/closure/documenttypepb.js b/languages/js/closure/documenttypepb.js
deleted file mode 100644
index 15efa78..0000000
--- a/languages/js/closure/documenttypepb.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.DocumentType');
-goog.provide('proto.DocumentType.DocumentKind');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/closure/flagsdescriptorpb.js b/languages/js/closure/flagsdescriptorpb.js
deleted file mode 100644
index cad620e..0000000
--- a/languages/js/closure/flagsdescriptorpb.js
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.FlagsDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
diff --git a/languages/js/closure/flowerpb.js b/languages/js/closure/flowerpb.js
deleted file mode 100644
index 8761b4d..0000000
--- a/languages/js/closure/flowerpb.js
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Flower');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.FlagsDescriptor');
-goog.require('proto.MaterialsData');
-goog.require('proto.ProductContent');
-goog.require('proto.ProductKey');
-goog.require('proto.ProductPricing');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/closure/freebiepricingdescriptorpb.js b/languages/js/closure/freebiepricingdescriptorpb.js
deleted file mode 100644
index 9c6cd49..0000000
--- a/languages/js/closure/freebiepricingdescriptorpb.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.FreebiePricingDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
diff --git a/languages/js/closure/geneticspb.js b/languages/js/closure/geneticspb.js
deleted file mode 100644
index d1b355c..0000000
--- a/languages/js/closure/geneticspb.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Genetics');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.Name');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
diff --git a/languages/js/closure/growpb.js b/languages/js/closure/growpb.js
deleted file mode 100644
index 61e1f55..0000000
--- a/languages/js/closure/growpb.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Grow');
-
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
diff --git a/languages/js/closure/imagetypepb.js b/languages/js/closure/imagetypepb.js
deleted file mode 100644
index c8343d1..0000000
--- a/languages/js/closure/imagetypepb.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ImageType');
-goog.provide('proto.ImageType.ImageKind');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/closure/languagepb.js b/languages/js/closure/languagepb.js
deleted file mode 100644
index de7a5b8..0000000
--- a/languages/js/closure/languagepb.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Language');
-
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
diff --git a/languages/js/closure/materialsdatapb.js b/languages/js/closure/materialsdatapb.js
deleted file mode 100644
index 3fbc677..0000000
--- a/languages/js/closure/materialsdatapb.js
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MaterialsData');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.Genetics');
-
-goog.forwardDeclare('proto.Grow');
-goog.forwardDeclare('proto.Species');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getRepeatedField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getRepeatedField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
diff --git a/languages/js/closure/mediaitempb.js b/languages/js/closure/mediaitempb.js
deleted file mode 100644
index 415ee96..0000000
--- a/languages/js/closure/mediaitempb.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MediaItem');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.MediaKey');
-goog.require('proto.MediaType');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
diff --git a/languages/js/closure/mediakeypb.js b/languages/js/closure/mediakeypb.js
deleted file mode 100644
index 529abfd..0000000
--- a/languages/js/closure/mediakeypb.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MediaKey');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/closure/mediatypepb.js b/languages/js/closure/mediatypepb.js
deleted file mode 100644
index 557ad6b..0000000
--- a/languages/js/closure/mediatypepb.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MediaType');
-goog.provide('proto.MediaType.Kind');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.DocumentType');
-goog.require('proto.ImageType');
-goog.require('proto.VideoType');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
diff --git a/languages/js/closure/namepb.js b/languages/js/closure/namepb.js
deleted file mode 100644
index f873035..0000000
--- a/languages/js/closure/namepb.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Name');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/closure/pricingdescriptorpb.js b/languages/js/closure/pricingdescriptorpb.js
deleted file mode 100644
index c3b4f67..0000000
--- a/languages/js/closure/pricingdescriptorpb.js
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.FreebiePricingDescriptor');
-goog.require('proto.UnitPricingDescriptor');
-goog.require('proto.WeightedPricingDescriptor');
-
-goog.forwardDeclare('proto.PricingType');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
diff --git a/languages/js/closure/pricingtieravailabilitypb.js b/languages/js/closure/pricingtieravailabilitypb.js
deleted file mode 100644
index 92d72fc..0000000
--- a/languages/js/closure/pricingtieravailabilitypb.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingTierAvailability');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/closure/pricingtypepb.js b/languages/js/closure/pricingtypepb.js
deleted file mode 100644
index 1fde416..0000000
--- a/languages/js/closure/pricingtypepb.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingType');
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
diff --git a/languages/js/closure/pricingweighttierpb.js b/languages/js/closure/pricingweighttierpb.js
deleted file mode 100644
index 4bb4066..0000000
--- a/languages/js/closure/pricingweighttierpb.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingWeightTier');
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
diff --git a/languages/js/closure/productcontentpb.js b/languages/js/closure/productcontentpb.js
deleted file mode 100644
index 02f983c..0000000
--- a/languages/js/closure/productcontentpb.js
+++ /dev/null
@@ -1,451 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductContent');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.Brand');
-goog.require('proto.Content');
-goog.require('proto.MediaItem');
-goog.require('proto.Name');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
diff --git a/languages/js/closure/productflagpb.js b/languages/js/closure/productflagpb.js
deleted file mode 100644
index f0f5717..0000000
--- a/languages/js/closure/productflagpb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductFlag');
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
diff --git a/languages/js/closure/productflagsetpb.js b/languages/js/closure/productflagsetpb.js
deleted file mode 100644
index 56b9935..0000000
--- a/languages/js/closure/productflagsetpb.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductFlagset');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.ProductFlagValue');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
diff --git a/languages/js/closure/productflagvaluepb.js b/languages/js/closure/productflagvaluepb.js
deleted file mode 100644
index ca6389b..0000000
--- a/languages/js/closure/productflagvaluepb.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductFlagValue');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-goog.forwardDeclare('proto.ProductFlag');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/closure/productkeypb.js b/languages/js/closure/productkeypb.js
deleted file mode 100644
index 1ce8b26..0000000
--- a/languages/js/closure/productkeypb.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductKey');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/closure/productkindpb.js b/languages/js/closure/productkindpb.js
deleted file mode 100644
index 3f85aa7..0000000
--- a/languages/js/closure/productkindpb.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductKind');
-
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
diff --git a/languages/js/closure/productpb.js b/languages/js/closure/productpb.js
deleted file mode 100644
index cb302e1..0000000
--- a/languages/js/closure/productpb.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Product');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.ProductKey');
-goog.require('proto.ProductType');
-goog.require('proto.google.protobuf.Any');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
diff --git a/languages/js/closure/productpricingpb.js b/languages/js/closure/productpricingpb.js
deleted file mode 100644
index ad0826e..0000000
--- a/languages/js/closure/productpricingpb.js
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductPricing');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.PricingDescriptor');
-goog.require('proto.SaleDescriptor');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
diff --git a/languages/js/closure/producttypepb.js b/languages/js/closure/producttypepb.js
deleted file mode 100644
index 4e217ae..0000000
--- a/languages/js/closure/producttypepb.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductType');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-goog.forwardDeclare('proto.ProductKind');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/closure/saledescriptorpb.js b/languages/js/closure/saledescriptorpb.js
deleted file mode 100644
index 61995ac..0000000
--- a/languages/js/closure/saledescriptorpb.js
+++ /dev/null
@@ -1,347 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.SaleDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-goog.forwardDeclare('proto.SaleType');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
diff --git a/languages/js/closure/saletypepb.js b/languages/js/closure/saletypepb.js
deleted file mode 100644
index fd88bd3..0000000
--- a/languages/js/closure/saletypepb.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.SaleType');
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
diff --git a/languages/js/closure/speciespb.js b/languages/js/closure/speciespb.js
deleted file mode 100644
index 5ee6bff..0000000
--- a/languages/js/closure/speciespb.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Species');
-
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
diff --git a/languages/js/closure/unitpricingdescriptorpb.js b/languages/js/closure/unitpricingdescriptorpb.js
deleted file mode 100644
index 7177414..0000000
--- a/languages/js/closure/unitpricingdescriptorpb.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.UnitPricingDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.PricingTierAvailability');
-goog.require('proto.SaleDescriptor');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
diff --git a/languages/js/closure/videotypepb.js b/languages/js/closure/videotypepb.js
deleted file mode 100644
index 6d83488..0000000
--- a/languages/js/closure/videotypepb.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.VideoType');
-goog.provide('proto.VideoType.VideoKind');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/closure/weightedpricingdescriptorpb.js b/languages/js/closure/weightedpricingdescriptorpb.js
deleted file mode 100644
index e54a7ca..0000000
--- a/languages/js/closure/weightedpricingdescriptorpb.js
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.WeightedPricingDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.UnitPricingDescriptor');
-
-goog.forwardDeclare('proto.PricingWeightTier');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
diff --git a/languages/js/commonjs/Product_pb.js b/languages/js/commonjs/Product_pb.js
deleted file mode 100644
index 71ab8f8..0000000
--- a/languages/js/commonjs/Product_pb.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var base_ProductKey_pb = require('./base/ProductKey_pb.js');
-var base_ProductType_pb = require('./base/ProductType_pb.js');
-var google_protobuf_any_pb = require('google-protobuf/google/protobuf/any_pb.js');
-goog.exportSymbol('proto.Product', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && base_ProductKey_pb.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && base_ProductType_pb.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && google_protobuf_any_pb.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new base_ProductKey_pb.ProductKey;
-      reader.readMessage(value,base_ProductKey_pb.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new base_ProductType_pb.ProductType;
-      reader.readMessage(value,base_ProductType_pb.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new google_protobuf_any_pb.Any;
-      reader.readMessage(value,google_protobuf_any_pb.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      base_ProductKey_pb.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      base_ProductType_pb.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      google_protobuf_any_pb.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, base_ProductKey_pb.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, base_ProductType_pb.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_any_pb.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/base/Compression_pb.js b/languages/js/commonjs/base/Compression_pb.js
deleted file mode 100644
index 1a00537..0000000
--- a/languages/js/commonjs/base/Compression_pb.js
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.Compression', null, global);
-goog.exportSymbol('proto.Compression.Type', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/base/Language_pb.js b/languages/js/commonjs/base/Language_pb.js
deleted file mode 100644
index 5b70d66..0000000
--- a/languages/js/commonjs/base/Language_pb.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.Language', null, global);
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/base/ProductKey_pb.js b/languages/js/commonjs/base/ProductKey_pb.js
deleted file mode 100644
index 28fec5d..0000000
--- a/languages/js/commonjs/base/ProductKey_pb.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.ProductKey', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/base/ProductKind_pb.js b/languages/js/commonjs/base/ProductKind_pb.js
deleted file mode 100644
index 9aa4523..0000000
--- a/languages/js/commonjs/base/ProductKind_pb.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.ProductKind', null, global);
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/base/ProductType_pb.js b/languages/js/commonjs/base/ProductType_pb.js
deleted file mode 100644
index 981134d..0000000
--- a/languages/js/commonjs/base/ProductType_pb.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var base_ProductKind_pb = require('../base/ProductKind_pb.js');
-goog.exportSymbol('proto.ProductType', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/content/Brand_pb.js b/languages/js/commonjs/content/Brand_pb.js
deleted file mode 100644
index c104d7f..0000000
--- a/languages/js/commonjs/content/Brand_pb.js
+++ /dev/null
@@ -1,318 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var content_Name_pb = require('../content/Name_pb.js');
-var content_Content_pb = require('../content/Content_pb.js');
-var media_MediaItem_pb = require('../media/MediaItem_pb.js');
-goog.exportSymbol('proto.Brand', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && content_Name_pb.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && content_Content_pb.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    media_MediaItem_pb.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new content_Name_pb.Name;
-      reader.readMessage(value,content_Name_pb.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new content_Content_pb.Content;
-      reader.readMessage(value,content_Content_pb.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new media_MediaItem_pb.MediaItem;
-      reader.readMessage(value,media_MediaItem_pb.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      content_Name_pb.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      content_Content_pb.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      media_MediaItem_pb.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, content_Name_pb.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, content_Content_pb.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, media_MediaItem_pb.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/content/Content_pb.js b/languages/js/commonjs/content/Content_pb.js
deleted file mode 100644
index f8616af..0000000
--- a/languages/js/commonjs/content/Content_pb.js
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var base_Language_pb = require('../base/Language_pb.js');
-var base_Compression_pb = require('../base/Compression_pb.js');
-goog.exportSymbol('proto.Content', null, global);
-goog.exportSymbol('proto.Content.Encoding', null, global);
-goog.exportSymbol('proto.Content.Type', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && base_Compression_pb.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new base_Compression_pb.Compression;
-      reader.readMessage(value,base_Compression_pb.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      base_Compression_pb.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {!(string|Uint8Array)}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, base_Compression_pb.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/content/MaterialsData_pb.js b/languages/js/commonjs/content/MaterialsData_pb.js
deleted file mode 100644
index 3f9d94c..0000000
--- a/languages/js/commonjs/content/MaterialsData_pb.js
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var structs_Grow_pb = require('../structs/Grow_pb.js');
-var structs_Species_pb = require('../structs/Species_pb.js');
-var structs_Genetics_pb = require('../structs/Genetics_pb.js');
-goog.exportSymbol('proto.MaterialsData', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getRepeatedField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && structs_Genetics_pb.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new structs_Genetics_pb.Genetics;
-      reader.readMessage(value,structs_Genetics_pb.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      structs_Genetics_pb.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getRepeatedField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, structs_Genetics_pb.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/content/Name_pb.js b/languages/js/commonjs/content/Name_pb.js
deleted file mode 100644
index f4d63c1..0000000
--- a/languages/js/commonjs/content/Name_pb.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.Name', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/content/ProductContent_pb.js b/languages/js/commonjs/content/ProductContent_pb.js
deleted file mode 100644
index 3c39e23..0000000
--- a/languages/js/commonjs/content/ProductContent_pb.js
+++ /dev/null
@@ -1,451 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var content_Name_pb = require('../content/Name_pb.js');
-var content_Content_pb = require('../content/Content_pb.js');
-var content_Brand_pb = require('../content/Brand_pb.js');
-var media_MediaItem_pb = require('../media/MediaItem_pb.js');
-goog.exportSymbol('proto.ProductContent', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && content_Name_pb.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && content_Content_pb.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && content_Brand_pb.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    media_MediaItem_pb.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && content_Content_pb.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && content_Content_pb.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && content_Content_pb.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new content_Name_pb.Name;
-      reader.readMessage(value,content_Name_pb.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new content_Content_pb.Content;
-      reader.readMessage(value,content_Content_pb.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new content_Brand_pb.Brand;
-      reader.readMessage(value,content_Brand_pb.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new media_MediaItem_pb.MediaItem;
-      reader.readMessage(value,media_MediaItem_pb.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new content_Content_pb.Content;
-      reader.readMessage(value,content_Content_pb.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new content_Content_pb.Content;
-      reader.readMessage(value,content_Content_pb.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new content_Content_pb.Content;
-      reader.readMessage(value,content_Content_pb.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      content_Name_pb.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      content_Content_pb.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      content_Brand_pb.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      media_MediaItem_pb.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      content_Content_pb.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      content_Content_pb.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      content_Content_pb.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, content_Name_pb.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, content_Content_pb.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, content_Brand_pb.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, media_MediaItem_pb.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, content_Content_pb.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, content_Content_pb.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, content_Content_pb.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/geo/Address_pb.js b/languages/js/commonjs/geo/Address_pb.js
deleted file mode 100644
index 2914c5b..0000000
--- a/languages/js/commonjs/geo/Address_pb.js
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.Address', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Address = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Address, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Address.displayName = 'proto.Address';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Address.prototype.toObject = function(opt_includeInstance) {
-  return proto.Address.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Address} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    firstLine: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    secondLine: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    city: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    state: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    zipcode: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    country: jspb.Message.getFieldWithDefault(msg, 6, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Address;
-  return proto.Address.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Address} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setFirstLine(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSecondLine(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCity(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setState(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setZipcode(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCountry(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Address.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Address.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Address} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFirstLine();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getSecondLine();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getCity();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getState();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getZipcode();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getCountry();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string first_line = 1;
- * @return {string}
- */
-proto.Address.prototype.getFirstLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setFirstLine = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string second_line = 2;
- * @return {string}
- */
-proto.Address.prototype.getSecondLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setSecondLine = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional string city = 3;
- * @return {string}
- */
-proto.Address.prototype.getCity = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCity = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional string state = 4;
- * @return {string}
- */
-proto.Address.prototype.getState = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setState = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional string zipcode = 5;
- * @return {string}
- */
-proto.Address.prototype.getZipcode = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setZipcode = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * optional string country = 6;
- * @return {string}
- */
-proto.Address.prototype.getCountry = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCountry = function(value) {
-  jspb.Message.setField(this, 6, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/media/MediaItem_pb.js b/languages/js/commonjs/media/MediaItem_pb.js
deleted file mode 100644
index 6a955d8..0000000
--- a/languages/js/commonjs/media/MediaItem_pb.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var media_MediaKey_pb = require('../media/MediaKey_pb.js');
-var media_MediaType_pb = require('../media/MediaType_pb.js');
-goog.exportSymbol('proto.MediaItem', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && media_MediaKey_pb.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && media_MediaType_pb.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new media_MediaKey_pb.MediaKey;
-      reader.readMessage(value,media_MediaKey_pb.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new media_MediaType_pb.MediaType;
-      reader.readMessage(value,media_MediaType_pb.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      media_MediaKey_pb.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      media_MediaType_pb.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, media_MediaKey_pb.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, media_MediaType_pb.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/media/MediaKey_pb.js b/languages/js/commonjs/media/MediaKey_pb.js
deleted file mode 100644
index c86b8e7..0000000
--- a/languages/js/commonjs/media/MediaKey_pb.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.MediaKey', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/media/MediaType_pb.js b/languages/js/commonjs/media/MediaType_pb.js
deleted file mode 100644
index 76005a3..0000000
--- a/languages/js/commonjs/media/MediaType_pb.js
+++ /dev/null
@@ -1,791 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.DocumentType', null, global);
-goog.exportSymbol('proto.DocumentType.DocumentKind', null, global);
-goog.exportSymbol('proto.ImageType', null, global);
-goog.exportSymbol('proto.ImageType.ImageKind', null, global);
-goog.exportSymbol('proto.MediaType', null, global);
-goog.exportSymbol('proto.MediaType.Kind', null, global);
-goog.exportSymbol('proto.VideoType', null, global);
-goog.exportSymbol('proto.VideoType.VideoKind', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/products/Flower_pb.js b/languages/js/commonjs/products/Flower_pb.js
deleted file mode 100644
index a851685..0000000
--- a/languages/js/commonjs/products/Flower_pb.js
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var base_ProductKey_pb = require('../base/ProductKey_pb.js');
-var content_MaterialsData_pb = require('../content/MaterialsData_pb.js');
-var content_ProductContent_pb = require('../content/ProductContent_pb.js');
-var structs_FlagsDescriptor_pb = require('../structs/FlagsDescriptor_pb.js');
-var structs_pricing_PricingDescriptor_pb = require('../structs/pricing/PricingDescriptor_pb.js');
-goog.exportSymbol('proto.Flower', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && base_ProductKey_pb.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && content_ProductContent_pb.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && content_MaterialsData_pb.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && structs_FlagsDescriptor_pb.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && structs_pricing_PricingDescriptor_pb.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new base_ProductKey_pb.ProductKey;
-      reader.readMessage(value,base_ProductKey_pb.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new content_ProductContent_pb.ProductContent;
-      reader.readMessage(value,content_ProductContent_pb.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new content_MaterialsData_pb.MaterialsData;
-      reader.readMessage(value,content_MaterialsData_pb.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new structs_FlagsDescriptor_pb.FlagsDescriptor;
-      reader.readMessage(value,structs_FlagsDescriptor_pb.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new structs_pricing_PricingDescriptor_pb.ProductPricing;
-      reader.readMessage(value,structs_pricing_PricingDescriptor_pb.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      base_ProductKey_pb.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      content_ProductContent_pb.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      content_MaterialsData_pb.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      structs_FlagsDescriptor_pb.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      structs_pricing_PricingDescriptor_pb.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, base_ProductKey_pb.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, content_ProductContent_pb.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, content_MaterialsData_pb.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, structs_FlagsDescriptor_pb.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, structs_pricing_PricingDescriptor_pb.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/structs/FlagsDescriptor_pb.js b/languages/js/commonjs/structs/FlagsDescriptor_pb.js
deleted file mode 100644
index 86e8095..0000000
--- a/languages/js/commonjs/structs/FlagsDescriptor_pb.js
+++ /dev/null
@@ -1,628 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.FlagsDescriptor', null, global);
-goog.exportSymbol('proto.ProductFlag', null, global);
-goog.exportSymbol('proto.ProductFlagValue', null, global);
-goog.exportSymbol('proto.ProductFlagset', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/structs/Genetics_pb.js b/languages/js/commonjs/structs/Genetics_pb.js
deleted file mode 100644
index 3478c07..0000000
--- a/languages/js/commonjs/structs/Genetics_pb.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var content_Name_pb = require('../content/Name_pb.js');
-goog.exportSymbol('proto.Genetics', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && content_Name_pb.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && content_Name_pb.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new content_Name_pb.Name;
-      reader.readMessage(value,content_Name_pb.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new content_Name_pb.Name;
-      reader.readMessage(value,content_Name_pb.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      content_Name_pb.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      content_Name_pb.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, content_Name_pb.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, content_Name_pb.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/structs/Grow_pb.js b/languages/js/commonjs/structs/Grow_pb.js
deleted file mode 100644
index 9acea1f..0000000
--- a/languages/js/commonjs/structs/Grow_pb.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.Grow', null, global);
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/structs/Species_pb.js b/languages/js/commonjs/structs/Species_pb.js
deleted file mode 100644
index 88ecf96..0000000
--- a/languages/js/commonjs/structs/Species_pb.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.Species', null, global);
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/structs/pricing/PricingDescriptor_pb.js b/languages/js/commonjs/structs/pricing/PricingDescriptor_pb.js
deleted file mode 100644
index 5c63c12..0000000
--- a/languages/js/commonjs/structs/pricing/PricingDescriptor_pb.js
+++ /dev/null
@@ -1,1277 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-var structs_pricing_SaleDescriptor_pb = require('../../structs/pricing/SaleDescriptor_pb.js');
-goog.exportSymbol('proto.FreebiePricingDescriptor', null, global);
-goog.exportSymbol('proto.PricingDescriptor', null, global);
-goog.exportSymbol('proto.PricingTierAvailability', null, global);
-goog.exportSymbol('proto.PricingType', null, global);
-goog.exportSymbol('proto.PricingWeightTier', null, global);
-goog.exportSymbol('proto.ProductPricing', null, global);
-goog.exportSymbol('proto.UnitPricingDescriptor', null, global);
-goog.exportSymbol('proto.WeightedPricingDescriptor', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    structs_pricing_SaleDescriptor_pb.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new structs_pricing_SaleDescriptor_pb.SaleDescriptor;
-      reader.readMessage(value,structs_pricing_SaleDescriptor_pb.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      structs_pricing_SaleDescriptor_pb.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, structs_pricing_SaleDescriptor_pb.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    structs_pricing_SaleDescriptor_pb.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new structs_pricing_SaleDescriptor_pb.SaleDescriptor;
-      reader.readMessage(value,structs_pricing_SaleDescriptor_pb.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      structs_pricing_SaleDescriptor_pb.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, structs_pricing_SaleDescriptor_pb.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/commonjs/structs/pricing/SaleDescriptor_pb.js b/languages/js/commonjs/structs/pricing/SaleDescriptor_pb.js
deleted file mode 100644
index 062f541..0000000
--- a/languages/js/commonjs/structs/pricing/SaleDescriptor_pb.js
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-
-goog.exportSymbol('proto.SaleDescriptor', null, global);
-goog.exportSymbol('proto.SaleType', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
-goog.object.extend(exports, proto);
diff --git a/languages/js/compression.js b/languages/js/compression.js
deleted file mode 100644
index 37d987e..0000000
--- a/languages/js/compression.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Compression');
-goog.provide('proto.Compression.Type');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/content.js b/languages/js/content.js
deleted file mode 100644
index 8223e89..0000000
--- a/languages/js/content.js
+++ /dev/null
@@ -1,322 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Content');
-goog.provide('proto.Content.Encoding');
-goog.provide('proto.Content.Type');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.Compression');
-
-goog.forwardDeclare('proto.Language');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {string}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
diff --git a/languages/js/documenttype.js b/languages/js/documenttype.js
deleted file mode 100644
index 1b36a89..0000000
--- a/languages/js/documenttype.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.DocumentType');
-goog.provide('proto.DocumentType.DocumentKind');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/es6/Product_pb.js b/languages/js/es6/Product_pb.js
deleted file mode 100644
index efb4722..0000000
--- a/languages/js/es6/Product_pb.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Product', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
diff --git a/languages/js/es6/base/Compression_pb.js b/languages/js/es6/base/Compression_pb.js
deleted file mode 100644
index b4cdaea..0000000
--- a/languages/js/es6/base/Compression_pb.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Compression', null, global);
-goog.exportSymbol('proto.Compression.Type', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/es6/base/Language_pb.js b/languages/js/es6/base/Language_pb.js
deleted file mode 100644
index 975cfbe..0000000
--- a/languages/js/es6/base/Language_pb.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Language', null, global);
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
diff --git a/languages/js/es6/base/ProductKey_pb.js b/languages/js/es6/base/ProductKey_pb.js
deleted file mode 100644
index fb41a21..0000000
--- a/languages/js/es6/base/ProductKey_pb.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductKey', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/es6/base/ProductKind_pb.js b/languages/js/es6/base/ProductKind_pb.js
deleted file mode 100644
index 1f6699b..0000000
--- a/languages/js/es6/base/ProductKind_pb.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductKind', null, global);
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
diff --git a/languages/js/es6/base/ProductType_pb.js b/languages/js/es6/base/ProductType_pb.js
deleted file mode 100644
index 5ae0459..0000000
--- a/languages/js/es6/base/ProductType_pb.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductType', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/es6/content/Brand_pb.js b/languages/js/es6/content/Brand_pb.js
deleted file mode 100644
index 0cb57ab..0000000
--- a/languages/js/es6/content/Brand_pb.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Brand', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
diff --git a/languages/js/es6/content/Content_pb.js b/languages/js/es6/content/Content_pb.js
deleted file mode 100644
index 3f464cb..0000000
--- a/languages/js/es6/content/Content_pb.js
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Content', null, global);
-goog.exportSymbol('proto.Content.Encoding', null, global);
-goog.exportSymbol('proto.Content.Type', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {!(string|Uint8Array)}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
diff --git a/languages/js/es6/content/MaterialsData_pb.js b/languages/js/es6/content/MaterialsData_pb.js
deleted file mode 100644
index 4564fb8..0000000
--- a/languages/js/es6/content/MaterialsData_pb.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.MaterialsData', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getRepeatedField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getRepeatedField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
diff --git a/languages/js/es6/content/Name_pb.js b/languages/js/es6/content/Name_pb.js
deleted file mode 100644
index 4908fbf..0000000
--- a/languages/js/es6/content/Name_pb.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Name', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/es6/content/ProductContent_pb.js b/languages/js/es6/content/ProductContent_pb.js
deleted file mode 100644
index 1498090..0000000
--- a/languages/js/es6/content/ProductContent_pb.js
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.ProductContent', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
diff --git a/languages/js/es6/geo/Address_pb.js b/languages/js/es6/geo/Address_pb.js
deleted file mode 100644
index 509593c..0000000
--- a/languages/js/es6/geo/Address_pb.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Address', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Address = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Address, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Address.displayName = 'proto.Address';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Address.prototype.toObject = function(opt_includeInstance) {
-  return proto.Address.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Address} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    firstLine: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    secondLine: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    city: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    state: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    zipcode: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    country: jspb.Message.getFieldWithDefault(msg, 6, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Address;
-  return proto.Address.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Address} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setFirstLine(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSecondLine(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCity(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setState(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setZipcode(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCountry(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Address.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Address.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Address} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFirstLine();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getSecondLine();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getCity();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getState();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getZipcode();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getCountry();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string first_line = 1;
- * @return {string}
- */
-proto.Address.prototype.getFirstLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setFirstLine = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string second_line = 2;
- * @return {string}
- */
-proto.Address.prototype.getSecondLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setSecondLine = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional string city = 3;
- * @return {string}
- */
-proto.Address.prototype.getCity = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCity = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional string state = 4;
- * @return {string}
- */
-proto.Address.prototype.getState = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setState = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional string zipcode = 5;
- * @return {string}
- */
-proto.Address.prototype.getZipcode = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setZipcode = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * optional string country = 6;
- * @return {string}
- */
-proto.Address.prototype.getCountry = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCountry = function(value) {
-  jspb.Message.setField(this, 6, value);
-};
-
-
diff --git a/languages/js/es6/media/MediaItem_pb.js b/languages/js/es6/media/MediaItem_pb.js
deleted file mode 100644
index fe8389c..0000000
--- a/languages/js/es6/media/MediaItem_pb.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.MediaItem', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
diff --git a/languages/js/es6/media/MediaKey_pb.js b/languages/js/es6/media/MediaKey_pb.js
deleted file mode 100644
index 51e1e10..0000000
--- a/languages/js/es6/media/MediaKey_pb.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.MediaKey', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/es6/media/MediaType_pb.js b/languages/js/es6/media/MediaType_pb.js
deleted file mode 100644
index 588fbd2..0000000
--- a/languages/js/es6/media/MediaType_pb.js
+++ /dev/null
@@ -1,786 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.DocumentType', null, global);
-goog.exportSymbol('proto.DocumentType.DocumentKind', null, global);
-goog.exportSymbol('proto.ImageType', null, global);
-goog.exportSymbol('proto.ImageType.ImageKind', null, global);
-goog.exportSymbol('proto.MediaType', null, global);
-goog.exportSymbol('proto.MediaType.Kind', null, global);
-goog.exportSymbol('proto.VideoType', null, global);
-goog.exportSymbol('proto.VideoType.VideoKind', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/es6/products/Flower_pb.js b/languages/js/es6/products/Flower_pb.js
deleted file mode 100644
index 7e4686c..0000000
--- a/languages/js/es6/products/Flower_pb.js
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Flower', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/es6/structs/FlagsDescriptor_pb.js b/languages/js/es6/structs/FlagsDescriptor_pb.js
deleted file mode 100644
index 099042d..0000000
--- a/languages/js/es6/structs/FlagsDescriptor_pb.js
+++ /dev/null
@@ -1,623 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.FlagsDescriptor', null, global);
-goog.exportSymbol('proto.ProductFlag', null, global);
-goog.exportSymbol('proto.ProductFlagValue', null, global);
-goog.exportSymbol('proto.ProductFlagset', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
diff --git a/languages/js/es6/structs/Genetics_pb.js b/languages/js/es6/structs/Genetics_pb.js
deleted file mode 100644
index 832ab7f..0000000
--- a/languages/js/es6/structs/Genetics_pb.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Genetics', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
diff --git a/languages/js/es6/structs/Grow_pb.js b/languages/js/es6/structs/Grow_pb.js
deleted file mode 100644
index 39f28d2..0000000
--- a/languages/js/es6/structs/Grow_pb.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Grow', null, global);
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
diff --git a/languages/js/es6/structs/Species_pb.js b/languages/js/es6/structs/Species_pb.js
deleted file mode 100644
index fb4e9b4..0000000
--- a/languages/js/es6/structs/Species_pb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.Species', null, global);
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
diff --git a/languages/js/es6/structs/pricing/PricingDescriptor_pb.js b/languages/js/es6/structs/pricing/PricingDescriptor_pb.js
deleted file mode 100644
index c162d44..0000000
--- a/languages/js/es6/structs/pricing/PricingDescriptor_pb.js
+++ /dev/null
@@ -1,1271 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.FreebiePricingDescriptor', null, global);
-goog.exportSymbol('proto.PricingDescriptor', null, global);
-goog.exportSymbol('proto.PricingTierAvailability', null, global);
-goog.exportSymbol('proto.PricingType', null, global);
-goog.exportSymbol('proto.PricingWeightTier', null, global);
-goog.exportSymbol('proto.ProductPricing', null, global);
-goog.exportSymbol('proto.UnitPricingDescriptor', null, global);
-goog.exportSymbol('proto.WeightedPricingDescriptor', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
diff --git a/languages/js/es6/structs/pricing/SaleDescriptor_pb.js b/languages/js/es6/structs/pricing/SaleDescriptor_pb.js
deleted file mode 100644
index 5dfe5ba..0000000
--- a/languages/js/es6/structs/pricing/SaleDescriptor_pb.js
+++ /dev/null
@@ -1,351 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.exportSymbol('proto.SaleDescriptor', null, global);
-goog.exportSymbol('proto.SaleType', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
diff --git a/languages/js/flagsdescriptor.js b/languages/js/flagsdescriptor.js
deleted file mode 100644
index 1717780..0000000
--- a/languages/js/flagsdescriptor.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.FlagsDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
diff --git a/languages/js/flower.js b/languages/js/flower.js
deleted file mode 100644
index f75ccc5..0000000
--- a/languages/js/flower.js
+++ /dev/null
@@ -1,351 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Flower');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.FlagsDescriptor');
-goog.require('proto.MaterialsData');
-goog.require('proto.ProductContent');
-goog.require('proto.ProductKey');
-goog.require('proto.ProductPricing');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/freebiepricingdescriptor.js b/languages/js/freebiepricingdescriptor.js
deleted file mode 100644
index 9b33101..0000000
--- a/languages/js/freebiepricingdescriptor.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.FreebiePricingDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
diff --git a/languages/js/genetics.js b/languages/js/genetics.js
deleted file mode 100644
index 12ac3fd..0000000
--- a/languages/js/genetics.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Genetics');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.Name');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
diff --git a/languages/js/grow.js b/languages/js/grow.js
deleted file mode 100644
index 7caa551..0000000
--- a/languages/js/grow.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Grow');
-
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
diff --git a/languages/js/imagetype.js b/languages/js/imagetype.js
deleted file mode 100644
index 488f2a7..0000000
--- a/languages/js/imagetype.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ImageType');
-goog.provide('proto.ImageType.ImageKind');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/language.js b/languages/js/language.js
deleted file mode 100644
index dc5bc35..0000000
--- a/languages/js/language.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Language');
-
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
diff --git a/languages/js/materialsdata.js b/languages/js/materialsdata.js
deleted file mode 100644
index a5ffe63..0000000
--- a/languages/js/materialsdata.js
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MaterialsData');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.Genetics');
-
-goog.forwardDeclare('proto.Grow');
-goog.forwardDeclare('proto.Species');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
diff --git a/languages/js/mediaitem.js b/languages/js/mediaitem.js
deleted file mode 100644
index ee75565..0000000
--- a/languages/js/mediaitem.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MediaItem');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.MediaKey');
-goog.require('proto.MediaType');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
diff --git a/languages/js/mediakey.js b/languages/js/mediakey.js
deleted file mode 100644
index 3d943fb..0000000
--- a/languages/js/mediakey.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MediaKey');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/mediatype.js b/languages/js/mediatype.js
deleted file mode 100644
index b2ab16f..0000000
--- a/languages/js/mediatype.js
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.MediaType');
-goog.provide('proto.MediaType.Kind');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.DocumentType');
-goog.require('proto.ImageType');
-goog.require('proto.VideoType');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
diff --git a/languages/js/name.js b/languages/js/name.js
deleted file mode 100644
index fc28315..0000000
--- a/languages/js/name.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Name');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/pricingdescriptor.js b/languages/js/pricingdescriptor.js
deleted file mode 100644
index 51d94b2..0000000
--- a/languages/js/pricingdescriptor.js
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.FreebiePricingDescriptor');
-goog.require('proto.UnitPricingDescriptor');
-goog.require('proto.WeightedPricingDescriptor');
-
-goog.forwardDeclare('proto.PricingType');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
diff --git a/languages/js/pricingtieravailability.js b/languages/js/pricingtieravailability.js
deleted file mode 100644
index d81dff1..0000000
--- a/languages/js/pricingtieravailability.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingTierAvailability');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/pricingtype.js b/languages/js/pricingtype.js
deleted file mode 100644
index 8672487..0000000
--- a/languages/js/pricingtype.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingType');
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
diff --git a/languages/js/pricingweighttier.js b/languages/js/pricingweighttier.js
deleted file mode 100644
index 712be5a..0000000
--- a/languages/js/pricingweighttier.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.PricingWeightTier');
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
diff --git a/languages/js/product.js b/languages/js/product.js
deleted file mode 100644
index f7158b6..0000000
--- a/languages/js/product.js
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Product');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.ProductKey');
-goog.require('proto.ProductType');
-goog.require('proto.google.protobuf.Any');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
diff --git a/languages/js/productcontent.js b/languages/js/productcontent.js
deleted file mode 100644
index 1075e86..0000000
--- a/languages/js/productcontent.js
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductContent');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.Brand');
-goog.require('proto.Content');
-goog.require('proto.MediaItem');
-goog.require('proto.Name');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
diff --git a/languages/js/productflag.js b/languages/js/productflag.js
deleted file mode 100644
index d6dccf0..0000000
--- a/languages/js/productflag.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductFlag');
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
diff --git a/languages/js/productflagset.js b/languages/js/productflagset.js
deleted file mode 100644
index b76fa85..0000000
--- a/languages/js/productflagset.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductFlagset');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.ProductFlagValue');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
diff --git a/languages/js/productflagvalue.js b/languages/js/productflagvalue.js
deleted file mode 100644
index 1493f63..0000000
--- a/languages/js/productflagvalue.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductFlagValue');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-goog.forwardDeclare('proto.ProductFlag');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
diff --git a/languages/js/productkey.js b/languages/js/productkey.js
deleted file mode 100644
index 2425198..0000000
--- a/languages/js/productkey.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductKey');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/productkind.js b/languages/js/productkind.js
deleted file mode 100644
index ecd9842..0000000
--- a/languages/js/productkind.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductKind');
-
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
diff --git a/languages/js/productpricing.js b/languages/js/productpricing.js
deleted file mode 100644
index 8580649..0000000
--- a/languages/js/productpricing.js
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductPricing');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.PricingDescriptor');
-goog.require('proto.SaleDescriptor');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
diff --git a/languages/js/producttype.js b/languages/js/producttype.js
deleted file mode 100644
index d5209ec..0000000
--- a/languages/js/producttype.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.ProductType');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-goog.forwardDeclare('proto.ProductKind');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/saledescriptor.js b/languages/js/saledescriptor.js
deleted file mode 100644
index d1ae833..0000000
--- a/languages/js/saledescriptor.js
+++ /dev/null
@@ -1,343 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.SaleDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-goog.forwardDeclare('proto.SaleType');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
diff --git a/languages/js/saletype.js b/languages/js/saletype.js
deleted file mode 100644
index 62cca76..0000000
--- a/languages/js/saletype.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.SaleType');
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
diff --git a/languages/js/schema-1.0.0-beta3.pb.js.js b/languages/js/schema-1.0.0-beta3.pb.js.js
deleted file mode 100644
index 10c4e6a..0000000
--- a/languages/js/schema-1.0.0-beta3.pb.js.js
+++ /dev/null
@@ -1,6122 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-
-goog.provide('proto.Brand');
-goog.provide('proto.Compression');
-goog.provide('proto.Compression.Type');
-goog.provide('proto.Content');
-goog.provide('proto.Content.Encoding');
-goog.provide('proto.Content.Type');
-goog.provide('proto.DocumentType');
-goog.provide('proto.DocumentType.DocumentKind');
-goog.provide('proto.FlagsDescriptor');
-goog.provide('proto.Flower');
-goog.provide('proto.FreebiePricingDescriptor');
-goog.provide('proto.Genetics');
-goog.provide('proto.Grow');
-goog.provide('proto.ImageType');
-goog.provide('proto.ImageType.ImageKind');
-goog.provide('proto.Language');
-goog.provide('proto.MaterialsData');
-goog.provide('proto.MediaItem');
-goog.provide('proto.MediaKey');
-goog.provide('proto.MediaType');
-goog.provide('proto.MediaType.Kind');
-goog.provide('proto.Name');
-goog.provide('proto.PricingDescriptor');
-goog.provide('proto.PricingTierAvailability');
-goog.provide('proto.PricingType');
-goog.provide('proto.PricingWeightTier');
-goog.provide('proto.Product');
-goog.provide('proto.ProductContent');
-goog.provide('proto.ProductFlag');
-goog.provide('proto.ProductFlagValue');
-goog.provide('proto.ProductFlagset');
-goog.provide('proto.ProductKey');
-goog.provide('proto.ProductKind');
-goog.provide('proto.ProductPricing');
-goog.provide('proto.ProductType');
-goog.provide('proto.SaleDescriptor');
-goog.provide('proto.SaleType');
-goog.provide('proto.Species');
-goog.provide('proto.UnitPricingDescriptor');
-goog.provide('proto.VideoType');
-goog.provide('proto.VideoType.VideoKind');
-goog.provide('proto.WeightedPricingDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.google.protobuf.Any');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {string}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/schema-1.0.0-beta4.pb.js.js b/languages/js/schema-1.0.0-beta4.pb.js.js
deleted file mode 100644
index 10c4e6a..0000000
--- a/languages/js/schema-1.0.0-beta4.pb.js.js
+++ /dev/null
@@ -1,6122 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-
-goog.provide('proto.Brand');
-goog.provide('proto.Compression');
-goog.provide('proto.Compression.Type');
-goog.provide('proto.Content');
-goog.provide('proto.Content.Encoding');
-goog.provide('proto.Content.Type');
-goog.provide('proto.DocumentType');
-goog.provide('proto.DocumentType.DocumentKind');
-goog.provide('proto.FlagsDescriptor');
-goog.provide('proto.Flower');
-goog.provide('proto.FreebiePricingDescriptor');
-goog.provide('proto.Genetics');
-goog.provide('proto.Grow');
-goog.provide('proto.ImageType');
-goog.provide('proto.ImageType.ImageKind');
-goog.provide('proto.Language');
-goog.provide('proto.MaterialsData');
-goog.provide('proto.MediaItem');
-goog.provide('proto.MediaKey');
-goog.provide('proto.MediaType');
-goog.provide('proto.MediaType.Kind');
-goog.provide('proto.Name');
-goog.provide('proto.PricingDescriptor');
-goog.provide('proto.PricingTierAvailability');
-goog.provide('proto.PricingType');
-goog.provide('proto.PricingWeightTier');
-goog.provide('proto.Product');
-goog.provide('proto.ProductContent');
-goog.provide('proto.ProductFlag');
-goog.provide('proto.ProductFlagValue');
-goog.provide('proto.ProductFlagset');
-goog.provide('proto.ProductKey');
-goog.provide('proto.ProductKind');
-goog.provide('proto.ProductPricing');
-goog.provide('proto.ProductType');
-goog.provide('proto.SaleDescriptor');
-goog.provide('proto.SaleType');
-goog.provide('proto.Species');
-goog.provide('proto.UnitPricingDescriptor');
-goog.provide('proto.VideoType');
-goog.provide('proto.VideoType.VideoKind');
-goog.provide('proto.WeightedPricingDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.google.protobuf.Any');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {string}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/schema-1.0.3.pb.js.js b/languages/js/schema-1.0.3.pb.js.js
deleted file mode 100644
index 2421aae..0000000
--- a/languages/js/schema-1.0.3.pb.js.js
+++ /dev/null
@@ -1,6442 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @suppress {messageConventions} JS Compiler reports an error if a variable or
- *     field starts with 'MSG_' and isn't a translatable message.
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-
-goog.provide('proto.Address');
-goog.provide('proto.Brand');
-goog.provide('proto.Compression');
-goog.provide('proto.Compression.Type');
-goog.provide('proto.Content');
-goog.provide('proto.Content.Encoding');
-goog.provide('proto.Content.Type');
-goog.provide('proto.DocumentType');
-goog.provide('proto.DocumentType.DocumentKind');
-goog.provide('proto.FlagsDescriptor');
-goog.provide('proto.Flower');
-goog.provide('proto.FreebiePricingDescriptor');
-goog.provide('proto.Genetics');
-goog.provide('proto.Grow');
-goog.provide('proto.ImageType');
-goog.provide('proto.ImageType.ImageKind');
-goog.provide('proto.Language');
-goog.provide('proto.MaterialsData');
-goog.provide('proto.MediaItem');
-goog.provide('proto.MediaKey');
-goog.provide('proto.MediaType');
-goog.provide('proto.MediaType.Kind');
-goog.provide('proto.Name');
-goog.provide('proto.PricingDescriptor');
-goog.provide('proto.PricingTierAvailability');
-goog.provide('proto.PricingType');
-goog.provide('proto.PricingWeightTier');
-goog.provide('proto.Product');
-goog.provide('proto.ProductContent');
-goog.provide('proto.ProductFlag');
-goog.provide('proto.ProductFlagValue');
-goog.provide('proto.ProductFlagset');
-goog.provide('proto.ProductKey');
-goog.provide('proto.ProductKind');
-goog.provide('proto.ProductPricing');
-goog.provide('proto.ProductType');
-goog.provide('proto.SaleDescriptor');
-goog.provide('proto.SaleType');
-goog.provide('proto.Species');
-goog.provide('proto.UnitPricingDescriptor');
-goog.provide('proto.VideoType');
-goog.provide('proto.VideoType.VideoKind');
-goog.provide('proto.WeightedPricingDescriptor');
-
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.Message');
-goog.require('proto.google.protobuf.Any');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductKey.displayName = 'proto.ProductKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductKey;
-  return proto.ProductKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductKey}
- */
-proto.ProductKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.ProductKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.ProductKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductKind = {
-  FLOWERS: 0,
-  EDIBLES: 1,
-  EXTRACTS: 2,
-  PREROLLS: 3,
-  APOTHECARY: 4,
-  CARTRIDGES: 5,
-  PLANTS: 6,
-  MERCHANDISE: 7
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductType.displayName = 'proto.ProductType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductType;
-  return proto.ProductType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductType}
- */
-proto.ProductType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductKind kind = 1;
- * @return {!proto.ProductKind}
- */
-proto.ProductType.prototype.getKind = function() {
-  return /** @type {!proto.ProductKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductKind} value */
-proto.ProductType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Product = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Product, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Product.displayName = 'proto.Product';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Product.prototype.toObject = function(opt_includeInstance) {
-  return proto.Product.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Product} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.ProductType.toObject(includeInstance, f),
-    data: (f = msg.getData()) && proto.google.protobuf.Any.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Product;
-  return proto.Product.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Product} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Product}
- */
-proto.Product.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.ProductType;
-      reader.readMessage(value,proto.ProductType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = new proto.google.protobuf.Any;
-      reader.readMessage(value,proto.google.protobuf.Any.deserializeBinaryFromReader);
-      msg.setData(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Product.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Product.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Product} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Product.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.ProductType.serializeBinaryToWriter
-    );
-  }
-  f = message.getData();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.google.protobuf.Any.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Product.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Product.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Product.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductType type = 2;
- * @return {?proto.ProductType}
- */
-proto.Product.prototype.getType = function() {
-  return /** @type{?proto.ProductType} */ (
-    jspb.Message.getWrapperField(this, proto.ProductType, 2));
-};
-
-
-/** @param {?proto.ProductType|undefined} value */
-proto.Product.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Product.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional google.protobuf.Any data = 3;
- * @return {?proto.google.protobuf.Any}
- */
-proto.Product.prototype.getData = function() {
-  return /** @type{?proto.google.protobuf.Any} */ (
-    jspb.Message.getWrapperField(this, proto.google.protobuf.Any, 3));
-};
-
-
-/** @param {?proto.google.protobuf.Any|undefined} value */
-proto.Product.prototype.setData = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Product.prototype.clearData = function() {
-  this.setData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Product.prototype.hasData = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Compression = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Compression, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Compression.displayName = 'proto.Compression';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Compression.prototype.toObject = function(opt_includeInstance) {
-  return proto.Compression.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Compression} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    enabled: jspb.Message.getFieldWithDefault(msg, 1, false),
-    type: jspb.Message.getFieldWithDefault(msg, 2, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Compression;
-  return proto.Compression.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Compression} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Compression}
- */
-proto.Compression.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setEnabled(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Compression.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Compression.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Compression.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Compression} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Compression.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Compression.Type = {
-  GZIP: 0
-};
-
-/**
- * optional bool enabled = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.Compression.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.Compression.prototype.setEnabled = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Type type = 2;
- * @return {!proto.Compression.Type}
- */
-proto.Compression.prototype.getType = function() {
-  return /** @type {!proto.Compression.Type} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Compression.Type} value */
-proto.Compression.prototype.setType = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.Language = {
-  ENGLISH: 0,
-  SPANISH: 1,
-  FRENCH: 2
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Name = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Name, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Name.displayName = 'proto.Name';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Name.prototype.toObject = function(opt_includeInstance) {
-  return proto.Name.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Name} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    primary: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    display: jspb.Message.getFieldWithDefault(msg, 2, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Name;
-  return proto.Name.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Name} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Name}
- */
-proto.Name.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setPrimary(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setDisplay(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Name.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Name.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Name} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Name.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPrimary();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getDisplay();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string primary = 1;
- * @return {string}
- */
-proto.Name.prototype.getPrimary = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setPrimary = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string display = 2;
- * @return {string}
- */
-proto.Name.prototype.getDisplay = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Name.prototype.setDisplay = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Content = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Content, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Content.displayName = 'proto.Content';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Content.prototype.toObject = function(opt_includeInstance) {
-  return proto.Content.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Content} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    encoding: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    content: msg.getContent_asB64(),
-    language: jspb.Message.getFieldWithDefault(msg, 4, 0),
-    compression: (f = msg.getCompression()) && proto.Compression.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Content;
-  return proto.Content.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Content} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Content}
- */
-proto.Content.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.Content.Type} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Content.Encoding} */ (reader.readEnum());
-      msg.setEncoding(value);
-      break;
-    case 3:
-      var value = /** @type {!Uint8Array} */ (reader.readBytes());
-      msg.setContent(value);
-      break;
-    case 4:
-      var value = /** @type {!proto.Language} */ (reader.readEnum());
-      msg.setLanguage(value);
-      break;
-    case 5:
-      var value = new proto.Compression;
-      reader.readMessage(value,proto.Compression.deserializeBinaryFromReader);
-      msg.setCompression(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Content.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Content.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Content} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Content.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEncoding();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getContent_asU8();
-  if (f.length > 0) {
-    writer.writeBytes(
-      3,
-      f
-    );
-  }
-  f = message.getLanguage();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      4,
-      f
-    );
-  }
-  f = message.getCompression();
-  if (f != null) {
-    writer.writeMessage(
-      5,
-      f,
-      proto.Compression.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.Content.Type = {
-  TEXT: 0,
-  MARKDOWN: 1,
-  HTML: 2
-};
-
-/**
- * @enum {number}
- */
-proto.Content.Encoding = {
-  UTF8: 0
-};
-
-/**
- * optional Type type = 1;
- * @return {!proto.Content.Type}
- */
-proto.Content.prototype.getType = function() {
-  return /** @type {!proto.Content.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.Content.Type} value */
-proto.Content.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional Encoding encoding = 2;
- * @return {!proto.Content.Encoding}
- */
-proto.Content.prototype.getEncoding = function() {
-  return /** @type {!proto.Content.Encoding} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Content.Encoding} value */
-proto.Content.prototype.setEncoding = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bytes content = 3;
- * @return {string}
- */
-proto.Content.prototype.getContent = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * optional bytes content = 3;
- * This is a type-conversion wrapper around `getContent()`
- * @return {string}
- */
-proto.Content.prototype.getContent_asB64 = function() {
-  return /** @type {string} */ (jspb.Message.bytesAsB64(
-      this.getContent()));
-};
-
-
-/**
- * optional bytes content = 3;
- * Note that Uint8Array is not supported on all browsers.
- * @see http://caniuse.com/Uint8Array
- * This is a type-conversion wrapper around `getContent()`
- * @return {!Uint8Array}
- */
-proto.Content.prototype.getContent_asU8 = function() {
-  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
-      this.getContent()));
-};
-
-
-/** @param {!(string|Uint8Array)} value */
-proto.Content.prototype.setContent = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Language language = 4;
- * @return {!proto.Language}
- */
-proto.Content.prototype.getLanguage = function() {
-  return /** @type {!proto.Language} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
-};
-
-
-/** @param {!proto.Language} value */
-proto.Content.prototype.setLanguage = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional Compression compression = 5;
- * @return {?proto.Compression}
- */
-proto.Content.prototype.getCompression = function() {
-  return /** @type{?proto.Compression} */ (
-    jspb.Message.getWrapperField(this, proto.Compression, 5));
-};
-
-
-/** @param {?proto.Compression|undefined} value */
-proto.Content.prototype.setCompression = function(value) {
-  jspb.Message.setWrapperField(this, 5, value);
-};
-
-
-proto.Content.prototype.clearCompression = function() {
-  this.setCompression(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Content.prototype.hasCompression = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaKey = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaKey, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaKey.displayName = 'proto.MediaKey';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaKey.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaKey.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaKey} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    id: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaKey;
-  return proto.MediaKey.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaKey} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaKey}
- */
-proto.MediaKey.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setId(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaKey.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaKey.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaKey} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaKey.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getId();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string id = 1;
- * @return {string}
- */
-proto.MediaKey.prototype.getId = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaKey.prototype.setId = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaType.displayName = 'proto.MediaType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaType.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    imageType: (f = msg.getImageType()) && proto.ImageType.toObject(includeInstance, f),
-    documentType: (f = msg.getDocumentType()) && proto.DocumentType.toObject(includeInstance, f),
-    videoType: (f = msg.getVideoType()) && proto.VideoType.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaType;
-  return proto.MediaType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaType}
- */
-proto.MediaType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.MediaType.Kind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 101:
-      var value = new proto.ImageType;
-      reader.readMessage(value,proto.ImageType.deserializeBinaryFromReader);
-      msg.setImageType(value);
-      break;
-    case 201:
-      var value = new proto.DocumentType;
-      reader.readMessage(value,proto.DocumentType.deserializeBinaryFromReader);
-      msg.setDocumentType(value);
-      break;
-    case 301:
-      var value = new proto.VideoType;
-      reader.readMessage(value,proto.VideoType.deserializeBinaryFromReader);
-      msg.setVideoType(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getImageType();
-  if (f != null) {
-    writer.writeMessage(
-      101,
-      f,
-      proto.ImageType.serializeBinaryToWriter
-    );
-  }
-  f = message.getDocumentType();
-  if (f != null) {
-    writer.writeMessage(
-      201,
-      f,
-      proto.DocumentType.serializeBinaryToWriter
-    );
-  }
-  f = message.getVideoType();
-  if (f != null) {
-    writer.writeMessage(
-      301,
-      f,
-      proto.VideoType.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.MediaType.Kind = {
-  LINK: 0,
-  IMAGE: 1,
-  DOCUMENT: 2,
-  VIDEO: 3
-};
-
-/**
- * optional Kind kind = 1;
- * @return {!proto.MediaType.Kind}
- */
-proto.MediaType.prototype.getKind = function() {
-  return /** @type {!proto.MediaType.Kind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.MediaType.Kind} value */
-proto.MediaType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional ImageType image_type = 101;
- * @return {?proto.ImageType}
- */
-proto.MediaType.prototype.getImageType = function() {
-  return /** @type{?proto.ImageType} */ (
-    jspb.Message.getWrapperField(this, proto.ImageType, 101));
-};
-
-
-/** @param {?proto.ImageType|undefined} value */
-proto.MediaType.prototype.setImageType = function(value) {
-  jspb.Message.setWrapperField(this, 101, value);
-};
-
-
-proto.MediaType.prototype.clearImageType = function() {
-  this.setImageType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasImageType = function() {
-  return jspb.Message.getField(this, 101) != null;
-};
-
-
-/**
- * optional DocumentType document_type = 201;
- * @return {?proto.DocumentType}
- */
-proto.MediaType.prototype.getDocumentType = function() {
-  return /** @type{?proto.DocumentType} */ (
-    jspb.Message.getWrapperField(this, proto.DocumentType, 201));
-};
-
-
-/** @param {?proto.DocumentType|undefined} value */
-proto.MediaType.prototype.setDocumentType = function(value) {
-  jspb.Message.setWrapperField(this, 201, value);
-};
-
-
-proto.MediaType.prototype.clearDocumentType = function() {
-  this.setDocumentType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasDocumentType = function() {
-  return jspb.Message.getField(this, 201) != null;
-};
-
-
-/**
- * optional VideoType video_type = 301;
- * @return {?proto.VideoType}
- */
-proto.MediaType.prototype.getVideoType = function() {
-  return /** @type{?proto.VideoType} */ (
-    jspb.Message.getWrapperField(this, proto.VideoType, 301));
-};
-
-
-/** @param {?proto.VideoType|undefined} value */
-proto.MediaType.prototype.setVideoType = function(value) {
-  jspb.Message.setWrapperField(this, 301, value);
-};
-
-
-proto.MediaType.prototype.clearVideoType = function() {
-  this.setVideoType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaType.prototype.hasVideoType = function() {
-  return jspb.Message.getField(this, 301) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ImageType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ImageType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ImageType.displayName = 'proto.ImageType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ImageType.prototype.toObject = function(opt_includeInstance) {
-  return proto.ImageType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ImageType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ImageType;
-  return proto.ImageType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ImageType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ImageType}
- */
-proto.ImageType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ImageType.ImageKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ImageType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ImageType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ImageType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ImageType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.ImageType.ImageKind = {
-  PNG: 0,
-  JPG: 1,
-  GIF: 2,
-  SVG: 3,
-  WEBP: 4
-};
-
-/**
- * optional ImageKind kind = 1;
- * @return {!proto.ImageType.ImageKind}
- */
-proto.ImageType.prototype.getKind = function() {
-  return /** @type {!proto.ImageType.ImageKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ImageType.ImageKind} value */
-proto.ImageType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.DocumentType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.DocumentType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.DocumentType.displayName = 'proto.DocumentType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.DocumentType.prototype.toObject = function(opt_includeInstance) {
-  return proto.DocumentType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.DocumentType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    compressed: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.DocumentType;
-  return proto.DocumentType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.DocumentType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.DocumentType}
- */
-proto.DocumentType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.DocumentType.DocumentKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setCompressed(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.DocumentType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.DocumentType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.DocumentType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.DocumentType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getCompressed();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.DocumentType.DocumentKind = {
-  TXT: 0,
-  HTML: 1,
-  PDF: 2,
-  MARKDOWN: 3
-};
-
-/**
- * optional DocumentKind kind = 1;
- * @return {!proto.DocumentType.DocumentKind}
- */
-proto.DocumentType.prototype.getKind = function() {
-  return /** @type {!proto.DocumentType.DocumentKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.DocumentType.DocumentKind} value */
-proto.DocumentType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool compressed = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.DocumentType.prototype.getCompressed = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.DocumentType.prototype.setCompressed = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MediaItem = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.MediaItem, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MediaItem.displayName = 'proto.MediaItem';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MediaItem.prototype.toObject = function(opt_includeInstance) {
-  return proto.MediaItem.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MediaItem} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.MediaKey.toObject(includeInstance, f),
-    type: (f = msg.getType()) && proto.MediaType.toObject(includeInstance, f),
-    name: jspb.Message.getFieldWithDefault(msg, 3, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MediaItem;
-  return proto.MediaItem.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MediaItem} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MediaItem}
- */
-proto.MediaItem.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.MediaKey;
-      reader.readMessage(value,proto.MediaKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 2:
-      var value = new proto.MediaType;
-      reader.readMessage(value,proto.MediaType.deserializeBinaryFromReader);
-      msg.setType(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MediaItem.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MediaItem.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MediaItem} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MediaItem.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.MediaKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getType();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.MediaType.serializeBinaryToWriter
-    );
-  }
-  f = message.getName();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional MediaKey key = 1;
- * @return {?proto.MediaKey}
- */
-proto.MediaItem.prototype.getKey = function() {
-  return /** @type{?proto.MediaKey} */ (
-    jspb.Message.getWrapperField(this, proto.MediaKey, 1));
-};
-
-
-/** @param {?proto.MediaKey|undefined} value */
-proto.MediaItem.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.MediaItem.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional MediaType type = 2;
- * @return {?proto.MediaType}
- */
-proto.MediaItem.prototype.getType = function() {
-  return /** @type{?proto.MediaType} */ (
-    jspb.Message.getWrapperField(this, proto.MediaType, 2));
-};
-
-
-/** @param {?proto.MediaType|undefined} value */
-proto.MediaItem.prototype.setType = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.MediaItem.prototype.clearType = function() {
-  this.setType(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MediaItem.prototype.hasType = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string name = 3;
- * @return {string}
- */
-proto.MediaItem.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.MediaItem.prototype.setName = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Brand = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.Brand.repeatedFields_, null);
-};
-goog.inherits(proto.Brand, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Brand.displayName = 'proto.Brand';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.Brand.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Brand.prototype.toObject = function(opt_includeInstance) {
-  return proto.Brand.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Brand} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    parent: (f = msg.getParent()) && proto.Brand.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Brand;
-  return proto.Brand.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Brand} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Brand}
- */
-proto.Brand.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setParent(value);
-      break;
-    case 3:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Brand.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Brand.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Brand} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Brand.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getParent();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.Brand.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Brand.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Brand.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Brand parent = 2;
- * @return {?proto.Brand}
- */
-proto.Brand.prototype.getParent = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 2));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.Brand.prototype.setParent = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Brand.prototype.clearParent = function() {
-  this.setParent(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasParent = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Content summary = 3;
- * @return {?proto.Content}
- */
-proto.Brand.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 3));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.Brand.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.Brand.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Brand.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.Brand.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.Brand.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.Brand.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.Brand.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.Grow = {
-  GENERIC: 0,
-  INDOOR: 1,
-  GREENHOUSE: 2,
-  OUTDOOR: 3
-};
-
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Genetics = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Genetics, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Genetics.displayName = 'proto.Genetics';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Genetics.prototype.toObject = function(opt_includeInstance) {
-  return proto.Genetics.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Genetics} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    male: (f = msg.getMale()) && proto.Name.toObject(includeInstance, f),
-    female: (f = msg.getFemale()) && proto.Name.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Genetics;
-  return proto.Genetics.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Genetics} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Genetics}
- */
-proto.Genetics.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setMale(value);
-      break;
-    case 2:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setFemale(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Genetics.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Genetics.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Genetics} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Genetics.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getMale();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getFemale();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name male = 1;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getMale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setMale = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Genetics.prototype.clearMale = function() {
-  this.setMale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasMale = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Name female = 2;
- * @return {?proto.Name}
- */
-proto.Genetics.prototype.getFemale = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 2));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.Genetics.prototype.setFemale = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.Genetics.prototype.clearFemale = function() {
-  this.setFemale(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Genetics.prototype.hasFemale = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.MaterialsData = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.MaterialsData.repeatedFields_, null);
-};
-goog.inherits(proto.MaterialsData, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.MaterialsData.displayName = 'proto.MaterialsData';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.MaterialsData.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.MaterialsData.prototype.toObject = function(opt_includeInstance) {
-  return proto.MaterialsData.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.MaterialsData} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    ingredientsList: jspb.Message.getRepeatedField(msg, 1),
-    grow: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    species: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    genetics: (f = msg.getGenetics()) && proto.Genetics.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.MaterialsData;
-  return proto.MaterialsData.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.MaterialsData} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.MaterialsData}
- */
-proto.MaterialsData.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addIngredients(value);
-      break;
-    case 2:
-      var value = /** @type {!proto.Grow} */ (reader.readEnum());
-      msg.setGrow(value);
-      break;
-    case 3:
-      var value = /** @type {!proto.Species} */ (reader.readEnum());
-      msg.setSpecies(value);
-      break;
-    case 4:
-      var value = new proto.Genetics;
-      reader.readMessage(value,proto.Genetics.deserializeBinaryFromReader);
-      msg.setGenetics(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.MaterialsData.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.MaterialsData.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.MaterialsData} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.MaterialsData.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getIngredientsList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      1,
-      f
-    );
-  }
-  f = message.getGrow();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      2,
-      f
-    );
-  }
-  f = message.getSpecies();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      3,
-      f
-    );
-  }
-  f = message.getGenetics();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.Genetics.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated string ingredients = 1;
- * @return {!Array.<string>}
- */
-proto.MaterialsData.prototype.getIngredientsList = function() {
-  return /** @type {!Array.<string>} */ (jspb.Message.getRepeatedField(this, 1));
-};
-
-
-/** @param {!Array.<string>} value */
-proto.MaterialsData.prototype.setIngredientsList = function(value) {
-  jspb.Message.setField(this, 1, value || []);
-};
-
-
-/**
- * @param {!string} value
- * @param {number=} opt_index
- */
-proto.MaterialsData.prototype.addIngredients = function(value, opt_index) {
-  jspb.Message.addToRepeatedField(this, 1, value, opt_index);
-};
-
-
-proto.MaterialsData.prototype.clearIngredientsList = function() {
-  this.setIngredientsList([]);
-};
-
-
-/**
- * optional Grow grow = 2;
- * @return {!proto.Grow}
- */
-proto.MaterialsData.prototype.getGrow = function() {
-  return /** @type {!proto.Grow} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {!proto.Grow} value */
-proto.MaterialsData.prototype.setGrow = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional Species species = 3;
- * @return {!proto.Species}
- */
-proto.MaterialsData.prototype.getSpecies = function() {
-  return /** @type {!proto.Species} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {!proto.Species} value */
-proto.MaterialsData.prototype.setSpecies = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional Genetics genetics = 4;
- * @return {?proto.Genetics}
- */
-proto.MaterialsData.prototype.getGenetics = function() {
-  return /** @type{?proto.Genetics} */ (
-    jspb.Message.getWrapperField(this, proto.Genetics, 4));
-};
-
-
-/** @param {?proto.Genetics|undefined} value */
-proto.MaterialsData.prototype.setGenetics = function(value) {
-  jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-proto.MaterialsData.prototype.clearGenetics = function() {
-  this.setGenetics(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.MaterialsData.prototype.hasGenetics = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductContent = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductContent.repeatedFields_, null);
-};
-goog.inherits(proto.ProductContent, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductContent.displayName = 'proto.ProductContent';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductContent.repeatedFields_ = [20];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductContent.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductContent.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductContent} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: (f = msg.getName()) && proto.Name.toObject(includeInstance, f),
-    summary: (f = msg.getSummary()) && proto.Content.toObject(includeInstance, f),
-    brand: (f = msg.getBrand()) && proto.Brand.toObject(includeInstance, f),
-    mediaList: jspb.Message.toObjectList(msg.getMediaList(),
-    proto.MediaItem.toObject, includeInstance),
-    usage: (f = msg.getUsage()) && proto.Content.toObject(includeInstance, f),
-    dosage: (f = msg.getDosage()) && proto.Content.toObject(includeInstance, f),
-    advice: (f = msg.getAdvice()) && proto.Content.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductContent;
-  return proto.ProductContent.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductContent} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductContent}
- */
-proto.ProductContent.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.Name;
-      reader.readMessage(value,proto.Name.deserializeBinaryFromReader);
-      msg.setName(value);
-      break;
-    case 2:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setSummary(value);
-      break;
-    case 3:
-      var value = new proto.Brand;
-      reader.readMessage(value,proto.Brand.deserializeBinaryFromReader);
-      msg.setBrand(value);
-      break;
-    case 20:
-      var value = new proto.MediaItem;
-      reader.readMessage(value,proto.MediaItem.deserializeBinaryFromReader);
-      msg.addMedia(value);
-      break;
-    case 30:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setUsage(value);
-      break;
-    case 31:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setDosage(value);
-      break;
-    case 32:
-      var value = new proto.Content;
-      reader.readMessage(value,proto.Content.deserializeBinaryFromReader);
-      msg.setAdvice(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductContent.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductContent.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductContent} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductContent.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getName();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.Name.serializeBinaryToWriter
-    );
-  }
-  f = message.getSummary();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getBrand();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      proto.Brand.serializeBinaryToWriter
-    );
-  }
-  f = message.getMediaList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      20,
-      f,
-      proto.MediaItem.serializeBinaryToWriter
-    );
-  }
-  f = message.getUsage();
-  if (f != null) {
-    writer.writeMessage(
-      30,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getDosage();
-  if (f != null) {
-    writer.writeMessage(
-      31,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-  f = message.getAdvice();
-  if (f != null) {
-    writer.writeMessage(
-      32,
-      f,
-      proto.Content.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional Name name = 1;
- * @return {?proto.Name}
- */
-proto.ProductContent.prototype.getName = function() {
-  return /** @type{?proto.Name} */ (
-    jspb.Message.getWrapperField(this, proto.Name, 1));
-};
-
-
-/** @param {?proto.Name|undefined} value */
-proto.ProductContent.prototype.setName = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.ProductContent.prototype.clearName = function() {
-  this.setName(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasName = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional Content summary = 2;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getSummary = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 2));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setSummary = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.ProductContent.prototype.clearSummary = function() {
-  this.setSummary(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasSummary = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional Brand brand = 3;
- * @return {?proto.Brand}
- */
-proto.ProductContent.prototype.getBrand = function() {
-  return /** @type{?proto.Brand} */ (
-    jspb.Message.getWrapperField(this, proto.Brand, 3));
-};
-
-
-/** @param {?proto.Brand|undefined} value */
-proto.ProductContent.prototype.setBrand = function(value) {
-  jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-proto.ProductContent.prototype.clearBrand = function() {
-  this.setBrand(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasBrand = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * repeated MediaItem media = 20;
- * @return {!Array.<!proto.MediaItem>}
- */
-proto.ProductContent.prototype.getMediaList = function() {
-  return /** @type{!Array.<!proto.MediaItem>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.MediaItem, 20));
-};
-
-
-/** @param {!Array.<!proto.MediaItem>} value */
-proto.ProductContent.prototype.setMediaList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 20, value);
-};
-
-
-/**
- * @param {!proto.MediaItem=} opt_value
- * @param {number=} opt_index
- * @return {!proto.MediaItem}
- */
-proto.ProductContent.prototype.addMedia = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 20, opt_value, proto.MediaItem, opt_index);
-};
-
-
-proto.ProductContent.prototype.clearMediaList = function() {
-  this.setMediaList([]);
-};
-
-
-/**
- * optional Content usage = 30;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getUsage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 30));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setUsage = function(value) {
-  jspb.Message.setWrapperField(this, 30, value);
-};
-
-
-proto.ProductContent.prototype.clearUsage = function() {
-  this.setUsage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasUsage = function() {
-  return jspb.Message.getField(this, 30) != null;
-};
-
-
-/**
- * optional Content dosage = 31;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getDosage = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 31));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setDosage = function(value) {
-  jspb.Message.setWrapperField(this, 31, value);
-};
-
-
-proto.ProductContent.prototype.clearDosage = function() {
-  this.setDosage(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasDosage = function() {
-  return jspb.Message.getField(this, 31) != null;
-};
-
-
-/**
- * optional Content advice = 32;
- * @return {?proto.Content}
- */
-proto.ProductContent.prototype.getAdvice = function() {
-  return /** @type{?proto.Content} */ (
-    jspb.Message.getWrapperField(this, proto.Content, 32));
-};
-
-
-/** @param {?proto.Content|undefined} value */
-proto.ProductContent.prototype.setAdvice = function(value) {
-  jspb.Message.setWrapperField(this, 32, value);
-};
-
-
-proto.ProductContent.prototype.clearAdvice = function() {
-  this.setAdvice(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.ProductContent.prototype.hasAdvice = function() {
-  return jspb.Message.getField(this, 32) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Address = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Address, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Address.displayName = 'proto.Address';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Address.prototype.toObject = function(opt_includeInstance) {
-  return proto.Address.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Address} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    firstLine: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    secondLine: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    city: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    state: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    zipcode: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    country: jspb.Message.getFieldWithDefault(msg, 6, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Address;
-  return proto.Address.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Address} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Address}
- */
-proto.Address.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setFirstLine(value);
-      break;
-    case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSecondLine(value);
-      break;
-    case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCity(value);
-      break;
-    case 4:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setState(value);
-      break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setZipcode(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setCountry(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Address.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Address.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Address} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Address.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFirstLine();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-  f = message.getSecondLine();
-  if (f.length > 0) {
-    writer.writeString(
-      2,
-      f
-    );
-  }
-  f = message.getCity();
-  if (f.length > 0) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
-  f = message.getState();
-  if (f.length > 0) {
-    writer.writeString(
-      4,
-      f
-    );
-  }
-  f = message.getZipcode();
-  if (f.length > 0) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = message.getCountry();
-  if (f.length > 0) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string first_line = 1;
- * @return {string}
- */
-proto.Address.prototype.getFirstLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setFirstLine = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional string second_line = 2;
- * @return {string}
- */
-proto.Address.prototype.getSecondLine = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setSecondLine = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional string city = 3;
- * @return {string}
- */
-proto.Address.prototype.getCity = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCity = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional string state = 4;
- * @return {string}
- */
-proto.Address.prototype.getState = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setState = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional string zipcode = 5;
- * @return {string}
- */
-proto.Address.prototype.getZipcode = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setZipcode = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * optional string country = 6;
- * @return {string}
- */
-proto.Address.prototype.getCountry = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/** @param {string} value */
-proto.Address.prototype.setCountry = function(value) {
-  jspb.Message.setField(this, 6, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagValue = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.ProductFlagValue, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagValue.displayName = 'proto.ProductFlagValue';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagValue.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagValue.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagValue} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    value: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagValue;
-  return proto.ProductFlagValue.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagValue} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagValue.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.ProductFlag} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setValue(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagValue.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagValue.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagValue} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagValue.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getValue();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional ProductFlag type = 1;
- * @return {!proto.ProductFlag}
- */
-proto.ProductFlagValue.prototype.getType = function() {
-  return /** @type {!proto.ProductFlag} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.ProductFlag} value */
-proto.ProductFlagValue.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool value = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.ProductFlagValue.prototype.getValue = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.ProductFlagValue.prototype.setValue = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductFlagset = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductFlagset.repeatedFields_, null);
-};
-goog.inherits(proto.ProductFlagset, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductFlagset.displayName = 'proto.ProductFlagset';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductFlagset.repeatedFields_ = [1];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductFlagset.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductFlagset.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductFlagset} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    flagsList: jspb.Message.toObjectList(msg.getFlagsList(),
-    proto.ProductFlagValue.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductFlagset;
-  return proto.ProductFlagset.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductFlagset} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductFlagset}
- */
-proto.ProductFlagset.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductFlagValue;
-      reader.readMessage(value,proto.ProductFlagValue.deserializeBinaryFromReader);
-      msg.addFlags(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductFlagset.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductFlagset.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductFlagset} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductFlagset.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getFlagsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.ProductFlagValue.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated ProductFlagValue flags = 1;
- * @return {!Array.<!proto.ProductFlagValue>}
- */
-proto.ProductFlagset.prototype.getFlagsList = function() {
-  return /** @type{!Array.<!proto.ProductFlagValue>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.ProductFlagValue, 1));
-};
-
-
-/** @param {!Array.<!proto.ProductFlagValue>} value */
-proto.ProductFlagset.prototype.setFlagsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.ProductFlagValue=} opt_value
- * @param {number=} opt_index
- * @return {!proto.ProductFlagValue}
- */
-proto.ProductFlagset.prototype.addFlags = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.ProductFlagValue, opt_index);
-};
-
-
-proto.ProductFlagset.prototype.clearFlagsList = function() {
-  this.setFlagsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FlagsDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FlagsDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FlagsDescriptor.displayName = 'proto.FlagsDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FlagsDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FlagsDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FlagsDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    visible: jspb.Message.getFieldWithDefault(msg, 1, false),
-    premium: jspb.Message.getFieldWithDefault(msg, 2, false),
-    featured: jspb.Message.getFieldWithDefault(msg, 3, false),
-    lastchance: jspb.Message.getFieldWithDefault(msg, 4, false),
-    inhouse: jspb.Message.getFieldWithDefault(msg, 5, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FlagsDescriptor;
-  return proto.FlagsDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FlagsDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FlagsDescriptor}
- */
-proto.FlagsDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setVisible(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setPremium(value);
-      break;
-    case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setFeatured(value);
-      break;
-    case 4:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setLastchance(value);
-      break;
-    case 5:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setInhouse(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FlagsDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FlagsDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FlagsDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FlagsDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getVisible();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getPremium();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-  f = message.getFeatured();
-  if (f) {
-    writer.writeBool(
-      3,
-      f
-    );
-  }
-  f = message.getLastchance();
-  if (f) {
-    writer.writeBool(
-      4,
-      f
-    );
-  }
-  f = message.getInhouse();
-  if (f) {
-    writer.writeBool(
-      5,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool visible = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getVisible = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setVisible = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool premium = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getPremium = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setPremium = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional bool featured = 3;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getFeatured = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 3, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setFeatured = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional bool lastchance = 4;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getLastchance = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 4, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setLastchance = function(value) {
-  jspb.Message.setField(this, 4, value);
-};
-
-
-/**
- * optional bool inhouse = 5;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.FlagsDescriptor.prototype.getInhouse = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false));
-};
-
-
-/** @param {boolean} value */
-proto.FlagsDescriptor.prototype.setInhouse = function(value) {
-  jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.ProductFlag = {
-  VISIBLE: 0,
-  PREMIUM: 1,
-  FEATURED: 2,
-  LASTCHANCE: 3,
-  INHOUSE: 4
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.SaleDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.SaleDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.SaleDescriptor.displayName = 'proto.SaleDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.SaleDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.SaleDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.SaleDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    effective: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    expiration: jspb.Message.getFieldWithDefault(msg, 3, 0),
-    percentageAmount: jspb.Message.getFieldWithDefault(msg, 20, 0),
-    bogoTrigger: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    bogoReward: jspb.Message.getFieldWithDefault(msg, 22, 0),
-    loyaltyTrigger: jspb.Message.getFieldWithDefault(msg, 23, 0),
-    loyaltyReward: jspb.Message.getFieldWithDefault(msg, 24, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.SaleDescriptor;
-  return proto.SaleDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.SaleDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.SaleDescriptor}
- */
-proto.SaleDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.SaleType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setEffective(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setExpiration(value);
-      break;
-    case 20:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setPercentageAmount(value);
-      break;
-    case 21:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoTrigger(value);
-      break;
-    case 22:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setBogoReward(value);
-      break;
-    case 23:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyTrigger(value);
-      break;
-    case 24:
-      var value = /** @type {number} */ (reader.readUint32());
-      msg.setLoyaltyReward(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.SaleDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.SaleDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.SaleDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.SaleDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getEffective();
-  if (f !== 0) {
-    writer.writeUint64(
-      2,
-      f
-    );
-  }
-  f = message.getExpiration();
-  if (f !== 0) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getPercentageAmount();
-  if (f !== 0) {
-    writer.writeUint32(
-      20,
-      f
-    );
-  }
-  f = message.getBogoTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      21,
-      f
-    );
-  }
-  f = message.getBogoReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      22,
-      f
-    );
-  }
-  f = message.getLoyaltyTrigger();
-  if (f !== 0) {
-    writer.writeUint32(
-      23,
-      f
-    );
-  }
-  f = message.getLoyaltyReward();
-  if (f !== 0) {
-    writer.writeUint32(
-      24,
-      f
-    );
-  }
-};
-
-
-/**
- * optional SaleType type = 1;
- * @return {!proto.SaleType}
- */
-proto.SaleDescriptor.prototype.getType = function() {
-  return /** @type {!proto.SaleType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.SaleType} value */
-proto.SaleDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional uint64 effective = 2;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getEffective = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setEffective = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-/**
- * optional uint64 expiration = 3;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getExpiration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setExpiration = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * optional uint32 percentage_amount = 20;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getPercentageAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setPercentageAmount = function(value) {
-  jspb.Message.setField(this, 20, value);
-};
-
-
-/**
- * optional uint32 bogo_trigger = 21;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoTrigger = function(value) {
-  jspb.Message.setField(this, 21, value);
-};
-
-
-/**
- * optional uint32 bogo_reward = 22;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getBogoReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setBogoReward = function(value) {
-  jspb.Message.setField(this, 22, value);
-};
-
-
-/**
- * optional uint32 loyalty_trigger = 23;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyTrigger = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyTrigger = function(value) {
-  jspb.Message.setField(this, 23, value);
-};
-
-
-/**
- * optional uint32 loyalty_reward = 24;
- * @return {number}
- */
-proto.SaleDescriptor.prototype.getLoyaltyReward = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 24, 0));
-};
-
-
-/** @param {number} value */
-proto.SaleDescriptor.prototype.setLoyaltyReward = function(value) {
-  jspb.Message.setField(this, 24, value);
-};
-
-
-/**
- * @enum {number}
- */
-proto.SaleType = {
-  PERCENTAGE: 0,
-  BOGO: 1,
-  LOYALTY: 2
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingTierAvailability = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingTierAvailability, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingTierAvailability.displayName = 'proto.PricingTierAvailability';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingTierAvailability.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingTierAvailability.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingTierAvailability} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    offered: jspb.Message.getFieldWithDefault(msg, 1, false),
-    available: jspb.Message.getFieldWithDefault(msg, 2, false)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingTierAvailability;
-  return proto.PricingTierAvailability.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingTierAvailability} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingTierAvailability}
- */
-proto.PricingTierAvailability.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setOffered(value);
-      break;
-    case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setAvailable(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingTierAvailability.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingTierAvailability.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingTierAvailability} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingTierAvailability.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOffered();
-  if (f) {
-    writer.writeBool(
-      1,
-      f
-    );
-  }
-  f = message.getAvailable();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
-};
-
-
-/**
- * optional bool offered = 1;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getOffered = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setOffered = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional bool available = 2;
- * Note that Boolean fields may be set to 0/1 when serialized from a Java server.
- * You should avoid comparisons like {@code val === true/false} in those cases.
- * @return {boolean}
- */
-proto.PricingTierAvailability.prototype.getAvailable = function() {
-  return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false));
-};
-
-
-/** @param {boolean} value */
-proto.PricingTierAvailability.prototype.setAvailable = function(value) {
-  jspb.Message.setField(this, 2, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.FreebiePricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.FreebiePricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.FreebiePricingDescriptor.displayName = 'proto.FreebiePricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.FreebiePricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.FreebiePricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.FreebiePricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.FreebiePricingDescriptor;
-  return proto.FreebiePricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.FreebiePricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.FreebiePricingDescriptor}
- */
-proto.FreebiePricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.FreebiePricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.FreebiePricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.FreebiePricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.FreebiePricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.PricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.PricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.PricingDescriptor.displayName = 'proto.PricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.PricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.PricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.PricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    type: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    unit: (f = msg.getUnit()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weighted: (f = msg.getWeighted()) && proto.WeightedPricingDescriptor.toObject(includeInstance, f),
-    freebie: (f = msg.getFreebie()) && proto.FreebiePricingDescriptor.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.PricingDescriptor;
-  return proto.PricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.PricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.PricingDescriptor}
- */
-proto.PricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingType} */ (reader.readEnum());
-      msg.setType(value);
-      break;
-    case 20:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setUnit(value);
-      break;
-    case 21:
-      var value = new proto.WeightedPricingDescriptor;
-      reader.readMessage(value,proto.WeightedPricingDescriptor.deserializeBinaryFromReader);
-      msg.setWeighted(value);
-      break;
-    case 22:
-      var value = new proto.FreebiePricingDescriptor;
-      reader.readMessage(value,proto.FreebiePricingDescriptor.deserializeBinaryFromReader);
-      msg.setFreebie(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.PricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.PricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.PricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.PricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getType();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getUnit();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeighted();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.WeightedPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getFreebie();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FreebiePricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional PricingType type = 1;
- * @return {!proto.PricingType}
- */
-proto.PricingDescriptor.prototype.getType = function() {
-  return /** @type {!proto.PricingType} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingType} value */
-proto.PricingDescriptor.prototype.setType = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor unit = 20;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getUnit = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 20));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setUnit = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearUnit = function() {
-  this.setUnit(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasUnit = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional WeightedPricingDescriptor weighted = 21;
- * @return {?proto.WeightedPricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getWeighted = function() {
-  return /** @type{?proto.WeightedPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.WeightedPricingDescriptor, 21));
-};
-
-
-/** @param {?proto.WeightedPricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setWeighted = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearWeighted = function() {
-  this.setWeighted(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasWeighted = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FreebiePricingDescriptor freebie = 22;
- * @return {?proto.FreebiePricingDescriptor}
- */
-proto.PricingDescriptor.prototype.getFreebie = function() {
-  return /** @type{?proto.FreebiePricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FreebiePricingDescriptor, 22));
-};
-
-
-/** @param {?proto.FreebiePricingDescriptor|undefined} value */
-proto.PricingDescriptor.prototype.setFreebie = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.PricingDescriptor.prototype.clearFreebie = function() {
-  this.setFreebie(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.PricingDescriptor.prototype.hasFreebie = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.ProductPricing = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.ProductPricing.repeatedFields_, null);
-};
-goog.inherits(proto.ProductPricing, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.ProductPricing.displayName = 'proto.ProductPricing';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.ProductPricing.repeatedFields_ = [1,2];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.ProductPricing.prototype.toObject = function(opt_includeInstance) {
-  return proto.ProductPricing.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.ProductPricing} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance),
-    manifestList: jspb.Message.toObjectList(msg.getManifestList(),
-    proto.PricingDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.ProductPricing;
-  return proto.ProductPricing.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.ProductPricing} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.ProductPricing}
- */
-proto.ProductPricing.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    case 2:
-      var value = new proto.PricingDescriptor;
-      reader.readMessage(value,proto.PricingDescriptor.deserializeBinaryFromReader);
-      msg.addManifest(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.ProductPricing.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.ProductPricing.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.ProductPricing} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.ProductPricing.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      1,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getManifestList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      2,
-      f,
-      proto.PricingDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 1;
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.ProductPricing.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 1));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.ProductPricing.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 1, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.ProductPricing.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
-/**
- * repeated PricingDescriptor manifest = 2;
- * @return {!Array.<!proto.PricingDescriptor>}
- */
-proto.ProductPricing.prototype.getManifestList = function() {
-  return /** @type{!Array.<!proto.PricingDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.PricingDescriptor, 2));
-};
-
-
-/** @param {!Array.<!proto.PricingDescriptor>} value */
-proto.ProductPricing.prototype.setManifestList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 2, value);
-};
-
-
-/**
- * @param {!proto.PricingDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.PricingDescriptor}
- */
-proto.ProductPricing.prototype.addManifest = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.PricingDescriptor, opt_index);
-};
-
-
-proto.ProductPricing.prototype.clearManifestList = function() {
-  this.setManifestList([]);
-};
-
-
-/**
- * @enum {number}
- */
-proto.PricingType = {
-  UNIT: 0,
-  WEIGHTED: 1,
-  FREEBIE: 2
-};
-
-/**
- * @enum {number}
- */
-proto.PricingWeightTier = {
-  OTHER: 0,
-  GRAM: 1,
-  HALFGRAM: 2,
-  QUARTERGRAM: 3,
-  DUB: 4,
-  EIGHTH: 5,
-  QUARTER: 6,
-  HALF: 7,
-  OUNCE: 8,
-  POUND: 9
-};
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.Flower = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.Flower, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.Flower.displayName = 'proto.Flower';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.Flower.prototype.toObject = function(opt_includeInstance) {
-  return proto.Flower.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.Flower} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    key: (f = msg.getKey()) && proto.ProductKey.toObject(includeInstance, f),
-    productData: (f = msg.getProductData()) && proto.ProductContent.toObject(includeInstance, f),
-    materialData: (f = msg.getMaterialData()) && proto.MaterialsData.toObject(includeInstance, f),
-    flags: (f = msg.getFlags()) && proto.FlagsDescriptor.toObject(includeInstance, f),
-    pricing: (f = msg.getPricing()) && proto.ProductPricing.toObject(includeInstance, f)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.Flower;
-  return proto.Flower.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.Flower} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.Flower}
- */
-proto.Flower.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = new proto.ProductKey;
-      reader.readMessage(value,proto.ProductKey.deserializeBinaryFromReader);
-      msg.setKey(value);
-      break;
-    case 20:
-      var value = new proto.ProductContent;
-      reader.readMessage(value,proto.ProductContent.deserializeBinaryFromReader);
-      msg.setProductData(value);
-      break;
-    case 21:
-      var value = new proto.MaterialsData;
-      reader.readMessage(value,proto.MaterialsData.deserializeBinaryFromReader);
-      msg.setMaterialData(value);
-      break;
-    case 22:
-      var value = new proto.FlagsDescriptor;
-      reader.readMessage(value,proto.FlagsDescriptor.deserializeBinaryFromReader);
-      msg.setFlags(value);
-      break;
-    case 23:
-      var value = new proto.ProductPricing;
-      reader.readMessage(value,proto.ProductPricing.deserializeBinaryFromReader);
-      msg.setPricing(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.Flower.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.Flower.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.Flower} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.Flower.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKey();
-  if (f != null) {
-    writer.writeMessage(
-      1,
-      f,
-      proto.ProductKey.serializeBinaryToWriter
-    );
-  }
-  f = message.getProductData();
-  if (f != null) {
-    writer.writeMessage(
-      20,
-      f,
-      proto.ProductContent.serializeBinaryToWriter
-    );
-  }
-  f = message.getMaterialData();
-  if (f != null) {
-    writer.writeMessage(
-      21,
-      f,
-      proto.MaterialsData.serializeBinaryToWriter
-    );
-  }
-  f = message.getFlags();
-  if (f != null) {
-    writer.writeMessage(
-      22,
-      f,
-      proto.FlagsDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getPricing();
-  if (f != null) {
-    writer.writeMessage(
-      23,
-      f,
-      proto.ProductPricing.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional ProductKey key = 1;
- * @return {?proto.ProductKey}
- */
-proto.Flower.prototype.getKey = function() {
-  return /** @type{?proto.ProductKey} */ (
-    jspb.Message.getWrapperField(this, proto.ProductKey, 1));
-};
-
-
-/** @param {?proto.ProductKey|undefined} value */
-proto.Flower.prototype.setKey = function(value) {
-  jspb.Message.setWrapperField(this, 1, value);
-};
-
-
-proto.Flower.prototype.clearKey = function() {
-  this.setKey(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasKey = function() {
-  return jspb.Message.getField(this, 1) != null;
-};
-
-
-/**
- * optional ProductContent product_data = 20;
- * @return {?proto.ProductContent}
- */
-proto.Flower.prototype.getProductData = function() {
-  return /** @type{?proto.ProductContent} */ (
-    jspb.Message.getWrapperField(this, proto.ProductContent, 20));
-};
-
-
-/** @param {?proto.ProductContent|undefined} value */
-proto.Flower.prototype.setProductData = function(value) {
-  jspb.Message.setWrapperField(this, 20, value);
-};
-
-
-proto.Flower.prototype.clearProductData = function() {
-  this.setProductData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasProductData = function() {
-  return jspb.Message.getField(this, 20) != null;
-};
-
-
-/**
- * optional MaterialsData material_data = 21;
- * @return {?proto.MaterialsData}
- */
-proto.Flower.prototype.getMaterialData = function() {
-  return /** @type{?proto.MaterialsData} */ (
-    jspb.Message.getWrapperField(this, proto.MaterialsData, 21));
-};
-
-
-/** @param {?proto.MaterialsData|undefined} value */
-proto.Flower.prototype.setMaterialData = function(value) {
-  jspb.Message.setWrapperField(this, 21, value);
-};
-
-
-proto.Flower.prototype.clearMaterialData = function() {
-  this.setMaterialData(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasMaterialData = function() {
-  return jspb.Message.getField(this, 21) != null;
-};
-
-
-/**
- * optional FlagsDescriptor flags = 22;
- * @return {?proto.FlagsDescriptor}
- */
-proto.Flower.prototype.getFlags = function() {
-  return /** @type{?proto.FlagsDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.FlagsDescriptor, 22));
-};
-
-
-/** @param {?proto.FlagsDescriptor|undefined} value */
-proto.Flower.prototype.setFlags = function(value) {
-  jspb.Message.setWrapperField(this, 22, value);
-};
-
-
-proto.Flower.prototype.clearFlags = function() {
-  this.setFlags(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasFlags = function() {
-  return jspb.Message.getField(this, 22) != null;
-};
-
-
-/**
- * optional ProductPricing pricing = 23;
- * @return {?proto.ProductPricing}
- */
-proto.Flower.prototype.getPricing = function() {
-  return /** @type{?proto.ProductPricing} */ (
-    jspb.Message.getWrapperField(this, proto.ProductPricing, 23));
-};
-
-
-/** @param {?proto.ProductPricing|undefined} value */
-proto.Flower.prototype.setPricing = function(value) {
-  jspb.Message.setWrapperField(this, 23, value);
-};
-
-
-proto.Flower.prototype.clearPricing = function() {
-  this.setPricing(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.Flower.prototype.hasPricing = function() {
-  return jspb.Message.getField(this, 23) != null;
-};
-
-
diff --git a/languages/js/species.js b/languages/js/species.js
deleted file mode 100644
index 194f974..0000000
--- a/languages/js/species.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.Species');
-
-/**
- * @enum {number}
- */
-proto.Species = {
-  UNSPECIFIED: 0,
-  SATIVA: 1,
-  HYBRID_SATIVA: 2,
-  HYBRID: 3,
-  HYBRID_INDICA: 4,
-  INDICA: 5
-};
-
diff --git a/languages/js/unitpricingdescriptor.js b/languages/js/unitpricingdescriptor.js
deleted file mode 100644
index c205b3e..0000000
--- a/languages/js/unitpricingdescriptor.js
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.UnitPricingDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.PricingTierAvailability');
-goog.require('proto.SaleDescriptor');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.UnitPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.UnitPricingDescriptor.repeatedFields_, null);
-};
-goog.inherits(proto.UnitPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.UnitPricingDescriptor.displayName = 'proto.UnitPricingDescriptor';
-}
-/**
- * List of repeated fields within this message type.
- * @private {!Array<number>}
- * @const
- */
-proto.UnitPricingDescriptor.repeatedFields_ = [3];
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.UnitPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.UnitPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.UnitPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    priceValue: +jspb.Message.getFieldWithDefault(msg, 1, 0.0),
-    status: (f = msg.getStatus()) && proto.PricingTierAvailability.toObject(includeInstance, f),
-    discountsList: jspb.Message.toObjectList(msg.getDiscountsList(),
-    proto.SaleDescriptor.toObject, includeInstance)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.UnitPricingDescriptor;
-  return proto.UnitPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.UnitPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.UnitPricingDescriptor}
- */
-proto.UnitPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setPriceValue(value);
-      break;
-    case 2:
-      var value = new proto.PricingTierAvailability;
-      reader.readMessage(value,proto.PricingTierAvailability.deserializeBinaryFromReader);
-      msg.setStatus(value);
-      break;
-    case 3:
-      var value = new proto.SaleDescriptor;
-      reader.readMessage(value,proto.SaleDescriptor.deserializeBinaryFromReader);
-      msg.addDiscounts(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.UnitPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.UnitPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.UnitPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.UnitPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getPriceValue();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      1,
-      f
-    );
-  }
-  f = message.getStatus();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.PricingTierAvailability.serializeBinaryToWriter
-    );
-  }
-  f = message.getDiscountsList();
-  if (f.length > 0) {
-    writer.writeRepeatedMessage(
-      3,
-      f,
-      proto.SaleDescriptor.serializeBinaryToWriter
-    );
-  }
-};
-
-
-/**
- * optional float price_value = 1;
- * @return {number}
- */
-proto.UnitPricingDescriptor.prototype.getPriceValue = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 1, 0.0));
-};
-
-
-/** @param {number} value */
-proto.UnitPricingDescriptor.prototype.setPriceValue = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional PricingTierAvailability status = 2;
- * @return {?proto.PricingTierAvailability}
- */
-proto.UnitPricingDescriptor.prototype.getStatus = function() {
-  return /** @type{?proto.PricingTierAvailability} */ (
-    jspb.Message.getWrapperField(this, proto.PricingTierAvailability, 2));
-};
-
-
-/** @param {?proto.PricingTierAvailability|undefined} value */
-proto.UnitPricingDescriptor.prototype.setStatus = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearStatus = function() {
-  this.setStatus(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.UnitPricingDescriptor.prototype.hasStatus = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * repeated SaleDescriptor discounts = 3;
- * If you change this array by adding, removing or replacing elements, or if you
- * replace the array itself, then you must call the setter to update it.
- * @return {!Array.<!proto.SaleDescriptor>}
- */
-proto.UnitPricingDescriptor.prototype.getDiscountsList = function() {
-  return /** @type{!Array.<!proto.SaleDescriptor>} */ (
-    jspb.Message.getRepeatedWrapperField(this, proto.SaleDescriptor, 3));
-};
-
-
-/** @param {!Array.<!proto.SaleDescriptor>} value */
-proto.UnitPricingDescriptor.prototype.setDiscountsList = function(value) {
-  jspb.Message.setRepeatedWrapperField(this, 3, value);
-};
-
-
-/**
- * @param {!proto.SaleDescriptor=} opt_value
- * @param {number=} opt_index
- * @return {!proto.SaleDescriptor}
- */
-proto.UnitPricingDescriptor.prototype.addDiscounts = function(opt_value, opt_index) {
-  return jspb.Message.addToRepeatedWrapperField(this, 3, opt_value, proto.SaleDescriptor, opt_index);
-};
-
-
-proto.UnitPricingDescriptor.prototype.clearDiscountsList = function() {
-  this.setDiscountsList([]);
-};
-
-
diff --git a/languages/js/videotype.js b/languages/js/videotype.js
deleted file mode 100644
index ada53c4..0000000
--- a/languages/js/videotype.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.VideoType');
-goog.provide('proto.VideoType.VideoKind');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.VideoType = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.VideoType, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.VideoType.displayName = 'proto.VideoType';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.VideoType.prototype.toObject = function(opt_includeInstance) {
-  return proto.VideoType.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.VideoType} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.VideoType.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    kind: jspb.Message.getFieldWithDefault(msg, 1, 0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.VideoType;
-  return proto.VideoType.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.VideoType} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.VideoType}
- */
-proto.VideoType.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.VideoType.VideoKind} */ (reader.readEnum());
-      msg.setKind(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.VideoType.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.VideoType.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.VideoType} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.VideoType.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getKind();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * @enum {number}
- */
-proto.VideoType.VideoKind = {
-  MP4: 0,
-  FLV: 1,
-  HLS: 2
-};
-
-/**
- * optional VideoKind kind = 1;
- * @return {!proto.VideoType.VideoKind}
- */
-proto.VideoType.prototype.getKind = function() {
-  return /** @type {!proto.VideoType.VideoKind} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.VideoType.VideoKind} value */
-proto.VideoType.prototype.setKind = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
diff --git a/languages/js/weightedpricingdescriptor.js b/languages/js/weightedpricingdescriptor.js
deleted file mode 100644
index cbdd65e..0000000
--- a/languages/js/weightedpricingdescriptor.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-goog.provide('proto.WeightedPricingDescriptor');
-
-goog.require('jspb.Message');
-goog.require('jspb.BinaryReader');
-goog.require('jspb.BinaryWriter');
-goog.require('proto.UnitPricingDescriptor');
-
-goog.forwardDeclare('proto.PricingWeightTier');
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.WeightedPricingDescriptor = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.WeightedPricingDescriptor, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.WeightedPricingDescriptor.displayName = 'proto.WeightedPricingDescriptor';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.prototype.toObject = function(opt_includeInstance) {
-  return proto.WeightedPricingDescriptor.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.WeightedPricingDescriptor} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.WeightedPricingDescriptor.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    weight: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    tier: (f = msg.getTier()) && proto.UnitPricingDescriptor.toObject(includeInstance, f),
-    weightingrams: +jspb.Message.getFieldWithDefault(msg, 3, 0.0)
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.WeightedPricingDescriptor;
-  return proto.WeightedPricingDescriptor.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.WeightedPricingDescriptor} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.WeightedPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {!proto.PricingWeightTier} */ (reader.readEnum());
-      msg.setWeight(value);
-      break;
-    case 2:
-      var value = new proto.UnitPricingDescriptor;
-      reader.readMessage(value,proto.UnitPricingDescriptor.deserializeBinaryFromReader);
-      msg.setTier(value);
-      break;
-    case 3:
-      var value = /** @type {number} */ (reader.readFloat());
-      msg.setWeightingrams(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.WeightedPricingDescriptor.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.WeightedPricingDescriptor.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.WeightedPricingDescriptor} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.WeightedPricingDescriptor.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getWeight();
-  if (f !== 0.0) {
-    writer.writeEnum(
-      1,
-      f
-    );
-  }
-  f = message.getTier();
-  if (f != null) {
-    writer.writeMessage(
-      2,
-      f,
-      proto.UnitPricingDescriptor.serializeBinaryToWriter
-    );
-  }
-  f = message.getWeightingrams();
-  if (f !== 0.0) {
-    writer.writeFloat(
-      3,
-      f
-    );
-  }
-};
-
-
-/**
- * optional PricingWeightTier weight = 1;
- * @return {!proto.PricingWeightTier}
- */
-proto.WeightedPricingDescriptor.prototype.getWeight = function() {
-  return /** @type {!proto.PricingWeightTier} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
-};
-
-
-/** @param {!proto.PricingWeightTier} value */
-proto.WeightedPricingDescriptor.prototype.setWeight = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-
-
-/**
- * optional UnitPricingDescriptor tier = 2;
- * @return {?proto.UnitPricingDescriptor}
- */
-proto.WeightedPricingDescriptor.prototype.getTier = function() {
-  return /** @type{?proto.UnitPricingDescriptor} */ (
-    jspb.Message.getWrapperField(this, proto.UnitPricingDescriptor, 2));
-};
-
-
-/** @param {?proto.UnitPricingDescriptor|undefined} value */
-proto.WeightedPricingDescriptor.prototype.setTier = function(value) {
-  jspb.Message.setWrapperField(this, 2, value);
-};
-
-
-proto.WeightedPricingDescriptor.prototype.clearTier = function() {
-  this.setTier(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {!boolean}
- */
-proto.WeightedPricingDescriptor.prototype.hasTier = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional float weightInGrams = 3;
- * @return {number}
- */
-proto.WeightedPricingDescriptor.prototype.getWeightingrams = function() {
-  return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 3, 0.0));
-};
-
-
-/** @param {number} value */
-proto.WeightedPricingDescriptor.prototype.setWeightingrams = function(value) {
-  jspb.Message.setField(this, 3, value);
-};
-
-
diff --git a/languages/objc/Product.pbobjc.h b/languages/objc/Product.pbobjc.h
deleted file mode 100644
index 9709724..0000000
--- a/languages/objc/Product.pbobjc.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class GPBAny;
-@class ProductKey;
-@class ProductType;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - ProductRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface ProductRoot : GPBRootObject
-@end
-
-#pragma mark - Product
-
-typedef GPB_ENUM(Product_FieldNumber) {
-  Product_FieldNumber_Key = 1,
-  Product_FieldNumber_Type = 2,
-  Product_FieldNumber_Data_p = 3,
-};
-
-/**
- * -- Product Type: Top-level -- //
- **/
-@interface Product : GPBMessage
-
-@property(nonatomic, readwrite, strong, null_resettable) ProductKey *key;
-/** Test to see if @c key has been set. */
-@property(nonatomic, readwrite) BOOL hasKey;
-
-@property(nonatomic, readwrite, strong, null_resettable) ProductType *type;
-/** Test to see if @c type has been set. */
-@property(nonatomic, readwrite) BOOL hasType;
-
-@property(nonatomic, readwrite, strong, null_resettable) GPBAny *data_p;
-/** Test to see if @c data_p has been set. */
-@property(nonatomic, readwrite) BOOL hasData_p;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/Product.pbobjc.m b/languages/objc/Product.pbobjc.m
deleted file mode 100644
index 4ab9fed..0000000
--- a/languages/objc/Product.pbobjc.m
+++ /dev/null
@@ -1,121 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Product.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/Any.pbobjc.h>
-#else
- #import "google/protobuf/Any.pbobjc.h"
-#endif
-
- #import "Product.pbobjc.h"
- #import "base/ProductKey.pbobjc.h"
- #import "base/ProductType.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - ProductRoot
-
-@implementation ProductRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - ProductRoot_FileDescriptor
-
-static GPBFileDescriptor *ProductRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Product
-
-@implementation Product
-
-@dynamic hasKey, key;
-@dynamic hasType, type;
-@dynamic hasData_p, data_p;
-
-typedef struct Product__storage_ {
-  uint32_t _has_storage_[1];
-  ProductKey *key;
-  ProductType *type;
-  GPBAny *data_p;
-} Product__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "key",
-        .dataTypeSpecific.className = GPBStringifySymbol(ProductKey),
-        .number = Product_FieldNumber_Key,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Product__storage_, key),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "type",
-        .dataTypeSpecific.className = GPBStringifySymbol(ProductType),
-        .number = Product_FieldNumber_Type,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Product__storage_, type),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "data_p",
-        .dataTypeSpecific.className = GPBStringifySymbol(GPBAny),
-        .number = Product_FieldNumber_Data_p,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(Product__storage_, data_p),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Product class]
-                                     rootClass:[ProductRoot class]
-                                          file:ProductRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Product__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/Compression.pbobjc.h b/languages/objc/base/Compression.pbobjc.h
deleted file mode 100644
index e158c77..0000000
--- a/languages/objc/base/Compression.pbobjc.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum Compression_Type
-
-typedef GPB_ENUM(Compression_Type) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  Compression_Type_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  Compression_Type_Gzip = 0,
-};
-
-GPBEnumDescriptor *Compression_Type_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL Compression_Type_IsValidValue(int32_t value);
-
-#pragma mark - CompressionRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface CompressionRoot : GPBRootObject
-@end
-
-#pragma mark - Compression
-
-typedef GPB_ENUM(Compression_FieldNumber) {
-  Compression_FieldNumber_Enabled = 1,
-  Compression_FieldNumber_Type = 2,
-};
-
-@interface Compression : GPBMessage
-
-@property(nonatomic, readwrite) BOOL enabled;
-
-@property(nonatomic, readwrite) Compression_Type type;
-
-@end
-
-/**
- * Fetches the raw value of a @c Compression's @c type property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t Compression_Type_RawValue(Compression *message);
-/**
- * Sets the raw value of an @c Compression's @c type property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetCompression_Type_RawValue(Compression *message, int32_t value);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/Compression.pbobjc.m b/languages/objc/base/Compression.pbobjc.m
deleted file mode 100644
index 54ef746..0000000
--- a/languages/objc/base/Compression.pbobjc.m
+++ /dev/null
@@ -1,145 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Compression.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "base/Compression.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - CompressionRoot
-
-@implementation CompressionRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - CompressionRoot_FileDescriptor
-
-static GPBFileDescriptor *CompressionRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Compression
-
-@implementation Compression
-
-@dynamic enabled;
-@dynamic type;
-
-typedef struct Compression__storage_ {
-  uint32_t _has_storage_[1];
-  Compression_Type type;
-} Compression__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "enabled",
-        .dataTypeSpecific.className = NULL,
-        .number = Compression_FieldNumber_Enabled,
-        .hasIndex = 0,
-        .offset = 1,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "type",
-        .dataTypeSpecific.enumDescFunc = Compression_Type_EnumDescriptor,
-        .number = Compression_FieldNumber_Type,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(Compression__storage_, type),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Compression class]
-                                     rootClass:[CompressionRoot class]
-                                          file:CompressionRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Compression__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t Compression_Type_RawValue(Compression *message) {
-  GPBDescriptor *descriptor = [Compression descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Compression_FieldNumber_Type];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetCompression_Type_RawValue(Compression *message, int32_t value) {
-  GPBDescriptor *descriptor = [Compression descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Compression_FieldNumber_Type];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - Enum Compression_Type
-
-GPBEnumDescriptor *Compression_Type_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Gzip\000";
-    static const int32_t values[] = {
-        Compression_Type_Gzip,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(Compression_Type)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:Compression_Type_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL Compression_Type_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case Compression_Type_Gzip:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/Language.pbobjc.h b/languages/objc/base/Language.pbobjc.h
deleted file mode 100644
index 3a55bb6..0000000
--- a/languages/objc/base/Language.pbobjc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum Language
-
-typedef GPB_ENUM(Language) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  Language_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  Language_English = 0,
-  Language_Spanish = 1,
-  Language_French = 2,
-};
-
-GPBEnumDescriptor *Language_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL Language_IsValidValue(int32_t value);
-
-#pragma mark - LanguageRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface LanguageRoot : GPBRootObject
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/Language.pbobjc.m b/languages/objc/base/Language.pbobjc.m
deleted file mode 100644
index 8fb6bd0..0000000
--- a/languages/objc/base/Language.pbobjc.m
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/Language.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "base/Language.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - LanguageRoot
-
-@implementation LanguageRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - Enum Language
-
-GPBEnumDescriptor *Language_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "English\000Spanish\000French\000";
-    static const int32_t values[] = {
-        Language_English,
-        Language_Spanish,
-        Language_French,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(Language)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:Language_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL Language_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case Language_English:
-    case Language_Spanish:
-    case Language_French:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/ProductKey.pbobjc.h b/languages/objc/base/ProductKey.pbobjc.h
deleted file mode 100644
index f5e6db1..0000000
--- a/languages/objc/base/ProductKey.pbobjc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - ProductKeyRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface ProductKeyRoot : GPBRootObject
-@end
-
-#pragma mark - ProductKey
-
-typedef GPB_ENUM(ProductKey_FieldNumber) {
-  ProductKey_FieldNumber_Id_p = 1,
-};
-
-@interface ProductKey : GPBMessage
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *id_p;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/ProductKey.pbobjc.m b/languages/objc/base/ProductKey.pbobjc.m
deleted file mode 100644
index e8f7a03..0000000
--- a/languages/objc/base/ProductKey.pbobjc.m
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKey.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "base/ProductKey.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - ProductKeyRoot
-
-@implementation ProductKeyRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - ProductKeyRoot_FileDescriptor
-
-static GPBFileDescriptor *ProductKeyRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - ProductKey
-
-@implementation ProductKey
-
-@dynamic id_p;
-
-typedef struct ProductKey__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *id_p;
-} ProductKey__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "id_p",
-        .dataTypeSpecific.className = NULL,
-        .number = ProductKey_FieldNumber_Id_p,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(ProductKey__storage_, id_p),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ProductKey class]
-                                     rootClass:[ProductKeyRoot class]
-                                          file:ProductKeyRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ProductKey__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/ProductKind.pbobjc.h b/languages/objc/base/ProductKind.pbobjc.h
deleted file mode 100644
index 4a565d1..0000000
--- a/languages/objc/base/ProductKind.pbobjc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum ProductKind
-
-typedef GPB_ENUM(ProductKind) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  ProductKind_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  ProductKind_Flowers = 0,
-  ProductKind_Edibles = 1,
-  ProductKind_Extracts = 2,
-  ProductKind_Prerolls = 3,
-  ProductKind_Apothecary = 4,
-  ProductKind_Cartridges = 5,
-  ProductKind_Plants = 6,
-  ProductKind_Merchandise = 7,
-};
-
-GPBEnumDescriptor *ProductKind_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL ProductKind_IsValidValue(int32_t value);
-
-#pragma mark - ProductKindRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface ProductKindRoot : GPBRootObject
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/ProductKind.pbobjc.m b/languages/objc/base/ProductKind.pbobjc.m
deleted file mode 100644
index c853558..0000000
--- a/languages/objc/base/ProductKind.pbobjc.m
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductKind.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "base/ProductKind.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - ProductKindRoot
-
-@implementation ProductKindRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - Enum ProductKind
-
-GPBEnumDescriptor *ProductKind_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Flowers\000Edibles\000Extracts\000Prerolls\000Apothe"
-        "cary\000Cartridges\000Plants\000Merchandise\000";
-    static const int32_t values[] = {
-        ProductKind_Flowers,
-        ProductKind_Edibles,
-        ProductKind_Extracts,
-        ProductKind_Prerolls,
-        ProductKind_Apothecary,
-        ProductKind_Cartridges,
-        ProductKind_Plants,
-        ProductKind_Merchandise,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(ProductKind)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:ProductKind_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL ProductKind_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case ProductKind_Flowers:
-    case ProductKind_Edibles:
-    case ProductKind_Extracts:
-    case ProductKind_Prerolls:
-    case ProductKind_Apothecary:
-    case ProductKind_Cartridges:
-    case ProductKind_Plants:
-    case ProductKind_Merchandise:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/ProductType.pbobjc.h b/languages/objc/base/ProductType.pbobjc.h
deleted file mode 100644
index 57afd47..0000000
--- a/languages/objc/base/ProductType.pbobjc.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-GPB_ENUM_FWD_DECLARE(ProductKind);
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - ProductTypeRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface ProductTypeRoot : GPBRootObject
-@end
-
-#pragma mark - ProductType
-
-typedef GPB_ENUM(ProductType_FieldNumber) {
-  ProductType_FieldNumber_Kind = 1,
-};
-
-/**
- * -- Product Type: Top-level -- //
- **/
-@interface ProductType : GPBMessage
-
-@property(nonatomic, readwrite) enum ProductKind kind;
-
-@end
-
-/**
- * Fetches the raw value of a @c ProductType's @c kind property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t ProductType_Kind_RawValue(ProductType *message);
-/**
- * Sets the raw value of an @c ProductType's @c kind property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetProductType_Kind_RawValue(ProductType *message, int32_t value);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/base/ProductType.pbobjc.m b/languages/objc/base/ProductType.pbobjc.m
deleted file mode 100644
index 99219ae..0000000
--- a/languages/objc/base/ProductType.pbobjc.m
+++ /dev/null
@@ -1,104 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: base/ProductType.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "base/ProductType.pbobjc.h"
- #import "base/ProductKind.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - ProductTypeRoot
-
-@implementation ProductTypeRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - ProductTypeRoot_FileDescriptor
-
-static GPBFileDescriptor *ProductTypeRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - ProductType
-
-@implementation ProductType
-
-@dynamic kind;
-
-typedef struct ProductType__storage_ {
-  uint32_t _has_storage_[1];
-  ProductKind kind;
-} ProductType__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "kind",
-        .dataTypeSpecific.enumDescFunc = ProductKind_EnumDescriptor,
-        .number = ProductType_FieldNumber_Kind,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(ProductType__storage_, kind),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ProductType class]
-                                     rootClass:[ProductTypeRoot class]
-                                          file:ProductTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ProductType__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t ProductType_Kind_RawValue(ProductType *message) {
-  GPBDescriptor *descriptor = [ProductType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:ProductType_FieldNumber_Kind];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetProductType_Kind_RawValue(ProductType *message, int32_t value) {
-  GPBDescriptor *descriptor = [ProductType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:ProductType_FieldNumber_Kind];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/Brand.pbobjc.h b/languages/objc/content/Brand.pbobjc.h
deleted file mode 100644
index ace3cf9..0000000
--- a/languages/objc/content/Brand.pbobjc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class Brand;
-@class Content;
-@class MediaItem;
-@class Name;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - BrandRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface BrandRoot : GPBRootObject
-@end
-
-#pragma mark - Brand
-
-typedef GPB_ENUM(Brand_FieldNumber) {
-  Brand_FieldNumber_Name = 1,
-  Brand_FieldNumber_Parent = 2,
-  Brand_FieldNumber_Summary = 3,
-  Brand_FieldNumber_MediaArray = 20,
-};
-
-@interface Brand : GPBMessage
-
-/** -- Basic Properties */
-@property(nonatomic, readwrite, strong, null_resettable) Name *name;
-/** Test to see if @c name has been set. */
-@property(nonatomic, readwrite) BOOL hasName;
-
-@property(nonatomic, readwrite, strong, null_resettable) Brand *parent;
-/** Test to see if @c parent has been set. */
-@property(nonatomic, readwrite) BOOL hasParent;
-
-@property(nonatomic, readwrite, strong, null_resettable) Content *summary;
-/** Test to see if @c summary has been set. */
-@property(nonatomic, readwrite) BOOL hasSummary;
-
-/** -- Media */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<MediaItem*> *mediaArray;
-/** The number of items in @c mediaArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger mediaArray_Count;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/Brand.pbobjc.m b/languages/objc/content/Brand.pbobjc.m
deleted file mode 100644
index ea1deae..0000000
--- a/languages/objc/content/Brand.pbobjc.m
+++ /dev/null
@@ -1,127 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Brand.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "content/Brand.pbobjc.h"
- #import "content/Name.pbobjc.h"
- #import "content/Content.pbobjc.h"
- #import "media/MediaItem.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - BrandRoot
-
-@implementation BrandRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - BrandRoot_FileDescriptor
-
-static GPBFileDescriptor *BrandRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Brand
-
-@implementation Brand
-
-@dynamic hasName, name;
-@dynamic hasParent, parent;
-@dynamic hasSummary, summary;
-@dynamic mediaArray, mediaArray_Count;
-
-typedef struct Brand__storage_ {
-  uint32_t _has_storage_[1];
-  Name *name;
-  Brand *parent;
-  Content *summary;
-  NSMutableArray *mediaArray;
-} Brand__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.className = GPBStringifySymbol(Name),
-        .number = Brand_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Brand__storage_, name),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "parent",
-        .dataTypeSpecific.className = GPBStringifySymbol(Brand),
-        .number = Brand_FieldNumber_Parent,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Brand__storage_, parent),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "summary",
-        .dataTypeSpecific.className = GPBStringifySymbol(Content),
-        .number = Brand_FieldNumber_Summary,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(Brand__storage_, summary),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "mediaArray",
-        .dataTypeSpecific.className = GPBStringifySymbol(MediaItem),
-        .number = Brand_FieldNumber_MediaArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(Brand__storage_, mediaArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Brand class]
-                                     rootClass:[BrandRoot class]
-                                          file:BrandRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Brand__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/Content.pbobjc.h b/languages/objc/content/Content.pbobjc.h
deleted file mode 100644
index 19b0b30..0000000
--- a/languages/objc/content/Content.pbobjc.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class Compression;
-GPB_ENUM_FWD_DECLARE(Language);
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum Content_Type
-
-typedef GPB_ENUM(Content_Type) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  Content_Type_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  Content_Type_Text = 0,
-  Content_Type_Markdown = 1,
-  Content_Type_Html = 2,
-};
-
-GPBEnumDescriptor *Content_Type_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL Content_Type_IsValidValue(int32_t value);
-
-#pragma mark - Enum Content_Encoding
-
-typedef GPB_ENUM(Content_Encoding) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  Content_Encoding_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  Content_Encoding_Utf8 = 0,
-};
-
-GPBEnumDescriptor *Content_Encoding_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL Content_Encoding_IsValidValue(int32_t value);
-
-#pragma mark - ContentRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface ContentRoot : GPBRootObject
-@end
-
-#pragma mark - Content
-
-typedef GPB_ENUM(Content_FieldNumber) {
-  Content_FieldNumber_Type = 1,
-  Content_FieldNumber_Encoding = 2,
-  Content_FieldNumber_Content = 3,
-  Content_FieldNumber_Language = 4,
-  Content_FieldNumber_Compression = 5,
-};
-
-@interface Content : GPBMessage
-
-@property(nonatomic, readwrite) Content_Type type;
-
-@property(nonatomic, readwrite) Content_Encoding encoding;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSData *content;
-
-@property(nonatomic, readwrite) enum Language language;
-
-@property(nonatomic, readwrite, strong, null_resettable) Compression *compression;
-/** Test to see if @c compression has been set. */
-@property(nonatomic, readwrite) BOOL hasCompression;
-
-@end
-
-/**
- * Fetches the raw value of a @c Content's @c type property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t Content_Type_RawValue(Content *message);
-/**
- * Sets the raw value of an @c Content's @c type property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetContent_Type_RawValue(Content *message, int32_t value);
-
-/**
- * Fetches the raw value of a @c Content's @c encoding property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t Content_Encoding_RawValue(Content *message);
-/**
- * Sets the raw value of an @c Content's @c encoding property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetContent_Encoding_RawValue(Content *message, int32_t value);
-
-/**
- * Fetches the raw value of a @c Content's @c language property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t Content_Language_RawValue(Content *message);
-/**
- * Sets the raw value of an @c Content's @c language property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetContent_Language_RawValue(Content *message, int32_t value);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/Content.pbobjc.m b/languages/objc/content/Content.pbobjc.m
deleted file mode 100644
index 4eebb11..0000000
--- a/languages/objc/content/Content.pbobjc.m
+++ /dev/null
@@ -1,241 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Content.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "content/Content.pbobjc.h"
- #import "base/Language.pbobjc.h"
- #import "base/Compression.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - ContentRoot
-
-@implementation ContentRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - ContentRoot_FileDescriptor
-
-static GPBFileDescriptor *ContentRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Content
-
-@implementation Content
-
-@dynamic type;
-@dynamic encoding;
-@dynamic content;
-@dynamic language;
-@dynamic hasCompression, compression;
-
-typedef struct Content__storage_ {
-  uint32_t _has_storage_[1];
-  Content_Type type;
-  Content_Encoding encoding;
-  Language language;
-  NSData *content;
-  Compression *compression;
-} Content__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "type",
-        .dataTypeSpecific.enumDescFunc = Content_Type_EnumDescriptor,
-        .number = Content_FieldNumber_Type,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Content__storage_, type),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "encoding",
-        .dataTypeSpecific.enumDescFunc = Content_Encoding_EnumDescriptor,
-        .number = Content_FieldNumber_Encoding,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Content__storage_, encoding),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "content",
-        .dataTypeSpecific.className = NULL,
-        .number = Content_FieldNumber_Content,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(Content__storage_, content),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBytes,
-      },
-      {
-        .name = "language",
-        .dataTypeSpecific.enumDescFunc = Language_EnumDescriptor,
-        .number = Content_FieldNumber_Language,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(Content__storage_, language),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "compression",
-        .dataTypeSpecific.className = GPBStringifySymbol(Compression),
-        .number = Content_FieldNumber_Compression,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(Content__storage_, compression),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Content class]
-                                     rootClass:[ContentRoot class]
-                                          file:ContentRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Content__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t Content_Type_RawValue(Content *message) {
-  GPBDescriptor *descriptor = [Content descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Content_FieldNumber_Type];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetContent_Type_RawValue(Content *message, int32_t value) {
-  GPBDescriptor *descriptor = [Content descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Content_FieldNumber_Type];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-int32_t Content_Encoding_RawValue(Content *message) {
-  GPBDescriptor *descriptor = [Content descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Content_FieldNumber_Encoding];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetContent_Encoding_RawValue(Content *message, int32_t value) {
-  GPBDescriptor *descriptor = [Content descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Content_FieldNumber_Encoding];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-int32_t Content_Language_RawValue(Content *message) {
-  GPBDescriptor *descriptor = [Content descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Content_FieldNumber_Language];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetContent_Language_RawValue(Content *message, int32_t value) {
-  GPBDescriptor *descriptor = [Content descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:Content_FieldNumber_Language];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - Enum Content_Type
-
-GPBEnumDescriptor *Content_Type_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Text\000Markdown\000Html\000";
-    static const int32_t values[] = {
-        Content_Type_Text,
-        Content_Type_Markdown,
-        Content_Type_Html,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(Content_Type)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:Content_Type_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL Content_Type_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case Content_Type_Text:
-    case Content_Type_Markdown:
-    case Content_Type_Html:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - Enum Content_Encoding
-
-GPBEnumDescriptor *Content_Encoding_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Utf8\000";
-    static const int32_t values[] = {
-        Content_Encoding_Utf8,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(Content_Encoding)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:Content_Encoding_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL Content_Encoding_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case Content_Encoding_Utf8:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/MaterialsData.pbobjc.h b/languages/objc/content/MaterialsData.pbobjc.h
deleted file mode 100644
index 6a89107..0000000
--- a/languages/objc/content/MaterialsData.pbobjc.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class Genetics;
-GPB_ENUM_FWD_DECLARE(Grow);
-GPB_ENUM_FWD_DECLARE(Species);
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - MaterialsDataRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface MaterialsDataRoot : GPBRootObject
-@end
-
-#pragma mark - MaterialsData
-
-typedef GPB_ENUM(MaterialsData_FieldNumber) {
-  MaterialsData_FieldNumber_IngredientsArray = 1,
-  MaterialsData_FieldNumber_Grow = 2,
-  MaterialsData_FieldNumber_Species = 3,
-  MaterialsData_FieldNumber_Genetics = 4,
-};
-
-@interface MaterialsData : GPBMessage
-
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *ingredientsArray;
-/** The number of items in @c ingredientsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger ingredientsArray_Count;
-
-@property(nonatomic, readwrite) enum Grow grow;
-
-@property(nonatomic, readwrite) enum Species species;
-
-@property(nonatomic, readwrite, strong, null_resettable) Genetics *genetics;
-/** Test to see if @c genetics has been set. */
-@property(nonatomic, readwrite) BOOL hasGenetics;
-
-@end
-
-/**
- * Fetches the raw value of a @c MaterialsData's @c grow property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t MaterialsData_Grow_RawValue(MaterialsData *message);
-/**
- * Sets the raw value of an @c MaterialsData's @c grow property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetMaterialsData_Grow_RawValue(MaterialsData *message, int32_t value);
-
-/**
- * Fetches the raw value of a @c MaterialsData's @c species property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t MaterialsData_Species_RawValue(MaterialsData *message);
-/**
- * Sets the raw value of an @c MaterialsData's @c species property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetMaterialsData_Species_RawValue(MaterialsData *message, int32_t value);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/MaterialsData.pbobjc.m b/languages/objc/content/MaterialsData.pbobjc.m
deleted file mode 100644
index 9f96036..0000000
--- a/languages/objc/content/MaterialsData.pbobjc.m
+++ /dev/null
@@ -1,151 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/MaterialsData.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "content/MaterialsData.pbobjc.h"
- #import "structs/Grow.pbobjc.h"
- #import "structs/Species.pbobjc.h"
- #import "structs/Genetics.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - MaterialsDataRoot
-
-@implementation MaterialsDataRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - MaterialsDataRoot_FileDescriptor
-
-static GPBFileDescriptor *MaterialsDataRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - MaterialsData
-
-@implementation MaterialsData
-
-@dynamic ingredientsArray, ingredientsArray_Count;
-@dynamic grow;
-@dynamic species;
-@dynamic hasGenetics, genetics;
-
-typedef struct MaterialsData__storage_ {
-  uint32_t _has_storage_[1];
-  Grow grow;
-  Species species;
-  NSMutableArray *ingredientsArray;
-  Genetics *genetics;
-} MaterialsData__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "ingredientsArray",
-        .dataTypeSpecific.className = NULL,
-        .number = MaterialsData_FieldNumber_IngredientsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(MaterialsData__storage_, ingredientsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "grow",
-        .dataTypeSpecific.enumDescFunc = Grow_EnumDescriptor,
-        .number = MaterialsData_FieldNumber_Grow,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(MaterialsData__storage_, grow),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "species",
-        .dataTypeSpecific.enumDescFunc = Species_EnumDescriptor,
-        .number = MaterialsData_FieldNumber_Species,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(MaterialsData__storage_, species),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "genetics",
-        .dataTypeSpecific.className = GPBStringifySymbol(Genetics),
-        .number = MaterialsData_FieldNumber_Genetics,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(MaterialsData__storage_, genetics),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[MaterialsData class]
-                                     rootClass:[MaterialsDataRoot class]
-                                          file:MaterialsDataRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(MaterialsData__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t MaterialsData_Grow_RawValue(MaterialsData *message) {
-  GPBDescriptor *descriptor = [MaterialsData descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:MaterialsData_FieldNumber_Grow];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetMaterialsData_Grow_RawValue(MaterialsData *message, int32_t value) {
-  GPBDescriptor *descriptor = [MaterialsData descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:MaterialsData_FieldNumber_Grow];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-int32_t MaterialsData_Species_RawValue(MaterialsData *message) {
-  GPBDescriptor *descriptor = [MaterialsData descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:MaterialsData_FieldNumber_Species];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetMaterialsData_Species_RawValue(MaterialsData *message, int32_t value) {
-  GPBDescriptor *descriptor = [MaterialsData descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:MaterialsData_FieldNumber_Species];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/Name.pbobjc.h b/languages/objc/content/Name.pbobjc.h
deleted file mode 100644
index ce00bf0..0000000
--- a/languages/objc/content/Name.pbobjc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - NameRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface NameRoot : GPBRootObject
-@end
-
-#pragma mark - Name
-
-typedef GPB_ENUM(Name_FieldNumber) {
-  Name_FieldNumber_Primary = 1,
-  Name_FieldNumber_Display = 2,
-};
-
-@interface Name : GPBMessage
-
-/** basic name */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *primary;
-
-/** display name */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *display;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/Name.pbobjc.m b/languages/objc/content/Name.pbobjc.m
deleted file mode 100644
index 95b09a7..0000000
--- a/languages/objc/content/Name.pbobjc.m
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/Name.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "content/Name.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - NameRoot
-
-@implementation NameRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - NameRoot_FileDescriptor
-
-static GPBFileDescriptor *NameRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Name
-
-@implementation Name
-
-@dynamic primary;
-@dynamic display;
-
-typedef struct Name__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *primary;
-  NSString *display;
-} Name__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "primary",
-        .dataTypeSpecific.className = NULL,
-        .number = Name_FieldNumber_Primary,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Name__storage_, primary),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "display",
-        .dataTypeSpecific.className = NULL,
-        .number = Name_FieldNumber_Display,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Name__storage_, display),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Name class]
-                                     rootClass:[NameRoot class]
-                                          file:NameRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Name__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/ProductContent.pbobjc.h b/languages/objc/content/ProductContent.pbobjc.h
deleted file mode 100644
index 2bddeb1..0000000
--- a/languages/objc/content/ProductContent.pbobjc.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class Brand;
-@class Content;
-@class MediaItem;
-@class Name;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - ProductContentRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface ProductContentRoot : GPBRootObject
-@end
-
-#pragma mark - ProductContent
-
-typedef GPB_ENUM(ProductContent_FieldNumber) {
-  ProductContent_FieldNumber_Name = 1,
-  ProductContent_FieldNumber_Summary = 2,
-  ProductContent_FieldNumber_Brand = 3,
-  ProductContent_FieldNumber_MediaArray = 20,
-  ProductContent_FieldNumber_Usage = 30,
-  ProductContent_FieldNumber_Dosage = 31,
-  ProductContent_FieldNumber_Advice = 32,
-};
-
-@interface ProductContent : GPBMessage
-
-/** -- Basic Properties */
-@property(nonatomic, readwrite, strong, null_resettable) Name *name;
-/** Test to see if @c name has been set. */
-@property(nonatomic, readwrite) BOOL hasName;
-
-/** narrative summary */
-@property(nonatomic, readwrite, strong, null_resettable) Content *summary;
-/** Test to see if @c summary has been set. */
-@property(nonatomic, readwrite) BOOL hasSummary;
-
-/** product's brand */
-@property(nonatomic, readwrite, strong, null_resettable) Brand *brand;
-/** Test to see if @c brand has been set. */
-@property(nonatomic, readwrite) BOOL hasBrand;
-
-/** -- Media */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<MediaItem*> *mediaArray;
-/** The number of items in @c mediaArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger mediaArray_Count;
-
-/** -- Extended Attributes */
-@property(nonatomic, readwrite, strong, null_resettable) Content *usage;
-/** Test to see if @c usage has been set. */
-@property(nonatomic, readwrite) BOOL hasUsage;
-
-/** dosage advice */
-@property(nonatomic, readwrite, strong, null_resettable) Content *dosage;
-/** Test to see if @c dosage has been set. */
-@property(nonatomic, readwrite) BOOL hasDosage;
-
-/** internal advice */
-@property(nonatomic, readwrite, strong, null_resettable) Content *advice;
-/** Test to see if @c advice has been set. */
-@property(nonatomic, readwrite) BOOL hasAdvice;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/content/ProductContent.pbobjc.m b/languages/objc/content/ProductContent.pbobjc.m
deleted file mode 100644
index 2b5be43..0000000
--- a/languages/objc/content/ProductContent.pbobjc.m
+++ /dev/null
@@ -1,161 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: content/ProductContent.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "content/ProductContent.pbobjc.h"
- #import "content/Name.pbobjc.h"
- #import "content/Content.pbobjc.h"
- #import "content/Brand.pbobjc.h"
- #import "media/MediaItem.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - ProductContentRoot
-
-@implementation ProductContentRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - ProductContentRoot_FileDescriptor
-
-static GPBFileDescriptor *ProductContentRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - ProductContent
-
-@implementation ProductContent
-
-@dynamic hasName, name;
-@dynamic hasSummary, summary;
-@dynamic hasBrand, brand;
-@dynamic mediaArray, mediaArray_Count;
-@dynamic hasUsage, usage;
-@dynamic hasDosage, dosage;
-@dynamic hasAdvice, advice;
-
-typedef struct ProductContent__storage_ {
-  uint32_t _has_storage_[1];
-  Name *name;
-  Content *summary;
-  Brand *brand;
-  NSMutableArray *mediaArray;
-  Content *usage;
-  Content *dosage;
-  Content *advice;
-} ProductContent__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.className = GPBStringifySymbol(Name),
-        .number = ProductContent_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, name),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "summary",
-        .dataTypeSpecific.className = GPBStringifySymbol(Content),
-        .number = ProductContent_FieldNumber_Summary,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, summary),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "brand",
-        .dataTypeSpecific.className = GPBStringifySymbol(Brand),
-        .number = ProductContent_FieldNumber_Brand,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, brand),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "mediaArray",
-        .dataTypeSpecific.className = GPBStringifySymbol(MediaItem),
-        .number = ProductContent_FieldNumber_MediaArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, mediaArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "usage",
-        .dataTypeSpecific.className = GPBStringifySymbol(Content),
-        .number = ProductContent_FieldNumber_Usage,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, usage),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "dosage",
-        .dataTypeSpecific.className = GPBStringifySymbol(Content),
-        .number = ProductContent_FieldNumber_Dosage,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, dosage),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "advice",
-        .dataTypeSpecific.className = GPBStringifySymbol(Content),
-        .number = ProductContent_FieldNumber_Advice,
-        .hasIndex = 5,
-        .offset = (uint32_t)offsetof(ProductContent__storage_, advice),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ProductContent class]
-                                     rootClass:[ProductContentRoot class]
-                                          file:ProductContentRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ProductContent__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/geo/Address.pbobjc.h b/languages/objc/geo/Address.pbobjc.h
deleted file mode 100644
index 3e4ae83..0000000
--- a/languages/objc/geo/Address.pbobjc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - AddressRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface AddressRoot : GPBRootObject
-@end
-
-#pragma mark - Address
-
-typedef GPB_ENUM(Address_FieldNumber) {
-  Address_FieldNumber_FirstLine = 1,
-  Address_FieldNumber_SecondLine = 2,
-  Address_FieldNumber_City = 3,
-  Address_FieldNumber_State = 4,
-  Address_FieldNumber_Zipcode = 5,
-  Address_FieldNumber_Country = 6,
-};
-
-@interface Address : GPBMessage
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *firstLine;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *secondLine;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *city;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *state;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *zipcode;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *country;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/geo/Address.pbobjc.m b/languages/objc/geo/Address.pbobjc.m
deleted file mode 100644
index a6b0471..0000000
--- a/languages/objc/geo/Address.pbobjc.m
+++ /dev/null
@@ -1,146 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: geo/Address.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "geo/Address.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - AddressRoot
-
-@implementation AddressRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - AddressRoot_FileDescriptor
-
-static GPBFileDescriptor *AddressRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Address
-
-@implementation Address
-
-@dynamic firstLine;
-@dynamic secondLine;
-@dynamic city;
-@dynamic state;
-@dynamic zipcode;
-@dynamic country;
-
-typedef struct Address__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *firstLine;
-  NSString *secondLine;
-  NSString *city;
-  NSString *state;
-  NSString *zipcode;
-  NSString *country;
-} Address__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "firstLine",
-        .dataTypeSpecific.className = NULL,
-        .number = Address_FieldNumber_FirstLine,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Address__storage_, firstLine),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "secondLine",
-        .dataTypeSpecific.className = NULL,
-        .number = Address_FieldNumber_SecondLine,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Address__storage_, secondLine),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "city",
-        .dataTypeSpecific.className = NULL,
-        .number = Address_FieldNumber_City,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(Address__storage_, city),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "state",
-        .dataTypeSpecific.className = NULL,
-        .number = Address_FieldNumber_State,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(Address__storage_, state),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "zipcode",
-        .dataTypeSpecific.className = NULL,
-        .number = Address_FieldNumber_Zipcode,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(Address__storage_, zipcode),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "country",
-        .dataTypeSpecific.className = NULL,
-        .number = Address_FieldNumber_Country,
-        .hasIndex = 5,
-        .offset = (uint32_t)offsetof(Address__storage_, country),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Address class]
-                                     rootClass:[AddressRoot class]
-                                          file:AddressRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Address__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/media/MediaItem.pbobjc.h b/languages/objc/media/MediaItem.pbobjc.h
deleted file mode 100644
index c01038a..0000000
--- a/languages/objc/media/MediaItem.pbobjc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class MediaKey;
-@class MediaType;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - MediaItemRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface MediaItemRoot : GPBRootObject
-@end
-
-#pragma mark - MediaItem
-
-typedef GPB_ENUM(MediaItem_FieldNumber) {
-  MediaItem_FieldNumber_Key = 1,
-  MediaItem_FieldNumber_Type = 2,
-  MediaItem_FieldNumber_Name = 3,
-};
-
-@interface MediaItem : GPBMessage
-
-@property(nonatomic, readwrite, strong, null_resettable) MediaKey *key;
-/** Test to see if @c key has been set. */
-@property(nonatomic, readwrite) BOOL hasKey;
-
-@property(nonatomic, readwrite, strong, null_resettable) MediaType *type;
-/** Test to see if @c type has been set. */
-@property(nonatomic, readwrite) BOOL hasType;
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/media/MediaItem.pbobjc.m b/languages/objc/media/MediaItem.pbobjc.m
deleted file mode 100644
index 10a40c3..0000000
--- a/languages/objc/media/MediaItem.pbobjc.m
+++ /dev/null
@@ -1,115 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaItem.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "media/MediaItem.pbobjc.h"
- #import "media/MediaKey.pbobjc.h"
- #import "media/MediaType.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - MediaItemRoot
-
-@implementation MediaItemRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - MediaItemRoot_FileDescriptor
-
-static GPBFileDescriptor *MediaItemRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - MediaItem
-
-@implementation MediaItem
-
-@dynamic hasKey, key;
-@dynamic hasType, type;
-@dynamic name;
-
-typedef struct MediaItem__storage_ {
-  uint32_t _has_storage_[1];
-  MediaKey *key;
-  MediaType *type;
-  NSString *name;
-} MediaItem__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "key",
-        .dataTypeSpecific.className = GPBStringifySymbol(MediaKey),
-        .number = MediaItem_FieldNumber_Key,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(MediaItem__storage_, key),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "type",
-        .dataTypeSpecific.className = GPBStringifySymbol(MediaType),
-        .number = MediaItem_FieldNumber_Type,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(MediaItem__storage_, type),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "name",
-        .dataTypeSpecific.className = NULL,
-        .number = MediaItem_FieldNumber_Name,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(MediaItem__storage_, name),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[MediaItem class]
-                                     rootClass:[MediaItemRoot class]
-                                          file:MediaItemRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(MediaItem__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/media/MediaKey.pbobjc.h b/languages/objc/media/MediaKey.pbobjc.h
deleted file mode 100644
index 0e34b06..0000000
--- a/languages/objc/media/MediaKey.pbobjc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - MediaKeyRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface MediaKeyRoot : GPBRootObject
-@end
-
-#pragma mark - MediaKey
-
-typedef GPB_ENUM(MediaKey_FieldNumber) {
-  MediaKey_FieldNumber_Id_p = 1,
-};
-
-@interface MediaKey : GPBMessage
-
-@property(nonatomic, readwrite, copy, null_resettable) NSString *id_p;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/media/MediaKey.pbobjc.m b/languages/objc/media/MediaKey.pbobjc.m
deleted file mode 100644
index e37017e..0000000
--- a/languages/objc/media/MediaKey.pbobjc.m
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaKey.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "media/MediaKey.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - MediaKeyRoot
-
-@implementation MediaKeyRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - MediaKeyRoot_FileDescriptor
-
-static GPBFileDescriptor *MediaKeyRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - MediaKey
-
-@implementation MediaKey
-
-@dynamic id_p;
-
-typedef struct MediaKey__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *id_p;
-} MediaKey__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "id_p",
-        .dataTypeSpecific.className = NULL,
-        .number = MediaKey_FieldNumber_Id_p,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(MediaKey__storage_, id_p),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[MediaKey class]
-                                     rootClass:[MediaKeyRoot class]
-                                          file:MediaKeyRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(MediaKey__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/media/MediaType.pbobjc.h b/languages/objc/media/MediaType.pbobjc.h
deleted file mode 100644
index 192631b..0000000
--- a/languages/objc/media/MediaType.pbobjc.h
+++ /dev/null
@@ -1,275 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class DocumentType;
-@class ImageType;
-@class VideoType;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum MediaType_Kind
-
-typedef GPB_ENUM(MediaType_Kind) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  MediaType_Kind_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  MediaType_Kind_Link = 0,
-  MediaType_Kind_Image = 1,
-  MediaType_Kind_Document = 2,
-  MediaType_Kind_Video = 3,
-};
-
-GPBEnumDescriptor *MediaType_Kind_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL MediaType_Kind_IsValidValue(int32_t value);
-
-#pragma mark - Enum ImageType_ImageKind
-
-typedef GPB_ENUM(ImageType_ImageKind) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  ImageType_ImageKind_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  ImageType_ImageKind_Png = 0,
-  ImageType_ImageKind_Jpg = 1,
-  ImageType_ImageKind_Gif = 2,
-  ImageType_ImageKind_Svg = 3,
-  ImageType_ImageKind_Webp = 4,
-};
-
-GPBEnumDescriptor *ImageType_ImageKind_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL ImageType_ImageKind_IsValidValue(int32_t value);
-
-#pragma mark - Enum DocumentType_DocumentKind
-
-typedef GPB_ENUM(DocumentType_DocumentKind) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  DocumentType_DocumentKind_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  DocumentType_DocumentKind_Txt = 0,
-  DocumentType_DocumentKind_Html = 1,
-  DocumentType_DocumentKind_Pdf = 2,
-  DocumentType_DocumentKind_Markdown = 3,
-};
-
-GPBEnumDescriptor *DocumentType_DocumentKind_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL DocumentType_DocumentKind_IsValidValue(int32_t value);
-
-#pragma mark - Enum VideoType_VideoKind
-
-typedef GPB_ENUM(VideoType_VideoKind) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  VideoType_VideoKind_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  VideoType_VideoKind_Mp4 = 0,
-  VideoType_VideoKind_Flv = 1,
-  VideoType_VideoKind_Hls = 2,
-};
-
-GPBEnumDescriptor *VideoType_VideoKind_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL VideoType_VideoKind_IsValidValue(int32_t value);
-
-#pragma mark - MediaTypeRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface MediaTypeRoot : GPBRootObject
-@end
-
-#pragma mark - MediaType
-
-typedef GPB_ENUM(MediaType_FieldNumber) {
-  MediaType_FieldNumber_Kind = 1,
-  MediaType_FieldNumber_ImageType = 101,
-  MediaType_FieldNumber_DocumentType = 201,
-  MediaType_FieldNumber_VideoType = 301,
-};
-
-/**
- * -- Media Type: Top-level -- //
- **/
-@interface MediaType : GPBMessage
-
-@property(nonatomic, readwrite) MediaType_Kind kind;
-
-@property(nonatomic, readwrite, strong, null_resettable) ImageType *imageType;
-/** Test to see if @c imageType has been set. */
-@property(nonatomic, readwrite) BOOL hasImageType;
-
-@property(nonatomic, readwrite, strong, null_resettable) DocumentType *documentType;
-/** Test to see if @c documentType has been set. */
-@property(nonatomic, readwrite) BOOL hasDocumentType;
-
-@property(nonatomic, readwrite, strong, null_resettable) VideoType *videoType;
-/** Test to see if @c videoType has been set. */
-@property(nonatomic, readwrite) BOOL hasVideoType;
-
-@end
-
-/**
- * Fetches the raw value of a @c MediaType's @c kind property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t MediaType_Kind_RawValue(MediaType *message);
-/**
- * Sets the raw value of an @c MediaType's @c kind property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetMediaType_Kind_RawValue(MediaType *message, int32_t value);
-
-#pragma mark - ImageType
-
-typedef GPB_ENUM(ImageType_FieldNumber) {
-  ImageType_FieldNumber_Kind = 1,
-};
-
-/**
- * -- Media Type: Images -- //
- **/
-@interface ImageType : GPBMessage
-
-@property(nonatomic, readwrite) ImageType_ImageKind kind;
-
-@end
-
-/**
- * Fetches the raw value of a @c ImageType's @c kind property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t ImageType_Kind_RawValue(ImageType *message);
-/**
- * Sets the raw value of an @c ImageType's @c kind property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetImageType_Kind_RawValue(ImageType *message, int32_t value);
-
-#pragma mark - DocumentType
-
-typedef GPB_ENUM(DocumentType_FieldNumber) {
-  DocumentType_FieldNumber_Kind = 1,
-  DocumentType_FieldNumber_Compressed = 2,
-};
-
-/**
- * -- Media Type: Document -- //
- **/
-@interface DocumentType : GPBMessage
-
-@property(nonatomic, readwrite) DocumentType_DocumentKind kind;
-
-@property(nonatomic, readwrite) BOOL compressed;
-
-@end
-
-/**
- * Fetches the raw value of a @c DocumentType's @c kind property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t DocumentType_Kind_RawValue(DocumentType *message);
-/**
- * Sets the raw value of an @c DocumentType's @c kind property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetDocumentType_Kind_RawValue(DocumentType *message, int32_t value);
-
-#pragma mark - VideoType
-
-typedef GPB_ENUM(VideoType_FieldNumber) {
-  VideoType_FieldNumber_Kind = 1,
-};
-
-/**
- * -- Media Type: Video -- //
- **/
-@interface VideoType : GPBMessage
-
-@property(nonatomic, readwrite) VideoType_VideoKind kind;
-
-@end
-
-/**
- * Fetches the raw value of a @c VideoType's @c kind property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t VideoType_Kind_RawValue(VideoType *message);
-/**
- * Sets the raw value of an @c VideoType's @c kind property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetVideoType_Kind_RawValue(VideoType *message, int32_t value);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/media/MediaType.pbobjc.m b/languages/objc/media/MediaType.pbobjc.m
deleted file mode 100644
index 606bf77..0000000
--- a/languages/objc/media/MediaType.pbobjc.m
+++ /dev/null
@@ -1,463 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: media/MediaType.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "media/MediaType.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - MediaTypeRoot
-
-@implementation MediaTypeRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - MediaTypeRoot_FileDescriptor
-
-static GPBFileDescriptor *MediaTypeRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - MediaType
-
-@implementation MediaType
-
-@dynamic kind;
-@dynamic hasImageType, imageType;
-@dynamic hasDocumentType, documentType;
-@dynamic hasVideoType, videoType;
-
-typedef struct MediaType__storage_ {
-  uint32_t _has_storage_[1];
-  MediaType_Kind kind;
-  ImageType *imageType;
-  DocumentType *documentType;
-  VideoType *videoType;
-} MediaType__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "kind",
-        .dataTypeSpecific.enumDescFunc = MediaType_Kind_EnumDescriptor,
-        .number = MediaType_FieldNumber_Kind,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(MediaType__storage_, kind),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "imageType",
-        .dataTypeSpecific.className = GPBStringifySymbol(ImageType),
-        .number = MediaType_FieldNumber_ImageType,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(MediaType__storage_, imageType),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "documentType",
-        .dataTypeSpecific.className = GPBStringifySymbol(DocumentType),
-        .number = MediaType_FieldNumber_DocumentType,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(MediaType__storage_, documentType),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "videoType",
-        .dataTypeSpecific.className = GPBStringifySymbol(VideoType),
-        .number = MediaType_FieldNumber_VideoType,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(MediaType__storage_, videoType),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[MediaType class]
-                                     rootClass:[MediaTypeRoot class]
-                                          file:MediaTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(MediaType__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t MediaType_Kind_RawValue(MediaType *message) {
-  GPBDescriptor *descriptor = [MediaType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:MediaType_FieldNumber_Kind];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetMediaType_Kind_RawValue(MediaType *message, int32_t value) {
-  GPBDescriptor *descriptor = [MediaType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:MediaType_FieldNumber_Kind];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - Enum MediaType_Kind
-
-GPBEnumDescriptor *MediaType_Kind_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Link\000Image\000Document\000Video\000";
-    static const int32_t values[] = {
-        MediaType_Kind_Link,
-        MediaType_Kind_Image,
-        MediaType_Kind_Document,
-        MediaType_Kind_Video,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(MediaType_Kind)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:MediaType_Kind_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL MediaType_Kind_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case MediaType_Kind_Link:
-    case MediaType_Kind_Image:
-    case MediaType_Kind_Document:
-    case MediaType_Kind_Video:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - ImageType
-
-@implementation ImageType
-
-@dynamic kind;
-
-typedef struct ImageType__storage_ {
-  uint32_t _has_storage_[1];
-  ImageType_ImageKind kind;
-} ImageType__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "kind",
-        .dataTypeSpecific.enumDescFunc = ImageType_ImageKind_EnumDescriptor,
-        .number = ImageType_FieldNumber_Kind,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(ImageType__storage_, kind),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ImageType class]
-                                     rootClass:[MediaTypeRoot class]
-                                          file:MediaTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ImageType__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t ImageType_Kind_RawValue(ImageType *message) {
-  GPBDescriptor *descriptor = [ImageType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:ImageType_FieldNumber_Kind];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetImageType_Kind_RawValue(ImageType *message, int32_t value) {
-  GPBDescriptor *descriptor = [ImageType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:ImageType_FieldNumber_Kind];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - Enum ImageType_ImageKind
-
-GPBEnumDescriptor *ImageType_ImageKind_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Png\000Jpg\000Gif\000Svg\000Webp\000";
-    static const int32_t values[] = {
-        ImageType_ImageKind_Png,
-        ImageType_ImageKind_Jpg,
-        ImageType_ImageKind_Gif,
-        ImageType_ImageKind_Svg,
-        ImageType_ImageKind_Webp,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(ImageType_ImageKind)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:ImageType_ImageKind_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL ImageType_ImageKind_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case ImageType_ImageKind_Png:
-    case ImageType_ImageKind_Jpg:
-    case ImageType_ImageKind_Gif:
-    case ImageType_ImageKind_Svg:
-    case ImageType_ImageKind_Webp:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - DocumentType
-
-@implementation DocumentType
-
-@dynamic kind;
-@dynamic compressed;
-
-typedef struct DocumentType__storage_ {
-  uint32_t _has_storage_[1];
-  DocumentType_DocumentKind kind;
-} DocumentType__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "kind",
-        .dataTypeSpecific.enumDescFunc = DocumentType_DocumentKind_EnumDescriptor,
-        .number = DocumentType_FieldNumber_Kind,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(DocumentType__storage_, kind),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "compressed",
-        .dataTypeSpecific.className = NULL,
-        .number = DocumentType_FieldNumber_Compressed,
-        .hasIndex = 1,
-        .offset = 2,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[DocumentType class]
-                                     rootClass:[MediaTypeRoot class]
-                                          file:MediaTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(DocumentType__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t DocumentType_Kind_RawValue(DocumentType *message) {
-  GPBDescriptor *descriptor = [DocumentType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:DocumentType_FieldNumber_Kind];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetDocumentType_Kind_RawValue(DocumentType *message, int32_t value) {
-  GPBDescriptor *descriptor = [DocumentType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:DocumentType_FieldNumber_Kind];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - Enum DocumentType_DocumentKind
-
-GPBEnumDescriptor *DocumentType_DocumentKind_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Txt\000Html\000Pdf\000Markdown\000";
-    static const int32_t values[] = {
-        DocumentType_DocumentKind_Txt,
-        DocumentType_DocumentKind_Html,
-        DocumentType_DocumentKind_Pdf,
-        DocumentType_DocumentKind_Markdown,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(DocumentType_DocumentKind)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:DocumentType_DocumentKind_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL DocumentType_DocumentKind_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case DocumentType_DocumentKind_Txt:
-    case DocumentType_DocumentKind_Html:
-    case DocumentType_DocumentKind_Pdf:
-    case DocumentType_DocumentKind_Markdown:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - VideoType
-
-@implementation VideoType
-
-@dynamic kind;
-
-typedef struct VideoType__storage_ {
-  uint32_t _has_storage_[1];
-  VideoType_VideoKind kind;
-} VideoType__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "kind",
-        .dataTypeSpecific.enumDescFunc = VideoType_VideoKind_EnumDescriptor,
-        .number = VideoType_FieldNumber_Kind,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(VideoType__storage_, kind),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[VideoType class]
-                                     rootClass:[MediaTypeRoot class]
-                                          file:MediaTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(VideoType__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t VideoType_Kind_RawValue(VideoType *message) {
-  GPBDescriptor *descriptor = [VideoType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:VideoType_FieldNumber_Kind];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetVideoType_Kind_RawValue(VideoType *message, int32_t value) {
-  GPBDescriptor *descriptor = [VideoType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:VideoType_FieldNumber_Kind];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - Enum VideoType_VideoKind
-
-GPBEnumDescriptor *VideoType_VideoKind_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Mp4\000Flv\000Hls\000";
-    static const int32_t values[] = {
-        VideoType_VideoKind_Mp4,
-        VideoType_VideoKind_Flv,
-        VideoType_VideoKind_Hls,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(VideoType_VideoKind)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:VideoType_VideoKind_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL VideoType_VideoKind_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case VideoType_VideoKind_Mp4:
-    case VideoType_VideoKind_Flv:
-    case VideoType_VideoKind_Hls:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/products/Flower.pbobjc.h b/languages/objc/products/Flower.pbobjc.h
deleted file mode 100644
index bbfd1cf..0000000
--- a/languages/objc/products/Flower.pbobjc.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class FlagsDescriptor;
-@class MaterialsData;
-@class ProductContent;
-@class ProductKey;
-@class ProductPricing;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - FlowerRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface FlowerRoot : GPBRootObject
-@end
-
-#pragma mark - Flower
-
-typedef GPB_ENUM(Flower_FieldNumber) {
-  Flower_FieldNumber_Key = 1,
-  Flower_FieldNumber_ProductData = 20,
-  Flower_FieldNumber_MaterialData = 21,
-  Flower_FieldNumber_Flags = 22,
-  Flower_FieldNumber_Pricing = 23,
-};
-
-@interface Flower : GPBMessage
-
-/** -- Object Key */
-@property(nonatomic, readwrite, strong, null_resettable) ProductKey *key;
-/** Test to see if @c key has been set. */
-@property(nonatomic, readwrite) BOOL hasKey;
-
-/** -- Basic Product & Materials Data */
-@property(nonatomic, readwrite, strong, null_resettable) ProductContent *productData;
-/** Test to see if @c productData has been set. */
-@property(nonatomic, readwrite) BOOL hasProductData;
-
-@property(nonatomic, readwrite, strong, null_resettable) MaterialsData *materialData;
-/** Test to see if @c materialData has been set. */
-@property(nonatomic, readwrite) BOOL hasMaterialData;
-
-/** -- Flags and Pricing */
-@property(nonatomic, readwrite, strong, null_resettable) FlagsDescriptor *flags;
-/** Test to see if @c flags has been set. */
-@property(nonatomic, readwrite) BOOL hasFlags;
-
-@property(nonatomic, readwrite, strong, null_resettable) ProductPricing *pricing;
-/** Test to see if @c pricing has been set. */
-@property(nonatomic, readwrite) BOOL hasPricing;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/products/Flower.pbobjc.m b/languages/objc/products/Flower.pbobjc.m
deleted file mode 100644
index e8cb06b..0000000
--- a/languages/objc/products/Flower.pbobjc.m
+++ /dev/null
@@ -1,140 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: products/Flower.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "products/Flower.pbobjc.h"
- #import "base/ProductKey.pbobjc.h"
- #import "content/MaterialsData.pbobjc.h"
- #import "content/ProductContent.pbobjc.h"
- #import "structs/FlagsDescriptor.pbobjc.h"
- #import "structs/pricing/PricingDescriptor.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - FlowerRoot
-
-@implementation FlowerRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - FlowerRoot_FileDescriptor
-
-static GPBFileDescriptor *FlowerRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Flower
-
-@implementation Flower
-
-@dynamic hasKey, key;
-@dynamic hasProductData, productData;
-@dynamic hasMaterialData, materialData;
-@dynamic hasFlags, flags;
-@dynamic hasPricing, pricing;
-
-typedef struct Flower__storage_ {
-  uint32_t _has_storage_[1];
-  ProductKey *key;
-  ProductContent *productData;
-  MaterialsData *materialData;
-  FlagsDescriptor *flags;
-  ProductPricing *pricing;
-} Flower__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "key",
-        .dataTypeSpecific.className = GPBStringifySymbol(ProductKey),
-        .number = Flower_FieldNumber_Key,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Flower__storage_, key),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "productData",
-        .dataTypeSpecific.className = GPBStringifySymbol(ProductContent),
-        .number = Flower_FieldNumber_ProductData,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Flower__storage_, productData),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "materialData",
-        .dataTypeSpecific.className = GPBStringifySymbol(MaterialsData),
-        .number = Flower_FieldNumber_MaterialData,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(Flower__storage_, materialData),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "flags",
-        .dataTypeSpecific.className = GPBStringifySymbol(FlagsDescriptor),
-        .number = Flower_FieldNumber_Flags,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(Flower__storage_, flags),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "pricing",
-        .dataTypeSpecific.className = GPBStringifySymbol(ProductPricing),
-        .number = Flower_FieldNumber_Pricing,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(Flower__storage_, pricing),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Flower class]
-                                     rootClass:[FlowerRoot class]
-                                          file:FlowerRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Flower__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/FlagsDescriptor.pbobjc.h b/languages/objc/structs/FlagsDescriptor.pbobjc.h
deleted file mode 100644
index a1135c6..0000000
--- a/languages/objc/structs/FlagsDescriptor.pbobjc.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class ProductFlagValue;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum ProductFlag
-
-typedef GPB_ENUM(ProductFlag) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  ProductFlag_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  ProductFlag_Visible = 0,
-  ProductFlag_Premium = 1,
-  ProductFlag_Featured = 2,
-  ProductFlag_Lastchance = 3,
-  ProductFlag_Inhouse = 4,
-};
-
-GPBEnumDescriptor *ProductFlag_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL ProductFlag_IsValidValue(int32_t value);
-
-#pragma mark - FlagsDescriptorRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface FlagsDescriptorRoot : GPBRootObject
-@end
-
-#pragma mark - ProductFlagValue
-
-typedef GPB_ENUM(ProductFlagValue_FieldNumber) {
-  ProductFlagValue_FieldNumber_Type = 1,
-  ProductFlagValue_FieldNumber_Value = 2,
-};
-
-@interface ProductFlagValue : GPBMessage
-
-@property(nonatomic, readwrite) ProductFlag type;
-
-@property(nonatomic, readwrite) BOOL value;
-
-@end
-
-/**
- * Fetches the raw value of a @c ProductFlagValue's @c type property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t ProductFlagValue_Type_RawValue(ProductFlagValue *message);
-/**
- * Sets the raw value of an @c ProductFlagValue's @c type property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetProductFlagValue_Type_RawValue(ProductFlagValue *message, int32_t value);
-
-#pragma mark - ProductFlagset
-
-typedef GPB_ENUM(ProductFlagset_FieldNumber) {
-  ProductFlagset_FieldNumber_FlagsArray = 1,
-};
-
-@interface ProductFlagset : GPBMessage
-
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<ProductFlagValue*> *flagsArray;
-/** The number of items in @c flagsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger flagsArray_Count;
-
-@end
-
-#pragma mark - FlagsDescriptor
-
-typedef GPB_ENUM(FlagsDescriptor_FieldNumber) {
-  FlagsDescriptor_FieldNumber_Visible = 1,
-  FlagsDescriptor_FieldNumber_Premium = 2,
-  FlagsDescriptor_FieldNumber_Featured = 3,
-  FlagsDescriptor_FieldNumber_Lastchance = 4,
-  FlagsDescriptor_FieldNumber_Inhouse = 5,
-};
-
-@interface FlagsDescriptor : GPBMessage
-
-@property(nonatomic, readwrite) BOOL visible;
-
-@property(nonatomic, readwrite) BOOL premium;
-
-@property(nonatomic, readwrite) BOOL featured;
-
-@property(nonatomic, readwrite) BOOL lastchance;
-
-@property(nonatomic, readwrite) BOOL inhouse;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/FlagsDescriptor.pbobjc.m b/languages/objc/structs/FlagsDescriptor.pbobjc.m
deleted file mode 100644
index b9997ff..0000000
--- a/languages/objc/structs/FlagsDescriptor.pbobjc.m
+++ /dev/null
@@ -1,279 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/FlagsDescriptor.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "structs/FlagsDescriptor.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - FlagsDescriptorRoot
-
-@implementation FlagsDescriptorRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - FlagsDescriptorRoot_FileDescriptor
-
-static GPBFileDescriptor *FlagsDescriptorRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Enum ProductFlag
-
-GPBEnumDescriptor *ProductFlag_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Visible\000Premium\000Featured\000Lastchance\000Inho"
-        "use\000";
-    static const int32_t values[] = {
-        ProductFlag_Visible,
-        ProductFlag_Premium,
-        ProductFlag_Featured,
-        ProductFlag_Lastchance,
-        ProductFlag_Inhouse,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(ProductFlag)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:ProductFlag_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL ProductFlag_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case ProductFlag_Visible:
-    case ProductFlag_Premium:
-    case ProductFlag_Featured:
-    case ProductFlag_Lastchance:
-    case ProductFlag_Inhouse:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - ProductFlagValue
-
-@implementation ProductFlagValue
-
-@dynamic type;
-@dynamic value;
-
-typedef struct ProductFlagValue__storage_ {
-  uint32_t _has_storage_[1];
-  ProductFlag type;
-} ProductFlagValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "type",
-        .dataTypeSpecific.enumDescFunc = ProductFlag_EnumDescriptor,
-        .number = ProductFlagValue_FieldNumber_Type,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(ProductFlagValue__storage_, type),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "value",
-        .dataTypeSpecific.className = NULL,
-        .number = ProductFlagValue_FieldNumber_Value,
-        .hasIndex = 1,
-        .offset = 2,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ProductFlagValue class]
-                                     rootClass:[FlagsDescriptorRoot class]
-                                          file:FlagsDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ProductFlagValue__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t ProductFlagValue_Type_RawValue(ProductFlagValue *message) {
-  GPBDescriptor *descriptor = [ProductFlagValue descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:ProductFlagValue_FieldNumber_Type];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetProductFlagValue_Type_RawValue(ProductFlagValue *message, int32_t value) {
-  GPBDescriptor *descriptor = [ProductFlagValue descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:ProductFlagValue_FieldNumber_Type];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - ProductFlagset
-
-@implementation ProductFlagset
-
-@dynamic flagsArray, flagsArray_Count;
-
-typedef struct ProductFlagset__storage_ {
-  uint32_t _has_storage_[1];
-  NSMutableArray *flagsArray;
-} ProductFlagset__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "flagsArray",
-        .dataTypeSpecific.className = GPBStringifySymbol(ProductFlagValue),
-        .number = ProductFlagset_FieldNumber_FlagsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(ProductFlagset__storage_, flagsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ProductFlagset class]
-                                     rootClass:[FlagsDescriptorRoot class]
-                                          file:FlagsDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ProductFlagset__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - FlagsDescriptor
-
-@implementation FlagsDescriptor
-
-@dynamic visible;
-@dynamic premium;
-@dynamic featured;
-@dynamic lastchance;
-@dynamic inhouse;
-
-typedef struct FlagsDescriptor__storage_ {
-  uint32_t _has_storage_[1];
-} FlagsDescriptor__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "visible",
-        .dataTypeSpecific.className = NULL,
-        .number = FlagsDescriptor_FieldNumber_Visible,
-        .hasIndex = 0,
-        .offset = 1,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "premium",
-        .dataTypeSpecific.className = NULL,
-        .number = FlagsDescriptor_FieldNumber_Premium,
-        .hasIndex = 2,
-        .offset = 3,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "featured",
-        .dataTypeSpecific.className = NULL,
-        .number = FlagsDescriptor_FieldNumber_Featured,
-        .hasIndex = 4,
-        .offset = 5,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "lastchance",
-        .dataTypeSpecific.className = NULL,
-        .number = FlagsDescriptor_FieldNumber_Lastchance,
-        .hasIndex = 6,
-        .offset = 7,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "inhouse",
-        .dataTypeSpecific.className = NULL,
-        .number = FlagsDescriptor_FieldNumber_Inhouse,
-        .hasIndex = 8,
-        .offset = 9,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[FlagsDescriptor class]
-                                     rootClass:[FlagsDescriptorRoot class]
-                                          file:FlagsDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(FlagsDescriptor__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/Genetics.pbobjc.h b/languages/objc/structs/Genetics.pbobjc.h
deleted file mode 100644
index bc4854b..0000000
--- a/languages/objc/structs/Genetics.pbobjc.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class Name;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GeneticsRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface GeneticsRoot : GPBRootObject
-@end
-
-#pragma mark - Genetics
-
-typedef GPB_ENUM(Genetics_FieldNumber) {
-  Genetics_FieldNumber_Male = 1,
-  Genetics_FieldNumber_Female = 2,
-};
-
-@interface Genetics : GPBMessage
-
-@property(nonatomic, readwrite, strong, null_resettable) Name *male;
-/** Test to see if @c male has been set. */
-@property(nonatomic, readwrite) BOOL hasMale;
-
-@property(nonatomic, readwrite, strong, null_resettable) Name *female;
-/** Test to see if @c female has been set. */
-@property(nonatomic, readwrite) BOOL hasFemale;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/Genetics.pbobjc.m b/languages/objc/structs/Genetics.pbobjc.m
deleted file mode 100644
index ea2e09e..0000000
--- a/languages/objc/structs/Genetics.pbobjc.m
+++ /dev/null
@@ -1,103 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Genetics.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "structs/Genetics.pbobjc.h"
- #import "content/Name.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GeneticsRoot
-
-@implementation GeneticsRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - GeneticsRoot_FileDescriptor
-
-static GPBFileDescriptor *GeneticsRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Genetics
-
-@implementation Genetics
-
-@dynamic hasMale, male;
-@dynamic hasFemale, female;
-
-typedef struct Genetics__storage_ {
-  uint32_t _has_storage_[1];
-  Name *male;
-  Name *female;
-} Genetics__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "male",
-        .dataTypeSpecific.className = GPBStringifySymbol(Name),
-        .number = Genetics_FieldNumber_Male,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(Genetics__storage_, male),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "female",
-        .dataTypeSpecific.className = GPBStringifySymbol(Name),
-        .number = Genetics_FieldNumber_Female,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(Genetics__storage_, female),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[Genetics class]
-                                     rootClass:[GeneticsRoot class]
-                                          file:GeneticsRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(Genetics__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/Grow.pbobjc.h b/languages/objc/structs/Grow.pbobjc.h
deleted file mode 100644
index c92d488..0000000
--- a/languages/objc/structs/Grow.pbobjc.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum Grow
-
-typedef GPB_ENUM(Grow) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  Grow_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  Grow_Generic = 0,
-  Grow_Indoor = 1,
-  Grow_Greenhouse = 2,
-  Grow_Outdoor = 3,
-};
-
-GPBEnumDescriptor *Grow_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL Grow_IsValidValue(int32_t value);
-
-#pragma mark - GrowRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface GrowRoot : GPBRootObject
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/Grow.pbobjc.m b/languages/objc/structs/Grow.pbobjc.m
deleted file mode 100644
index 3cf48cd..0000000
--- a/languages/objc/structs/Grow.pbobjc.m
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Grow.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "structs/Grow.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GrowRoot
-
-@implementation GrowRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - Enum Grow
-
-GPBEnumDescriptor *Grow_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Generic\000Indoor\000Greenhouse\000Outdoor\000";
-    static const int32_t values[] = {
-        Grow_Generic,
-        Grow_Indoor,
-        Grow_Greenhouse,
-        Grow_Outdoor,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(Grow)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:Grow_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL Grow_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case Grow_Generic:
-    case Grow_Indoor:
-    case Grow_Greenhouse:
-    case Grow_Outdoor:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/Species.pbobjc.h b/languages/objc/structs/Species.pbobjc.h
deleted file mode 100644
index 4c2923d..0000000
--- a/languages/objc/structs/Species.pbobjc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum Species
-
-typedef GPB_ENUM(Species) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  Species_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  Species_Unspecified = 0,
-  Species_Sativa = 1,
-  Species_HybridSativa = 2,
-  Species_Hybrid = 3,
-  Species_HybridIndica = 4,
-  Species_Indica = 5,
-};
-
-GPBEnumDescriptor *Species_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL Species_IsValidValue(int32_t value);
-
-#pragma mark - SpeciesRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface SpeciesRoot : GPBRootObject
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/Species.pbobjc.m b/languages/objc/structs/Species.pbobjc.m
deleted file mode 100644
index 6988a1f..0000000
--- a/languages/objc/structs/Species.pbobjc.m
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/Species.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "structs/Species.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - SpeciesRoot
-
-@implementation SpeciesRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - Enum Species
-
-GPBEnumDescriptor *Species_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Unspecified\000Sativa\000HybridSativa\000Hybrid\000H"
-        "ybridIndica\000Indica\000";
-    static const int32_t values[] = {
-        Species_Unspecified,
-        Species_Sativa,
-        Species_HybridSativa,
-        Species_Hybrid,
-        Species_HybridIndica,
-        Species_Indica,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(Species)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:Species_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL Species_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case Species_Unspecified:
-    case Species_Sativa:
-    case Species_HybridSativa:
-    case Species_Hybrid:
-    case Species_HybridIndica:
-    case Species_Indica:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/pricing/PricingDescriptor.pbobjc.h b/languages/objc/structs/pricing/PricingDescriptor.pbobjc.h
deleted file mode 100644
index f300c13..0000000
--- a/languages/objc/structs/pricing/PricingDescriptor.pbobjc.h
+++ /dev/null
@@ -1,255 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class FreebiePricingDescriptor;
-@class PricingDescriptor;
-@class PricingTierAvailability;
-@class SaleDescriptor;
-@class UnitPricingDescriptor;
-@class WeightedPricingDescriptor;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum PricingType
-
-/** -- Pricing: Objects */
-typedef GPB_ENUM(PricingType) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  PricingType_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  PricingType_Unit = 0,
-  PricingType_Weighted = 1,
-  PricingType_Freebie = 2,
-};
-
-GPBEnumDescriptor *PricingType_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL PricingType_IsValidValue(int32_t value);
-
-#pragma mark - Enum PricingWeightTier
-
-typedef GPB_ENUM(PricingWeightTier) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  PricingWeightTier_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  PricingWeightTier_Other = 0,
-  PricingWeightTier_Gram = 1,
-  PricingWeightTier_Halfgram = 2,
-  PricingWeightTier_Quartergram = 3,
-  PricingWeightTier_Dub = 4,
-  PricingWeightTier_Eighth = 5,
-  PricingWeightTier_Quarter = 6,
-  PricingWeightTier_Half = 7,
-  PricingWeightTier_Ounce = 8,
-  PricingWeightTier_Pound = 9,
-};
-
-GPBEnumDescriptor *PricingWeightTier_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL PricingWeightTier_IsValidValue(int32_t value);
-
-#pragma mark - PricingDescriptorRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface PricingDescriptorRoot : GPBRootObject
-@end
-
-#pragma mark - PricingTierAvailability
-
-typedef GPB_ENUM(PricingTierAvailability_FieldNumber) {
-  PricingTierAvailability_FieldNumber_Offered = 1,
-  PricingTierAvailability_FieldNumber_Available = 2,
-};
-
-@interface PricingTierAvailability : GPBMessage
-
-@property(nonatomic, readwrite) BOOL offered;
-
-@property(nonatomic, readwrite) BOOL available;
-
-@end
-
-#pragma mark - UnitPricingDescriptor
-
-typedef GPB_ENUM(UnitPricingDescriptor_FieldNumber) {
-  UnitPricingDescriptor_FieldNumber_PriceValue = 1,
-  UnitPricingDescriptor_FieldNumber_Status = 2,
-  UnitPricingDescriptor_FieldNumber_DiscountsArray = 3,
-};
-
-/**
- * -- Pricing: Typed Descriptors
- **/
-@interface UnitPricingDescriptor : GPBMessage
-
-@property(nonatomic, readwrite) float priceValue;
-
-@property(nonatomic, readwrite, strong, null_resettable) PricingTierAvailability *status;
-/** Test to see if @c status has been set. */
-@property(nonatomic, readwrite) BOOL hasStatus;
-
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<SaleDescriptor*> *discountsArray;
-/** The number of items in @c discountsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger discountsArray_Count;
-
-@end
-
-#pragma mark - WeightedPricingDescriptor
-
-typedef GPB_ENUM(WeightedPricingDescriptor_FieldNumber) {
-  WeightedPricingDescriptor_FieldNumber_Weight = 1,
-  WeightedPricingDescriptor_FieldNumber_Tier = 2,
-  WeightedPricingDescriptor_FieldNumber_WeightInGrams = 3,
-};
-
-@interface WeightedPricingDescriptor : GPBMessage
-
-@property(nonatomic, readwrite) PricingWeightTier weight;
-
-@property(nonatomic, readwrite, strong, null_resettable) UnitPricingDescriptor *tier;
-/** Test to see if @c tier has been set. */
-@property(nonatomic, readwrite) BOOL hasTier;
-
-@property(nonatomic, readwrite) float weightInGrams;
-
-@end
-
-/**
- * Fetches the raw value of a @c WeightedPricingDescriptor's @c weight property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t WeightedPricingDescriptor_Weight_RawValue(WeightedPricingDescriptor *message);
-/**
- * Sets the raw value of an @c WeightedPricingDescriptor's @c weight property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetWeightedPricingDescriptor_Weight_RawValue(WeightedPricingDescriptor *message, int32_t value);
-
-#pragma mark - FreebiePricingDescriptor
-
-@interface FreebiePricingDescriptor : GPBMessage
-
-@end
-
-#pragma mark - PricingDescriptor
-
-typedef GPB_ENUM(PricingDescriptor_FieldNumber) {
-  PricingDescriptor_FieldNumber_Type = 1,
-  PricingDescriptor_FieldNumber_Unit = 20,
-  PricingDescriptor_FieldNumber_Weighted = 21,
-  PricingDescriptor_FieldNumber_Freebie = 22,
-};
-
-/**
- * -- Pricing: Main Descriptor
- **/
-@interface PricingDescriptor : GPBMessage
-
-@property(nonatomic, readwrite) PricingType type;
-
-/** -- descriptors */
-@property(nonatomic, readwrite, strong, null_resettable) UnitPricingDescriptor *unit;
-/** Test to see if @c unit has been set. */
-@property(nonatomic, readwrite) BOOL hasUnit;
-
-@property(nonatomic, readwrite, strong, null_resettable) WeightedPricingDescriptor *weighted;
-/** Test to see if @c weighted has been set. */
-@property(nonatomic, readwrite) BOOL hasWeighted;
-
-@property(nonatomic, readwrite, strong, null_resettable) FreebiePricingDescriptor *freebie;
-/** Test to see if @c freebie has been set. */
-@property(nonatomic, readwrite) BOOL hasFreebie;
-
-@end
-
-/**
- * Fetches the raw value of a @c PricingDescriptor's @c type property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t PricingDescriptor_Type_RawValue(PricingDescriptor *message);
-/**
- * Sets the raw value of an @c PricingDescriptor's @c type property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetPricingDescriptor_Type_RawValue(PricingDescriptor *message, int32_t value);
-
-#pragma mark - ProductPricing
-
-typedef GPB_ENUM(ProductPricing_FieldNumber) {
-  ProductPricing_FieldNumber_DiscountsArray = 1,
-  ProductPricing_FieldNumber_ManifestArray = 2,
-};
-
-/**
- * -- Pricing: Product-level Object
- **/
-@interface ProductPricing : GPBMessage
-
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<SaleDescriptor*> *discountsArray;
-/** The number of items in @c discountsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger discountsArray_Count;
-
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<PricingDescriptor*> *manifestArray;
-/** The number of items in @c manifestArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger manifestArray_Count;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/pricing/PricingDescriptor.pbobjc.m b/languages/objc/structs/pricing/PricingDescriptor.pbobjc.m
deleted file mode 100644
index d38a93f..0000000
--- a/languages/objc/structs/pricing/PricingDescriptor.pbobjc.m
+++ /dev/null
@@ -1,507 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/PricingDescriptor.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "structs/pricing/PricingDescriptor.pbobjc.h"
- #import "structs/pricing/SaleDescriptor.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - PricingDescriptorRoot
-
-@implementation PricingDescriptorRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - PricingDescriptorRoot_FileDescriptor
-
-static GPBFileDescriptor *PricingDescriptorRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Enum PricingType
-
-GPBEnumDescriptor *PricingType_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Unit\000Weighted\000Freebie\000";
-    static const int32_t values[] = {
-        PricingType_Unit,
-        PricingType_Weighted,
-        PricingType_Freebie,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(PricingType)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:PricingType_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL PricingType_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case PricingType_Unit:
-    case PricingType_Weighted:
-    case PricingType_Freebie:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - Enum PricingWeightTier
-
-GPBEnumDescriptor *PricingWeightTier_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Other\000Gram\000Halfgram\000Quartergram\000Dub\000Eigh"
-        "th\000Quarter\000Half\000Ounce\000Pound\000";
-    static const int32_t values[] = {
-        PricingWeightTier_Other,
-        PricingWeightTier_Gram,
-        PricingWeightTier_Halfgram,
-        PricingWeightTier_Quartergram,
-        PricingWeightTier_Dub,
-        PricingWeightTier_Eighth,
-        PricingWeightTier_Quarter,
-        PricingWeightTier_Half,
-        PricingWeightTier_Ounce,
-        PricingWeightTier_Pound,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(PricingWeightTier)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:PricingWeightTier_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL PricingWeightTier_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case PricingWeightTier_Other:
-    case PricingWeightTier_Gram:
-    case PricingWeightTier_Halfgram:
-    case PricingWeightTier_Quartergram:
-    case PricingWeightTier_Dub:
-    case PricingWeightTier_Eighth:
-    case PricingWeightTier_Quarter:
-    case PricingWeightTier_Half:
-    case PricingWeightTier_Ounce:
-    case PricingWeightTier_Pound:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - PricingTierAvailability
-
-@implementation PricingTierAvailability
-
-@dynamic offered;
-@dynamic available;
-
-typedef struct PricingTierAvailability__storage_ {
-  uint32_t _has_storage_[1];
-} PricingTierAvailability__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "offered",
-        .dataTypeSpecific.className = NULL,
-        .number = PricingTierAvailability_FieldNumber_Offered,
-        .hasIndex = 0,
-        .offset = 1,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "available",
-        .dataTypeSpecific.className = NULL,
-        .number = PricingTierAvailability_FieldNumber_Available,
-        .hasIndex = 2,
-        .offset = 3,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[PricingTierAvailability class]
-                                     rootClass:[PricingDescriptorRoot class]
-                                          file:PricingDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(PricingTierAvailability__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - UnitPricingDescriptor
-
-@implementation UnitPricingDescriptor
-
-@dynamic priceValue;
-@dynamic hasStatus, status;
-@dynamic discountsArray, discountsArray_Count;
-
-typedef struct UnitPricingDescriptor__storage_ {
-  uint32_t _has_storage_[1];
-  float priceValue;
-  PricingTierAvailability *status;
-  NSMutableArray *discountsArray;
-} UnitPricingDescriptor__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "priceValue",
-        .dataTypeSpecific.className = NULL,
-        .number = UnitPricingDescriptor_FieldNumber_PriceValue,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(UnitPricingDescriptor__storage_, priceValue),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeFloat,
-      },
-      {
-        .name = "status",
-        .dataTypeSpecific.className = GPBStringifySymbol(PricingTierAvailability),
-        .number = UnitPricingDescriptor_FieldNumber_Status,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(UnitPricingDescriptor__storage_, status),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "discountsArray",
-        .dataTypeSpecific.className = GPBStringifySymbol(SaleDescriptor),
-        .number = UnitPricingDescriptor_FieldNumber_DiscountsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(UnitPricingDescriptor__storage_, discountsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[UnitPricingDescriptor class]
-                                     rootClass:[PricingDescriptorRoot class]
-                                          file:PricingDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(UnitPricingDescriptor__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - WeightedPricingDescriptor
-
-@implementation WeightedPricingDescriptor
-
-@dynamic weight;
-@dynamic hasTier, tier;
-@dynamic weightInGrams;
-
-typedef struct WeightedPricingDescriptor__storage_ {
-  uint32_t _has_storage_[1];
-  PricingWeightTier weight;
-  float weightInGrams;
-  UnitPricingDescriptor *tier;
-} WeightedPricingDescriptor__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "weight",
-        .dataTypeSpecific.enumDescFunc = PricingWeightTier_EnumDescriptor,
-        .number = WeightedPricingDescriptor_FieldNumber_Weight,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(WeightedPricingDescriptor__storage_, weight),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "tier",
-        .dataTypeSpecific.className = GPBStringifySymbol(UnitPricingDescriptor),
-        .number = WeightedPricingDescriptor_FieldNumber_Tier,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(WeightedPricingDescriptor__storage_, tier),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "weightInGrams",
-        .dataTypeSpecific.className = NULL,
-        .number = WeightedPricingDescriptor_FieldNumber_WeightInGrams,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(WeightedPricingDescriptor__storage_, weightInGrams),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom),
-        .dataType = GPBDataTypeFloat,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[WeightedPricingDescriptor class]
-                                     rootClass:[PricingDescriptorRoot class]
-                                          file:PricingDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(WeightedPricingDescriptor__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    static const char *extraTextFormatInfo =
-        "\001\003\r\000";
-    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t WeightedPricingDescriptor_Weight_RawValue(WeightedPricingDescriptor *message) {
-  GPBDescriptor *descriptor = [WeightedPricingDescriptor descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:WeightedPricingDescriptor_FieldNumber_Weight];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetWeightedPricingDescriptor_Weight_RawValue(WeightedPricingDescriptor *message, int32_t value) {
-  GPBDescriptor *descriptor = [WeightedPricingDescriptor descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:WeightedPricingDescriptor_FieldNumber_Weight];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - FreebiePricingDescriptor
-
-@implementation FreebiePricingDescriptor
-
-
-typedef struct FreebiePricingDescriptor__storage_ {
-  uint32_t _has_storage_[1];
-} FreebiePricingDescriptor__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[FreebiePricingDescriptor class]
-                                     rootClass:[PricingDescriptorRoot class]
-                                          file:PricingDescriptorRoot_FileDescriptor()
-                                        fields:NULL
-                                    fieldCount:0
-                                   storageSize:sizeof(FreebiePricingDescriptor__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - PricingDescriptor
-
-@implementation PricingDescriptor
-
-@dynamic type;
-@dynamic hasUnit, unit;
-@dynamic hasWeighted, weighted;
-@dynamic hasFreebie, freebie;
-
-typedef struct PricingDescriptor__storage_ {
-  uint32_t _has_storage_[1];
-  PricingType type;
-  UnitPricingDescriptor *unit;
-  WeightedPricingDescriptor *weighted;
-  FreebiePricingDescriptor *freebie;
-} PricingDescriptor__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "type",
-        .dataTypeSpecific.enumDescFunc = PricingType_EnumDescriptor,
-        .number = PricingDescriptor_FieldNumber_Type,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(PricingDescriptor__storage_, type),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "unit",
-        .dataTypeSpecific.className = GPBStringifySymbol(UnitPricingDescriptor),
-        .number = PricingDescriptor_FieldNumber_Unit,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(PricingDescriptor__storage_, unit),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "weighted",
-        .dataTypeSpecific.className = GPBStringifySymbol(WeightedPricingDescriptor),
-        .number = PricingDescriptor_FieldNumber_Weighted,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(PricingDescriptor__storage_, weighted),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "freebie",
-        .dataTypeSpecific.className = GPBStringifySymbol(FreebiePricingDescriptor),
-        .number = PricingDescriptor_FieldNumber_Freebie,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(PricingDescriptor__storage_, freebie),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[PricingDescriptor class]
-                                     rootClass:[PricingDescriptorRoot class]
-                                          file:PricingDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(PricingDescriptor__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t PricingDescriptor_Type_RawValue(PricingDescriptor *message) {
-  GPBDescriptor *descriptor = [PricingDescriptor descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:PricingDescriptor_FieldNumber_Type];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetPricingDescriptor_Type_RawValue(PricingDescriptor *message, int32_t value) {
-  GPBDescriptor *descriptor = [PricingDescriptor descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:PricingDescriptor_FieldNumber_Type];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-#pragma mark - ProductPricing
-
-@implementation ProductPricing
-
-@dynamic discountsArray, discountsArray_Count;
-@dynamic manifestArray, manifestArray_Count;
-
-typedef struct ProductPricing__storage_ {
-  uint32_t _has_storage_[1];
-  NSMutableArray *discountsArray;
-  NSMutableArray *manifestArray;
-} ProductPricing__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "discountsArray",
-        .dataTypeSpecific.className = GPBStringifySymbol(SaleDescriptor),
-        .number = ProductPricing_FieldNumber_DiscountsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(ProductPricing__storage_, discountsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "manifestArray",
-        .dataTypeSpecific.className = GPBStringifySymbol(PricingDescriptor),
-        .number = ProductPricing_FieldNumber_ManifestArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(ProductPricing__storage_, manifestArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[ProductPricing class]
-                                     rootClass:[PricingDescriptorRoot class]
-                                          file:PricingDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(ProductPricing__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/pricing/SaleDescriptor.pbobjc.h b/languages/objc/structs/pricing/SaleDescriptor.pbobjc.h
deleted file mode 100644
index 84a643b..0000000
--- a/languages/objc/structs/pricing/SaleDescriptor.pbobjc.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers.h>
-#else
- #import "GPBProtocolBuffers.h"
-#endif
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum SaleType
-
-typedef GPB_ENUM(SaleType) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  SaleType_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  SaleType_Percentage = 0,
-  SaleType_Bogo = 1,
-  SaleType_Loyalty = 2,
-};
-
-GPBEnumDescriptor *SaleType_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL SaleType_IsValidValue(int32_t value);
-
-#pragma mark - SaleDescriptorRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-@interface SaleDescriptorRoot : GPBRootObject
-@end
-
-#pragma mark - SaleDescriptor
-
-typedef GPB_ENUM(SaleDescriptor_FieldNumber) {
-  SaleDescriptor_FieldNumber_Type = 1,
-  SaleDescriptor_FieldNumber_Effective = 2,
-  SaleDescriptor_FieldNumber_Expiration = 3,
-  SaleDescriptor_FieldNumber_PercentageAmount = 20,
-  SaleDescriptor_FieldNumber_BogoTrigger = 21,
-  SaleDescriptor_FieldNumber_BogoReward = 22,
-  SaleDescriptor_FieldNumber_LoyaltyTrigger = 23,
-  SaleDescriptor_FieldNumber_LoyaltyReward = 24,
-};
-
-@interface SaleDescriptor : GPBMessage
-
-/** sale metadata */
-@property(nonatomic, readwrite) SaleType type;
-
-@property(nonatomic, readwrite) uint64_t effective;
-
-@property(nonatomic, readwrite) uint64_t expiration;
-
-/** sale amount and trigger properties */
-@property(nonatomic, readwrite) uint32_t percentageAmount;
-
-@property(nonatomic, readwrite) uint32_t bogoTrigger;
-
-@property(nonatomic, readwrite) uint32_t bogoReward;
-
-@property(nonatomic, readwrite) uint32_t loyaltyTrigger;
-
-@property(nonatomic, readwrite) uint32_t loyaltyReward;
-
-@end
-
-/**
- * Fetches the raw value of a @c SaleDescriptor's @c type property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t SaleDescriptor_Type_RawValue(SaleDescriptor *message);
-/**
- * Sets the raw value of an @c SaleDescriptor's @c type property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetSaleDescriptor_Type_RawValue(SaleDescriptor *message, int32_t value);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/objc/structs/pricing/SaleDescriptor.pbobjc.m b/languages/objc/structs/pricing/SaleDescriptor.pbobjc.m
deleted file mode 100644
index fa2136c..0000000
--- a/languages/objc/structs/pricing/SaleDescriptor.pbobjc.m
+++ /dev/null
@@ -1,216 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: structs/pricing/SaleDescriptor.proto
-
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
- #import "structs/pricing/SaleDescriptor.pbobjc.h"
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - SaleDescriptorRoot
-
-@implementation SaleDescriptorRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - SaleDescriptorRoot_FileDescriptor
-
-static GPBFileDescriptor *SaleDescriptorRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@""
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Enum SaleType
-
-GPBEnumDescriptor *SaleType_EnumDescriptor(void) {
-  static GPBEnumDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    static const char *valueNames =
-        "Percentage\000Bogo\000Loyalty\000";
-    static const int32_t values[] = {
-        SaleType_Percentage,
-        SaleType_Bogo,
-        SaleType_Loyalty,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(SaleType)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:SaleType_IsValidValue];
-    if (!OSAtomicCompareAndSwapPtrBarrier(nil, worker, (void * volatile *)&descriptor)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL SaleType_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case SaleType_Percentage:
-    case SaleType_Bogo:
-    case SaleType_Loyalty:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - SaleDescriptor
-
-@implementation SaleDescriptor
-
-@dynamic type;
-@dynamic effective;
-@dynamic expiration;
-@dynamic percentageAmount;
-@dynamic bogoTrigger;
-@dynamic bogoReward;
-@dynamic loyaltyTrigger;
-@dynamic loyaltyReward;
-
-typedef struct SaleDescriptor__storage_ {
-  uint32_t _has_storage_[1];
-  SaleType type;
-  uint32_t percentageAmount;
-  uint32_t bogoTrigger;
-  uint32_t bogoReward;
-  uint32_t loyaltyTrigger;
-  uint32_t loyaltyReward;
-  uint64_t effective;
-  uint64_t expiration;
-} SaleDescriptor__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "type",
-        .dataTypeSpecific.enumDescFunc = SaleType_EnumDescriptor,
-        .number = SaleDescriptor_FieldNumber_Type,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, type),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "effective",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_Effective,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, effective),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt64,
-      },
-      {
-        .name = "expiration",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_Expiration,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, expiration),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt64,
-      },
-      {
-        .name = "percentageAmount",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_PercentageAmount,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, percentageAmount),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt32,
-      },
-      {
-        .name = "bogoTrigger",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_BogoTrigger,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, bogoTrigger),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt32,
-      },
-      {
-        .name = "bogoReward",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_BogoReward,
-        .hasIndex = 5,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, bogoReward),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt32,
-      },
-      {
-        .name = "loyaltyTrigger",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_LoyaltyTrigger,
-        .hasIndex = 6,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, loyaltyTrigger),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt32,
-      },
-      {
-        .name = "loyaltyReward",
-        .dataTypeSpecific.className = NULL,
-        .number = SaleDescriptor_FieldNumber_LoyaltyReward,
-        .hasIndex = 7,
-        .offset = (uint32_t)offsetof(SaleDescriptor__storage_, loyaltyReward),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeUInt32,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[SaleDescriptor class]
-                                     rootClass:[SaleDescriptorRoot class]
-                                          file:SaleDescriptorRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(SaleDescriptor__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    NSAssert(descriptor == nil, @"Startup recursed!");
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t SaleDescriptor_Type_RawValue(SaleDescriptor *message) {
-  GPBDescriptor *descriptor = [SaleDescriptor descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:SaleDescriptor_FieldNumber_Type];
-  return GPBGetMessageInt32Field(message, field);
-}
-
-void SetSaleDescriptor_Type_RawValue(SaleDescriptor *message, int32_t value) {
-  GPBDescriptor *descriptor = [SaleDescriptor descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:SaleDescriptor_FieldNumber_Type];
-  GPBSetInt32IvarWithFieldInternal(message, field, value, descriptor.file.syntax);
-}
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/languages/php/Address.php b/languages/php/Address.php
deleted file mode 100644
index d5baca6..0000000
--- a/languages/php/Address.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: geo/Address.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Address</code>
- */
-class Address extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>string first_line = 1;</code>
-     */
-    private $first_line = '';
-    /**
-     * Generated from protobuf field <code>string second_line = 2;</code>
-     */
-    private $second_line = '';
-    /**
-     * Generated from protobuf field <code>string city = 3;</code>
-     */
-    private $city = '';
-    /**
-     * Generated from protobuf field <code>string state = 4;</code>
-     */
-    private $state = '';
-    /**
-     * Generated from protobuf field <code>string zipcode = 5;</code>
-     */
-    private $zipcode = '';
-    /**
-     * Generated from protobuf field <code>string country = 6;</code>
-     */
-    private $country = '';
-
-    public function __construct() {
-        \GPBMetadata\Geo\Address::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>string first_line = 1;</code>
-     * @return string
-     */
-    public function getFirstLine()
-    {
-        return $this->first_line;
-    }
-
-    /**
-     * Generated from protobuf field <code>string first_line = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setFirstLine($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->first_line = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>string second_line = 2;</code>
-     * @return string
-     */
-    public function getSecondLine()
-    {
-        return $this->second_line;
-    }
-
-    /**
-     * Generated from protobuf field <code>string second_line = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setSecondLine($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->second_line = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>string city = 3;</code>
-     * @return string
-     */
-    public function getCity()
-    {
-        return $this->city;
-    }
-
-    /**
-     * Generated from protobuf field <code>string city = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setCity($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->city = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>string state = 4;</code>
-     * @return string
-     */
-    public function getState()
-    {
-        return $this->state;
-    }
-
-    /**
-     * Generated from protobuf field <code>string state = 4;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setState($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->state = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>string zipcode = 5;</code>
-     * @return string
-     */
-    public function getZipcode()
-    {
-        return $this->zipcode;
-    }
-
-    /**
-     * Generated from protobuf field <code>string zipcode = 5;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setZipcode($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->zipcode = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>string country = 6;</code>
-     * @return string
-     */
-    public function getCountry()
-    {
-        return $this->country;
-    }
-
-    /**
-     * Generated from protobuf field <code>string country = 6;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setCountry($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->country = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/Brand.php b/languages/php/Brand.php
deleted file mode 100644
index 2baef31..0000000
--- a/languages/php/Brand.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Brand.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Brand</code>
- */
-class Brand extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * -- Basic Properties
-     *
-     * Generated from protobuf field <code>.Name name = 1;</code>
-     */
-    private $name = null;
-    /**
-     * Generated from protobuf field <code>.Brand parent = 2;</code>
-     */
-    private $parent = null;
-    /**
-     * Generated from protobuf field <code>.Content summary = 3;</code>
-     */
-    private $summary = null;
-    /**
-     * -- Media
-     *
-     * Generated from protobuf field <code>repeated .MediaItem media = 20;</code>
-     */
-    private $media;
-
-    public function __construct() {
-        \GPBMetadata\Content\Brand::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * -- Basic Properties
-     *
-     * Generated from protobuf field <code>.Name name = 1;</code>
-     * @return \Name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * -- Basic Properties
-     *
-     * Generated from protobuf field <code>.Name name = 1;</code>
-     * @param \Name $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkMessage($var, \Name::class);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Brand parent = 2;</code>
-     * @return \Brand
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Brand parent = 2;</code>
-     * @param \Brand $var
-     * @return $this
-     */
-    public function setParent($var)
-    {
-        GPBUtil::checkMessage($var, \Brand::class);
-        $this->parent = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Content summary = 3;</code>
-     * @return \Content
-     */
-    public function getSummary()
-    {
-        return $this->summary;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Content summary = 3;</code>
-     * @param \Content $var
-     * @return $this
-     */
-    public function setSummary($var)
-    {
-        GPBUtil::checkMessage($var, \Content::class);
-        $this->summary = $var;
-
-        return $this;
-    }
-
-    /**
-     * -- Media
-     *
-     * Generated from protobuf field <code>repeated .MediaItem media = 20;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getMedia()
-    {
-        return $this->media;
-    }
-
-    /**
-     * -- Media
-     *
-     * Generated from protobuf field <code>repeated .MediaItem media = 20;</code>
-     * @param \MediaItem[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setMedia($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \MediaItem::class);
-        $this->media = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/Compression.php b/languages/php/Compression.php
deleted file mode 100644
index a02ae4e..0000000
--- a/languages/php/Compression.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Compression.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Compression</code>
- */
-class Compression extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>bool enabled = 1;</code>
-     */
-    private $enabled = false;
-    /**
-     * Generated from protobuf field <code>.Compression.Type type = 2;</code>
-     */
-    private $type = 0;
-
-    public function __construct() {
-        \GPBMetadata\Base\Compression::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>bool enabled = 1;</code>
-     * @return bool
-     */
-    public function getEnabled()
-    {
-        return $this->enabled;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool enabled = 1;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setEnabled($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->enabled = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Compression.Type type = 2;</code>
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Compression.Type type = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkEnum($var, \Compression_Type::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/Compression_Type.php b/languages/php/Compression_Type.php
deleted file mode 100644
index 9a997c0..0000000
--- a/languages/php/Compression_Type.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Compression.proto
-
-/**
- * Protobuf enum <code>Compression\Type</code>
- */
-class Compression_Type
-{
-    /**
-     * Generated from protobuf enum <code>GZIP = 0;</code>
-     */
-    const GZIP = 0;
-}
-
diff --git a/languages/php/Content.php b/languages/php/Content.php
deleted file mode 100644
index 5b297b2..0000000
--- a/languages/php/Content.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Content.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Content</code>
- */
-class Content extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.Content.Type type = 1;</code>
-     */
-    private $type = 0;
-    /**
-     * Generated from protobuf field <code>.Content.Encoding encoding = 2;</code>
-     */
-    private $encoding = 0;
-    /**
-     * Generated from protobuf field <code>bytes content = 3;</code>
-     */
-    private $content = '';
-    /**
-     * Generated from protobuf field <code>.Language language = 4;</code>
-     */
-    private $language = 0;
-    /**
-     * Generated from protobuf field <code>.Compression compression = 5;</code>
-     */
-    private $compression = null;
-
-    public function __construct() {
-        \GPBMetadata\Content\Content::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.Content.Type type = 1;</code>
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Content.Type type = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkEnum($var, \Content_Type::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Content.Encoding encoding = 2;</code>
-     * @return int
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Content.Encoding encoding = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setEncoding($var)
-    {
-        GPBUtil::checkEnum($var, \Content_Encoding::class);
-        $this->encoding = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bytes content = 3;</code>
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * Generated from protobuf field <code>bytes content = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setContent($var)
-    {
-        GPBUtil::checkString($var, False);
-        $this->content = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Language language = 4;</code>
-     * @return int
-     */
-    public function getLanguage()
-    {
-        return $this->language;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Language language = 4;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setLanguage($var)
-    {
-        GPBUtil::checkEnum($var, \Language::class);
-        $this->language = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Compression compression = 5;</code>
-     * @return \Compression
-     */
-    public function getCompression()
-    {
-        return $this->compression;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Compression compression = 5;</code>
-     * @param \Compression $var
-     * @return $this
-     */
-    public function setCompression($var)
-    {
-        GPBUtil::checkMessage($var, \Compression::class);
-        $this->compression = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/Content_Encoding.php b/languages/php/Content_Encoding.php
deleted file mode 100644
index 55d2f6b..0000000
--- a/languages/php/Content_Encoding.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Content.proto
-
-/**
- * Protobuf enum <code>Content\Encoding</code>
- */
-class Content_Encoding
-{
-    /**
-     * Generated from protobuf enum <code>UTF8 = 0;</code>
-     */
-    const UTF8 = 0;
-}
-
diff --git a/languages/php/Content_Type.php b/languages/php/Content_Type.php
deleted file mode 100644
index 1d1745e..0000000
--- a/languages/php/Content_Type.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Content.proto
-
-/**
- * Protobuf enum <code>Content\Type</code>
- */
-class Content_Type
-{
-    /**
-     * Generated from protobuf enum <code>TEXT = 0;</code>
-     */
-    const TEXT = 0;
-    /**
-     * Generated from protobuf enum <code>MARKDOWN = 1;</code>
-     */
-    const MARKDOWN = 1;
-    /**
-     * Generated from protobuf enum <code>HTML = 2;</code>
-     */
-    const HTML = 2;
-}
-
diff --git a/languages/php/DocumentType.php b/languages/php/DocumentType.php
deleted file mode 100644
index 65b8731..0000000
--- a/languages/php/DocumentType.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Media Type: Document -- //
- *
- * Generated from protobuf message <code>DocumentType</code>
- */
-class DocumentType extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.DocumentType.DocumentKind kind = 1;</code>
-     */
-    private $kind = 0;
-    /**
-     * Generated from protobuf field <code>bool compressed = 2;</code>
-     */
-    private $compressed = false;
-
-    public function __construct() {
-        \GPBMetadata\Media\MediaType::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.DocumentType.DocumentKind kind = 1;</code>
-     * @return int
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
-
-    /**
-     * Generated from protobuf field <code>.DocumentType.DocumentKind kind = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setKind($var)
-    {
-        GPBUtil::checkEnum($var, \DocumentType_DocumentKind::class);
-        $this->kind = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool compressed = 2;</code>
-     * @return bool
-     */
-    public function getCompressed()
-    {
-        return $this->compressed;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool compressed = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setCompressed($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->compressed = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/DocumentType_DocumentKind.php b/languages/php/DocumentType_DocumentKind.php
deleted file mode 100644
index 38da5be..0000000
--- a/languages/php/DocumentType_DocumentKind.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-/**
- * Protobuf enum <code>DocumentType\DocumentKind</code>
- */
-class DocumentType_DocumentKind
-{
-    /**
-     * Generated from protobuf enum <code>TXT = 0;</code>
-     */
-    const TXT = 0;
-    /**
-     * Generated from protobuf enum <code>HTML = 1;</code>
-     */
-    const HTML = 1;
-    /**
-     * Generated from protobuf enum <code>PDF = 2;</code>
-     */
-    const PDF = 2;
-    /**
-     * Generated from protobuf enum <code>MARKDOWN = 3;</code>
-     */
-    const MARKDOWN = 3;
-}
-
diff --git a/languages/php/FlagsDescriptor.php b/languages/php/FlagsDescriptor.php
deleted file mode 100644
index 937d302..0000000
--- a/languages/php/FlagsDescriptor.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>FlagsDescriptor</code>
- */
-class FlagsDescriptor extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>bool visible = 1;</code>
-     */
-    private $visible = false;
-    /**
-     * Generated from protobuf field <code>bool premium = 2;</code>
-     */
-    private $premium = false;
-    /**
-     * Generated from protobuf field <code>bool featured = 3;</code>
-     */
-    private $featured = false;
-    /**
-     * Generated from protobuf field <code>bool lastchance = 4;</code>
-     */
-    private $lastchance = false;
-    /**
-     * Generated from protobuf field <code>bool inhouse = 5;</code>
-     */
-    private $inhouse = false;
-
-    public function __construct() {
-        \GPBMetadata\Structs\FlagsDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>bool visible = 1;</code>
-     * @return bool
-     */
-    public function getVisible()
-    {
-        return $this->visible;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool visible = 1;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setVisible($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->visible = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool premium = 2;</code>
-     * @return bool
-     */
-    public function getPremium()
-    {
-        return $this->premium;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool premium = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setPremium($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->premium = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool featured = 3;</code>
-     * @return bool
-     */
-    public function getFeatured()
-    {
-        return $this->featured;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool featured = 3;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setFeatured($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->featured = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool lastchance = 4;</code>
-     * @return bool
-     */
-    public function getLastchance()
-    {
-        return $this->lastchance;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool lastchance = 4;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setLastchance($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->lastchance = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool inhouse = 5;</code>
-     * @return bool
-     */
-    public function getInhouse()
-    {
-        return $this->inhouse;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool inhouse = 5;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setInhouse($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->inhouse = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/Flower.php b/languages/php/Flower.php
deleted file mode 100644
index 963fd6d..0000000
--- a/languages/php/Flower.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: products/Flower.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Flower</code>
- */
-class Flower extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * -- Object Key
-     *
-     * Generated from protobuf field <code>.ProductKey key = 1;</code>
-     */
-    private $key = null;
-    /**
-     * -- Basic Product & Materials Data
-     *
-     * Generated from protobuf field <code>.ProductContent product_data = 20;</code>
-     */
-    private $product_data = null;
-    /**
-     * Generated from protobuf field <code>.MaterialsData material_data = 21;</code>
-     */
-    private $material_data = null;
-    /**
-     * -- Flags and Pricing
-     *
-     * Generated from protobuf field <code>.FlagsDescriptor flags = 22;</code>
-     */
-    private $flags = null;
-    /**
-     * Generated from protobuf field <code>.ProductPricing pricing = 23;</code>
-     */
-    private $pricing = null;
-
-    public function __construct() {
-        \GPBMetadata\Products\Flower::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * -- Object Key
-     *
-     * Generated from protobuf field <code>.ProductKey key = 1;</code>
-     * @return \ProductKey
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * -- Object Key
-     *
-     * Generated from protobuf field <code>.ProductKey key = 1;</code>
-     * @param \ProductKey $var
-     * @return $this
-     */
-    public function setKey($var)
-    {
-        GPBUtil::checkMessage($var, \ProductKey::class);
-        $this->key = $var;
-
-        return $this;
-    }
-
-    /**
-     * -- Basic Product & Materials Data
-     *
-     * Generated from protobuf field <code>.ProductContent product_data = 20;</code>
-     * @return \ProductContent
-     */
-    public function getProductData()
-    {
-        return $this->product_data;
-    }
-
-    /**
-     * -- Basic Product & Materials Data
-     *
-     * Generated from protobuf field <code>.ProductContent product_data = 20;</code>
-     * @param \ProductContent $var
-     * @return $this
-     */
-    public function setProductData($var)
-    {
-        GPBUtil::checkMessage($var, \ProductContent::class);
-        $this->product_data = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.MaterialsData material_data = 21;</code>
-     * @return \MaterialsData
-     */
-    public function getMaterialData()
-    {
-        return $this->material_data;
-    }
-
-    /**
-     * Generated from protobuf field <code>.MaterialsData material_data = 21;</code>
-     * @param \MaterialsData $var
-     * @return $this
-     */
-    public function setMaterialData($var)
-    {
-        GPBUtil::checkMessage($var, \MaterialsData::class);
-        $this->material_data = $var;
-
-        return $this;
-    }
-
-    /**
-     * -- Flags and Pricing
-     *
-     * Generated from protobuf field <code>.FlagsDescriptor flags = 22;</code>
-     * @return \FlagsDescriptor
-     */
-    public function getFlags()
-    {
-        return $this->flags;
-    }
-
-    /**
-     * -- Flags and Pricing
-     *
-     * Generated from protobuf field <code>.FlagsDescriptor flags = 22;</code>
-     * @param \FlagsDescriptor $var
-     * @return $this
-     */
-    public function setFlags($var)
-    {
-        GPBUtil::checkMessage($var, \FlagsDescriptor::class);
-        $this->flags = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductPricing pricing = 23;</code>
-     * @return \ProductPricing
-     */
-    public function getPricing()
-    {
-        return $this->pricing;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductPricing pricing = 23;</code>
-     * @param \ProductPricing $var
-     * @return $this
-     */
-    public function setPricing($var)
-    {
-        GPBUtil::checkMessage($var, \ProductPricing::class);
-        $this->pricing = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/FreebiePricingDescriptor.php b/languages/php/FreebiePricingDescriptor.php
deleted file mode 100644
index 4e616d1..0000000
--- a/languages/php/FreebiePricingDescriptor.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>FreebiePricingDescriptor</code>
- */
-class FreebiePricingDescriptor extends \Google\Protobuf\Internal\Message
-{
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        parent::__construct();
-    }
-
-}
-
diff --git a/languages/php/GPBMetadata/Base/Compression.php b/languages/php/GPBMetadata/Base/Compression.php
deleted file mode 100644
index f8bda36..0000000
--- a/languages/php/GPBMetadata/Base/Compression.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Compression.proto
-
-namespace GPBMetadata\Base;
-
-class Compression
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0aa6010a16626173652f436f6d7072657373696f6e2e70726f746f22510a" .
-            "0b436f6d7072657373696f6e120f0a07656e61626c656418012001280812" .
-            "1f0a047479706518022001280e32112e436f6d7072657373696f6e2e5479" .
-            "706522100a045479706512080a04475a4950100042310a17696f2e626c6f" .
-            "6f6d626f782e736368656d612e62617365420f42617365436f6d70726573" .
-            "73696f6e48015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Base/Language.php b/languages/php/GPBMetadata/Base/Language.php
deleted file mode 100644
index df4c124..0000000
--- a/languages/php/GPBMetadata/Base/Language.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Language.proto
-
-namespace GPBMetadata\Base;
-
-class Language
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a7f0a13626173652f4c616e67756167652e70726f746f2a300a084c616e" .
-            "6775616765120b0a07454e474c4953481000120b0a075350414e49534810" .
-            "01120a0a064652454e43481002422e0a17696f2e626c6f6f6d626f782e73" .
-            "6368656d612e62617365420c426173654c616e677561676548015001f801" .
-            "01620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Base/Product.php b/languages/php/GPBMetadata/Base/Product.php
deleted file mode 100644
index a263e77..0000000
--- a/languages/php/GPBMetadata/Base/Product.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Product.proto
-
-namespace GPBMetadata\Base;
-
-class Product
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Base\ProductKey::initOnce();
-        \GPBMetadata\Base\ProductType::initOnce();
-        \GPBMetadata\Google\Protobuf\Any::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ad1010a12626173652f50726f647563742e70726f746f1a16626173652f" .
-            "50726f64756374547970652e70726f746f1a19676f6f676c652f70726f74" .
-            "6f6275662f616e792e70726f746f22630a0750726f6475637412180a036b" .
-            "657918012001280b320b2e50726f647563744b6579121a0a047479706518" .
-            "022001280b320c2e50726f647563745479706512220a0464617461180320" .
-            "01280b32142e676f6f676c652e70726f746f6275662e416e79421b0a1769" .
-            "6f2e626c6f6f6d626f782e736368656d612e626173655001620670726f74" .
-            "6f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Base/ProductKey.php b/languages/php/GPBMetadata/Base/ProductKey.php
deleted file mode 100644
index b4ae686..0000000
--- a/languages/php/GPBMetadata/Base/ProductKey.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKey.proto
-
-namespace GPBMetadata\Base;
-
-class ProductKey
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a6b0a15626173652f50726f647563744b65792e70726f746f22180a0a50" .
-            "726f647563744b6579120a0a02696418012001280942300a17696f2e626c" .
-            "6f6f6d626f782e736368656d612e62617365420e4261736550726f647563" .
-            "744b657948015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Base/ProductKind.php b/languages/php/GPBMetadata/Base/ProductKind.php
deleted file mode 100644
index c06be43..0000000
--- a/languages/php/GPBMetadata/Base/ProductKind.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKind.proto
-
-namespace GPBMetadata\Base;
-
-class ProductKind
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ad6010a16626173652f50726f647563744b696e642e70726f746f2a8001" .
-            "0a0b50726f647563744b696e64120b0a07464c4f574552531000120b0a07" .
-            "454449424c45531001120c0a0845585452414354531002120c0a08505245" .
-            "524f4c4c531003120e0a0a41504f544845434152591004120e0a0a434152" .
-            "545249444745531005120a0a06504c414e54531006120f0a0b4d45524348" .
-            "414e44495345100742310a17696f2e626c6f6f6d626f782e736368656d61" .
-            "2e62617365420f4261736550726f647563744b696e6448015001f8010162" .
-            "0670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Base/ProductType.php b/languages/php/GPBMetadata/Base/ProductType.php
deleted file mode 100644
index bc52cba..0000000
--- a/languages/php/GPBMetadata/Base/ProductType.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductType.proto
-
-namespace GPBMetadata\Base;
-
-class ProductType
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Base\ProductKind::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a7e0a16626173652f50726f64756374547970652e70726f746f22290a0b" .
-            "50726f6475637454797065121a0a046b696e6418012001280e320c2e5072" .
-            "6f647563744b696e6442310a17696f2e626c6f6f6d626f782e736368656d" .
-            "612e62617365420f4261736550726f647563745479706548015001f80101" .
-            "620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Content/Brand.php b/languages/php/GPBMetadata/Content/Brand.php
deleted file mode 100644
index 5f9e9ec..0000000
--- a/languages/php/GPBMetadata/Content/Brand.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Brand.proto
-
-namespace GPBMetadata\Content;
-
-class Brand
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Content\Name::initOnce();
-        \GPBMetadata\Content\Content::initOnce();
-        \GPBMetadata\Media\MediaItem::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0aea010a13636f6e74656e742f4272616e642e70726f746f1a15636f6e74" .
-            "656e742f436f6e74656e742e70726f746f1a156d656469612f4d65646961" .
-            "4974656d2e70726f746f226a0a054272616e6412130a046e616d65180120" .
-            "01280b32052e4e616d6512160a06706172656e7418022001280b32062e42" .
-            "72616e6412190a0773756d6d61727918032001280b32082e436f6e74656e" .
-            "7412190a056d6564696118142003280b320a2e4d656469614974656d4231" .
-            "0a1a696f2e626c6f6f6d626f782e736368656d612e636f6e74656e74420c" .
-            "4272616e64436f6e74656e7448015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Content/Content.php b/languages/php/GPBMetadata/Content/Content.php
deleted file mode 100644
index 03d0b3f..0000000
--- a/languages/php/GPBMetadata/Content/Content.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Content.proto
-
-namespace GPBMetadata\Content;
-
-class Content
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Base\Language::initOnce();
-        \GPBMetadata\Base\Compression::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0acb020a15636f6e74656e742f436f6e74656e742e70726f746f1a166261" .
-            "73652f436f6d7072657373696f6e2e70726f746f22dc010a07436f6e7465" .
-            "6e74121b0a047479706518012001280e320d2e436f6e74656e742e547970" .
-            "6512230a08656e636f64696e6718022001280e32112e436f6e74656e742e" .
-            "456e636f64696e67120f0a07636f6e74656e7418032001280c121b0a086c" .
-            "616e677561676518042001280e32092e4c616e677561676512210a0b636f" .
-            "6d7072657373696f6e18052001280b320c2e436f6d7072657373696f6e22" .
-            "280a045479706512080a04544558541000120c0a084d41524b444f574e10" .
-            "0112080a0448544d4c100222140a08456e636f64696e6712080a04555446" .
-            "38100042330a1a696f2e626c6f6f6d626f782e736368656d612e636f6e74" .
-            "656e74420e47656e65726963436f6e74656e7448015001f8010162067072" .
-            "6f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Content/MaterialsData.php b/languages/php/GPBMetadata/Content/MaterialsData.php
deleted file mode 100644
index e9b7cdf..0000000
--- a/languages/php/GPBMetadata/Content/MaterialsData.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/MaterialsData.proto
-
-namespace GPBMetadata\Content;
-
-class MaterialsData
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Structs\Grow::initOnce();
-        \GPBMetadata\Structs\Species::initOnce();
-        \GPBMetadata\Structs\Genetics::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0afe010a1b636f6e74656e742f4d6174657269616c73446174612e70726f" .
-            "746f1a15737472756374732f537065636965732e70726f746f1a16737472" .
-            "756374732f47656e65746963732e70726f746f22710a0d4d617465726961" .
-            "6c734461746112130a0b696e6772656469656e747318012003280912130a" .
-            "0467726f7718022001280e32052e47726f7712190a077370656369657318" .
-            "032001280e32082e53706563696573121b0a0867656e6574696373180420" .
-            "01280b32092e47656e657469637342350a1a696f2e626c6f6f6d626f782e" .
-            "736368656d612e636f6e74656e7442104d6174657269616c73436f6e7465" .
-            "6e7448015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Content/Name.php b/languages/php/GPBMetadata/Content/Name.php
deleted file mode 100644
index 6e1b593..0000000
--- a/languages/php/GPBMetadata/Content/Name.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Name.proto
-
-namespace GPBMetadata\Content;
-
-class Name
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a780a12636f6e74656e742f4e616d652e70726f746f22280a044e616d65" .
-            "120f0a077072696d617279180120012809120f0a07646973706c61791802" .
-            "2001280942300a1a696f2e626c6f6f6d626f782e736368656d612e636f6e" .
-            "74656e74420b4e616d65436f6e74656e7448015001f80101620670726f74" .
-            "6f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Content/ProductContent.php b/languages/php/GPBMetadata/Content/ProductContent.php
deleted file mode 100644
index 78caa4c..0000000
--- a/languages/php/GPBMetadata/Content/ProductContent.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/ProductContent.proto
-
-namespace GPBMetadata\Content;
-
-class ProductContent
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Content\Name::initOnce();
-        \GPBMetadata\Content\Content::initOnce();
-        \GPBMetadata\Content\Brand::initOnce();
-        \GPBMetadata\Media\MediaItem::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ae1020a1c636f6e74656e742f50726f64756374436f6e74656e742e7072" .
-            "6f746f1a15636f6e74656e742f436f6e74656e742e70726f746f1a13636f" .
-            "6e74656e742f4272616e642e70726f746f1a156d656469612f4d65646961" .
-            "4974656d2e70726f746f22bf010a0e50726f64756374436f6e74656e7412" .
-            "130a046e616d6518012001280b32052e4e616d6512190a0773756d6d6172" .
-            "7918022001280b32082e436f6e74656e7412150a056272616e6418032001" .
-            "280b32062e4272616e6412190a056d6564696118142003280b320a2e4d65" .
-            "6469614974656d12170a057573616765181e2001280b32082e436f6e7465" .
-            "6e7412180a06646f73616765181f2001280b32082e436f6e74656e741218" .
-            "0a0661647669636518202001280b32082e436f6e74656e7442340a1a696f" .
-            "2e626c6f6f6d626f782e736368656d612e636f6e74656e74420f41747461" .
-            "63686564436f6e74656e7448015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Geo/Address.php b/languages/php/GPBMetadata/Geo/Address.php
deleted file mode 100644
index 04a8df8..0000000
--- a/languages/php/GPBMetadata/Geo/Address.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: geo/Address.proto
-
-namespace GPBMetadata\Geo;
-
-class Address
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0aac010a1167656f2f416464726573732e70726f746f22710a0741646472" .
-            "65737312120a0a66697273745f6c696e6518012001280912130a0b736563" .
-            "6f6e645f6c696e65180220012809120c0a0463697479180320012809120d" .
-            "0a057374617465180420012809120f0a077a6970636f6465180520012809" .
-            "120f0a07636f756e747279180620012809421c0a16696f2e626c6f6f6d62" .
-            "6f782e736368656d612e67656f48015001620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Media/MediaItem.php b/languages/php/GPBMetadata/Media/MediaItem.php
deleted file mode 100644
index c31d443..0000000
--- a/languages/php/GPBMetadata/Media/MediaItem.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaItem.proto
-
-namespace GPBMetadata\Media;
-
-class MediaItem
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Media\MediaKey::initOnce();
-        \GPBMetadata\Media\MediaType::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ab5010a156d656469612f4d656469614974656d2e70726f746f1a156d65" .
-            "6469612f4d65646961547970652e70726f746f224b0a094d656469614974" .
-            "656d12160a036b657918012001280b32092e4d656469614b657912180a04" .
-            "7479706518022001280b320a2e4d6564696154797065120c0a046e616d65" .
-            "18032001280942300a18696f2e626c6f6f6d626f782e736368656d612e6d" .
-            "65646961420d41747461636865644d6564696148015001f8010162067072" .
-            "6f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Media/MediaKey.php b/languages/php/GPBMetadata/Media/MediaKey.php
deleted file mode 100644
index fededce..0000000
--- a/languages/php/GPBMetadata/Media/MediaKey.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaKey.proto
-
-namespace GPBMetadata\Media;
-
-class MediaKey
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a670a146d656469612f4d656469614b65792e70726f746f22160a084d65" .
-            "6469614b6579120a0a026964180120012809422f0a18696f2e626c6f6f6d" .
-            "626f782e736368656d612e6d65646961420c4d656469614974656d4b6579" .
-            "48015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Media/MediaType.php b/languages/php/GPBMetadata/Media/MediaType.php
deleted file mode 100644
index fb073ef..0000000
--- a/languages/php/GPBMetadata/Media/MediaType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-namespace GPBMetadata\Media;
-
-class MediaType
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0aea040a156d656469612f4d65646961547970652e70726f746f22c8010a" .
-            "094d6564696154797065121d0a046b696e6418012001280e320f2e4d6564" .
-            "6961547970652e4b696e64121e0a0a696d6167655f747970651865200128" .
-            "0b320a2e496d6167655479706512250a0d646f63756d656e745f74797065" .
-            "18c9012001280b320d2e446f63756d656e7454797065121f0a0a76696465" .
-            "6f5f7479706518ad022001280b320a2e566964656f5479706522340a044b" .
-            "696e6412080a044c494e4b100012090a05494d4147451001120c0a08444f" .
-            "43554d454e54100212090a05564944454f1003226a0a09496d6167655479" .
-            "706512220a046b696e6418012001280e32142e496d616765547970652e49" .
-            "6d6167654b696e6422390a09496d6167654b696e6412070a03504e471000" .
-            "12070a034a5047100112070a03474946100212070a03535647100312080a" .
-            "045745425010042286010a0c446f63756d656e745479706512280a046b69" .
-            "6e6418012001280e321a2e446f63756d656e74547970652e446f63756d65" .
-            "6e744b696e6412120a0a636f6d7072657373656418022001280822380a0c" .
-            "446f63756d656e744b696e6412070a03545854100012080a0448544d4c10" .
-            "0112070a035044461002120c0a084d41524b444f574e100322570a095669" .
-            "64656f5479706512220a046b696e6418012001280e32142e566964656f54" .
-            "7970652e566964656f4b696e6422260a09566964656f4b696e6412070a03" .
-            "4d5034100012070a03464c56100112070a03484c53100242300a18696f2e" .
-            "626c6f6f6d626f782e736368656d612e6d65646961420d4d656469614974" .
-            "656d5479706548015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Product.php b/languages/php/GPBMetadata/Product.php
deleted file mode 100644
index 16a5a05..0000000
--- a/languages/php/GPBMetadata/Product.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: Product.proto
-
-namespace GPBMetadata;
-
-class Product
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Base\ProductKey::initOnce();
-        \GPBMetadata\Base\ProductType::initOnce();
-        \GPBMetadata\Google\Protobuf\Any::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ade010a0d50726f647563742e70726f746f1a16626173652f50726f6475" .
-            "6374547970652e70726f746f1a19676f6f676c652f70726f746f6275662f" .
-            "616e792e70726f746f22630a0750726f6475637412180a036b6579180120" .
-            "01280b320b2e50726f647563744b6579121a0a047479706518022001280b" .
-            "320c2e50726f647563745479706512220a046461746118032001280b3214" .
-            "2e676f6f676c652e70726f746f6275662e416e79422d0a17696f2e626c6f" .
-            "6f6d626f782e736368656d612e62617365420b4261736550726f64756374" .
-            "48015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Products/Flower.php b/languages/php/GPBMetadata/Products/Flower.php
deleted file mode 100644
index 45348c1..0000000
--- a/languages/php/GPBMetadata/Products/Flower.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: products/Flower.proto
-
-namespace GPBMetadata\Products;
-
-class Flower
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Base\ProductKey::initOnce();
-        \GPBMetadata\Content\MaterialsData::initOnce();
-        \GPBMetadata\Content\ProductContent::initOnce();
-        \GPBMetadata\Structs\FlagsDescriptor::initOnce();
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a8c030a1570726f64756374732f466c6f7765722e70726f746f1a1b636f" .
-            "6e74656e742f4d6174657269616c73446174612e70726f746f1a1c636f6e" .
-            "74656e742f50726f64756374436f6e74656e742e70726f746f1a1d737472" .
-            "756374732f466c61677344657363726970746f722e70726f746f1a277374" .
-            "72756374732f70726963696e672f50726963696e6744657363726970746f" .
-            "722e70726f746f22b3010a06466c6f77657212180a036b65791801200128" .
-            "0b320b2e50726f647563744b657912250a0c70726f647563745f64617461" .
-            "18142001280b320f2e50726f64756374436f6e74656e7412250a0d6d6174" .
-            "657269616c5f6461746118152001280b320e2e4d6174657269616c734461" .
-            "7461121f0a05666c61677318162001280b32102e466c6167734465736372" .
-            "6970746f7212200a0770726963696e6718172001280b320f2e50726f6475" .
-            "637450726963696e6742320a1a696f2e626c6f6f6d626f782e736368656d" .
-            "612e70726f64756374420d466c6f77657250726f6475637448015000f801" .
-            "01620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Structs/FlagsDescriptor.php b/languages/php/GPBMetadata/Structs/FlagsDescriptor.php
deleted file mode 100644
index 7e73d09..0000000
--- a/languages/php/GPBMetadata/Structs/FlagsDescriptor.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-namespace GPBMetadata\Structs;
-
-class FlagsDescriptor
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a93030a1d737472756374732f466c61677344657363726970746f722e70" .
-            "726f746f223d0a1050726f64756374466c616756616c7565121a0a047479" .
-            "706518012001280e320c2e50726f64756374466c6167120d0a0576616c75" .
-            "6518022001280822320a0e50726f64756374466c616773657412200a0566" .
-            "6c61677318012003280b32112e50726f64756374466c616756616c756522" .
-            "6a0a0f466c61677344657363726970746f72120f0a0776697369626c6518" .
-            "0120012808120f0a077072656d69756d18022001280812100a0866656174" .
-            "7572656418032001280812120a0a6c6173746368616e6365180420012808" .
-            "120f0a07696e686f7573651805200128082a520a0b50726f64756374466c" .
-            "6167120b0a0756495349424c451000120b0a075052454d49554d1001120c" .
-            "0a0846454154555245441002120e0a0a4c4153544348414e43451003120b" .
-            "0a07494e484f555345100442370a21696f2e626c6f6f6d626f782e736368" .
-            "656d612e70726f647563742e737472756374420b42617365537472756374" .
-            "7348015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Structs/Genetics.php b/languages/php/GPBMetadata/Structs/Genetics.php
deleted file mode 100644
index cd2565a..0000000
--- a/languages/php/GPBMetadata/Structs/Genetics.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Genetics.proto
-
-namespace GPBMetadata\Structs;
-
-class Genetics
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Content\Name::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a95010a16737472756374732f47656e65746963732e70726f746f22360a" .
-            "0847656e657469637312130a046d616c6518012001280b32052e4e616d65" .
-            "12150a0666656d616c6518022001280b32052e4e616d65423b0a21696f2e" .
-            "626c6f6f6d626f782e736368656d612e70726f647563742e737472756374" .
-            "420f47656e65746963735374727563747348015001f80101620670726f74" .
-            "6f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Structs/Grow.php b/languages/php/GPBMetadata/Structs/Grow.php
deleted file mode 100644
index 24d2127..0000000
--- a/languages/php/GPBMetadata/Structs/Grow.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Grow.proto
-
-namespace GPBMetadata\Structs;
-
-class Grow
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a94010a12737472756374732f47726f772e70726f746f2a3c0a0447726f" .
-            "77120b0a0747454e455249431000120a0a06494e444f4f521001120e0a0a" .
-            "475245454e484f5553451002120b0a074f5554444f4f52100342380a2169" .
-            "6f2e626c6f6f6d626f782e736368656d612e70726f647563742e73747275" .
-            "6374420c4d6174657269616c47726f7748015001f80101620670726f746f" .
-            "33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Structs/Pricing/PricingDescriptor.php b/languages/php/GPBMetadata/Structs/Pricing/PricingDescriptor.php
deleted file mode 100644
index 9451226..0000000
--- a/languages/php/GPBMetadata/Structs/Pricing/PricingDescriptor.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-namespace GPBMetadata\Structs\Pricing;
-
-class PricingDescriptor
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Structs\Pricing\SaleDescriptor::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0a94070a27737472756374732f70726963696e672f50726963696e674465" .
-            "7363726970746f722e70726f746f223d0a1750726963696e675469657241" .
-            "7661696c6162696c697479120f0a076f6666657265641801200128081211" .
-            "0a09617661696c61626c65180220012808227a0a15556e69745072696369" .
-            "6e6744657363726970746f7212130a0b70726963655f76616c7565180120" .
-            "01280212280a0673746174757318022001280b32182e50726963696e6754" .
-            "696572417661696c6162696c69747912220a09646973636f756e74731803" .
-            "2003280b320f2e53616c6544657363726970746f72227c0a195765696768" .
-            "74656450726963696e6744657363726970746f7212220a06776569676874" .
-            "18012001280e32122e50726963696e675765696768745469657212240a04" .
-            "7469657218022001280b32162e556e697450726963696e67446573637269" .
-            "70746f7212150a0d776569676874496e4772616d73180320012802221a0a" .
-            "184672656562696550726963696e6744657363726970746f7222af010a11" .
-            "50726963696e6744657363726970746f72121a0a04747970651801200128" .
-            "0e320c2e50726963696e675479706512240a04756e697418142001280b32" .
-            "162e556e697450726963696e6744657363726970746f72122c0a08776569" .
-            "676874656418152001280b321a2e576569676874656450726963696e6744" .
-            "657363726970746f72122a0a076672656562696518162001280b32192e46" .
-            "72656562696550726963696e6744657363726970746f72225a0a0e50726f" .
-            "6475637450726963696e6712220a09646973636f756e747318012003280b" .
-            "320f2e53616c6544657363726970746f7212240a086d616e696665737418" .
-            "022003280b32122e50726963696e6744657363726970746f722a320a0b50" .
-            "726963696e675479706512080a04554e49541000120c0a08574549474854" .
-            "45441001120b0a074652454542494510022a89010a1150726963696e6757" .
-            "65696768745469657212090a054f54484552100012080a044752414d1001" .
-            "120c0a0848414c464752414d1002120f0a0b515541525445524752414d10" .
-            "0312070a034455421004120a0a064549474854481005120b0a0751554152" .
-            "544552100612080a0448414c46100712090a054f554e4345100812090a05" .
-            "504f554e441009423e0a21696f2e626c6f6f6d626f782e736368656d612e" .
-            "70726f647563742e737472756374421250726f6475637450726963696e67" .
-            "5370656348015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Structs/Pricing/SaleDescriptor.php b/languages/php/GPBMetadata/Structs/Pricing/SaleDescriptor.php
deleted file mode 100644
index 1f2d195..0000000
--- a/languages/php/GPBMetadata/Structs/Pricing/SaleDescriptor.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/SaleDescriptor.proto
-
-namespace GPBMetadata\Structs\Pricing;
-
-class SaleDescriptor
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ae8020a24737472756374732f70726963696e672f53616c654465736372" .
-            "6970746f722e70726f746f22c7010a0e53616c6544657363726970746f72" .
-            "12170a047479706518012001280e32092e53616c655479706512110a0965" .
-            "666665637469766518022001280412120a0a65787069726174696f6e1803" .
-            "2001280412190a1170657263656e746167655f616d6f756e741814200128" .
-            "0d12140a0c626f676f5f7472696767657218152001280d12130a0b626f67" .
-            "6f5f72657761726418162001280d12170a0f6c6f79616c74795f74726967" .
-            "67657218172001280d12160a0e6c6f79616c74795f726577617264181820" .
-            "01280d2a310a0853616c6554797065120e0a0a50455243454e5441474510" .
-            "0012080a04424f474f1001120b0a074c4f59414c54591002423b0a21696f" .
-            "2e626c6f6f6d626f782e736368656d612e70726f647563742e7374727563" .
-            "74420f50726f64756374446973636f756e7448015001f80101620670726f" .
-            "746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/GPBMetadata/Structs/Species.php b/languages/php/GPBMetadata/Structs/Species.php
deleted file mode 100644
index 18fa270..0000000
--- a/languages/php/GPBMetadata/Structs/Species.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Species.proto
-
-namespace GPBMetadata\Structs;
-
-class Species
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ac2010a15737472756374732f537065636965732e70726f746f2a640a07" .
-            "53706563696573120f0a0b554e5350454349464945441000120a0a065341" .
-            "54495641100112110a0d4859425249445f5341544956411002120a0a0648" .
-            "5942524944100312110a0d4859425249445f494e444943411004120a0a06" .
-            "494e444943411005423b0a21696f2e626c6f6f6d626f782e736368656d61" .
-            "2e70726f647563742e737472756374420f4d6174657269616c5370656369" .
-            "657348015001f80101620670726f746f33"
-        ));
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/languages/php/Genetics.php b/languages/php/Genetics.php
deleted file mode 100644
index 61d87c8..0000000
--- a/languages/php/Genetics.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Genetics.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Genetics</code>
- */
-class Genetics extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.Name male = 1;</code>
-     */
-    private $male = null;
-    /**
-     * Generated from protobuf field <code>.Name female = 2;</code>
-     */
-    private $female = null;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Genetics::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.Name male = 1;</code>
-     * @return \Name
-     */
-    public function getMale()
-    {
-        return $this->male;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Name male = 1;</code>
-     * @param \Name $var
-     * @return $this
-     */
-    public function setMale($var)
-    {
-        GPBUtil::checkMessage($var, \Name::class);
-        $this->male = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Name female = 2;</code>
-     * @return \Name
-     */
-    public function getFemale()
-    {
-        return $this->female;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Name female = 2;</code>
-     * @param \Name $var
-     * @return $this
-     */
-    public function setFemale($var)
-    {
-        GPBUtil::checkMessage($var, \Name::class);
-        $this->female = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/Grow.php b/languages/php/Grow.php
deleted file mode 100644
index 2f40ffd..0000000
--- a/languages/php/Grow.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Grow.proto
-
-/**
- * Protobuf enum <code>Grow</code>
- */
-class Grow
-{
-    /**
-     * Generated from protobuf enum <code>GENERIC = 0;</code>
-     */
-    const GENERIC = 0;
-    /**
-     * Generated from protobuf enum <code>INDOOR = 1;</code>
-     */
-    const INDOOR = 1;
-    /**
-     * Generated from protobuf enum <code>GREENHOUSE = 2;</code>
-     */
-    const GREENHOUSE = 2;
-    /**
-     * Generated from protobuf enum <code>OUTDOOR = 3;</code>
-     */
-    const OUTDOOR = 3;
-}
-
diff --git a/languages/php/ImageType.php b/languages/php/ImageType.php
deleted file mode 100644
index 8eaa8ab..0000000
--- a/languages/php/ImageType.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Media Type: Images -- //
- *
- * Generated from protobuf message <code>ImageType</code>
- */
-class ImageType extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.ImageType.ImageKind kind = 1;</code>
-     */
-    private $kind = 0;
-
-    public function __construct() {
-        \GPBMetadata\Media\MediaType::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.ImageType.ImageKind kind = 1;</code>
-     * @return int
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ImageType.ImageKind kind = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setKind($var)
-    {
-        GPBUtil::checkEnum($var, \ImageType_ImageKind::class);
-        $this->kind = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ImageType_ImageKind.php b/languages/php/ImageType_ImageKind.php
deleted file mode 100644
index a6dbfd1..0000000
--- a/languages/php/ImageType_ImageKind.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-/**
- * Protobuf enum <code>ImageType\ImageKind</code>
- */
-class ImageType_ImageKind
-{
-    /**
-     * Generated from protobuf enum <code>PNG = 0;</code>
-     */
-    const PNG = 0;
-    /**
-     * Generated from protobuf enum <code>JPG = 1;</code>
-     */
-    const JPG = 1;
-    /**
-     * Generated from protobuf enum <code>GIF = 2;</code>
-     */
-    const GIF = 2;
-    /**
-     * Generated from protobuf enum <code>SVG = 3;</code>
-     */
-    const SVG = 3;
-    /**
-     * Generated from protobuf enum <code>WEBP = 4;</code>
-     */
-    const WEBP = 4;
-}
-
diff --git a/languages/php/Language.php b/languages/php/Language.php
deleted file mode 100644
index ede8371..0000000
--- a/languages/php/Language.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Language.proto
-
-/**
- * Protobuf enum <code>Language</code>
- */
-class Language
-{
-    /**
-     * Generated from protobuf enum <code>ENGLISH = 0;</code>
-     */
-    const ENGLISH = 0;
-    /**
-     * Generated from protobuf enum <code>SPANISH = 1;</code>
-     */
-    const SPANISH = 1;
-    /**
-     * Generated from protobuf enum <code>FRENCH = 2;</code>
-     */
-    const FRENCH = 2;
-}
-
diff --git a/languages/php/MaterialsData.php b/languages/php/MaterialsData.php
deleted file mode 100644
index 1401a17..0000000
--- a/languages/php/MaterialsData.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/MaterialsData.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>MaterialsData</code>
- */
-class MaterialsData extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>repeated string ingredients = 1;</code>
-     */
-    private $ingredients;
-    /**
-     * Generated from protobuf field <code>.Grow grow = 2;</code>
-     */
-    private $grow = 0;
-    /**
-     * Generated from protobuf field <code>.Species species = 3;</code>
-     */
-    private $species = 0;
-    /**
-     * Generated from protobuf field <code>.Genetics genetics = 4;</code>
-     */
-    private $genetics = null;
-
-    public function __construct() {
-        \GPBMetadata\Content\MaterialsData::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated string ingredients = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getIngredients()
-    {
-        return $this->ingredients;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated string ingredients = 1;</code>
-     * @param string[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setIngredients($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->ingredients = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Grow grow = 2;</code>
-     * @return int
-     */
-    public function getGrow()
-    {
-        return $this->grow;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Grow grow = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setGrow($var)
-    {
-        GPBUtil::checkEnum($var, \Grow::class);
-        $this->grow = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Species species = 3;</code>
-     * @return int
-     */
-    public function getSpecies()
-    {
-        return $this->species;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Species species = 3;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setSpecies($var)
-    {
-        GPBUtil::checkEnum($var, \Species::class);
-        $this->species = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Genetics genetics = 4;</code>
-     * @return \Genetics
-     */
-    public function getGenetics()
-    {
-        return $this->genetics;
-    }
-
-    /**
-     * Generated from protobuf field <code>.Genetics genetics = 4;</code>
-     * @param \Genetics $var
-     * @return $this
-     */
-    public function setGenetics($var)
-    {
-        GPBUtil::checkMessage($var, \Genetics::class);
-        $this->genetics = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/MediaItem.php b/languages/php/MediaItem.php
deleted file mode 100644
index 1fae8e9..0000000
--- a/languages/php/MediaItem.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaItem.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>MediaItem</code>
- */
-class MediaItem extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.MediaKey key = 1;</code>
-     */
-    private $key = null;
-    /**
-     * Generated from protobuf field <code>.MediaType type = 2;</code>
-     */
-    private $type = null;
-    /**
-     * Generated from protobuf field <code>string name = 3;</code>
-     */
-    private $name = '';
-
-    public function __construct() {
-        \GPBMetadata\Media\MediaItem::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.MediaKey key = 1;</code>
-     * @return \MediaKey
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Generated from protobuf field <code>.MediaKey key = 1;</code>
-     * @param \MediaKey $var
-     * @return $this
-     */
-    public function setKey($var)
-    {
-        GPBUtil::checkMessage($var, \MediaKey::class);
-        $this->key = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.MediaType type = 2;</code>
-     * @return \MediaType
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.MediaType type = 2;</code>
-     * @param \MediaType $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkMessage($var, \MediaType::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>string name = 3;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Generated from protobuf field <code>string name = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/MediaKey.php b/languages/php/MediaKey.php
deleted file mode 100644
index ce336c5..0000000
--- a/languages/php/MediaKey.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaKey.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>MediaKey</code>
- */
-class MediaKey extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>string id = 1;</code>
-     */
-    private $id = '';
-
-    public function __construct() {
-        \GPBMetadata\Media\MediaKey::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>string id = 1;</code>
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Generated from protobuf field <code>string id = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setId($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->id = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/MediaType.php b/languages/php/MediaType.php
deleted file mode 100644
index 1b4f985..0000000
--- a/languages/php/MediaType.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Media Type: Top-level -- //
- *
- * Generated from protobuf message <code>MediaType</code>
- */
-class MediaType extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.MediaType.Kind kind = 1;</code>
-     */
-    private $kind = 0;
-    /**
-     * Generated from protobuf field <code>.ImageType image_type = 101;</code>
-     */
-    private $image_type = null;
-    /**
-     * Generated from protobuf field <code>.DocumentType document_type = 201;</code>
-     */
-    private $document_type = null;
-    /**
-     * Generated from protobuf field <code>.VideoType video_type = 301;</code>
-     */
-    private $video_type = null;
-
-    public function __construct() {
-        \GPBMetadata\Media\MediaType::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.MediaType.Kind kind = 1;</code>
-     * @return int
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
-
-    /**
-     * Generated from protobuf field <code>.MediaType.Kind kind = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setKind($var)
-    {
-        GPBUtil::checkEnum($var, \MediaType_Kind::class);
-        $this->kind = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ImageType image_type = 101;</code>
-     * @return \ImageType
-     */
-    public function getImageType()
-    {
-        return $this->image_type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ImageType image_type = 101;</code>
-     * @param \ImageType $var
-     * @return $this
-     */
-    public function setImageType($var)
-    {
-        GPBUtil::checkMessage($var, \ImageType::class);
-        $this->image_type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.DocumentType document_type = 201;</code>
-     * @return \DocumentType
-     */
-    public function getDocumentType()
-    {
-        return $this->document_type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.DocumentType document_type = 201;</code>
-     * @param \DocumentType $var
-     * @return $this
-     */
-    public function setDocumentType($var)
-    {
-        GPBUtil::checkMessage($var, \DocumentType::class);
-        $this->document_type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.VideoType video_type = 301;</code>
-     * @return \VideoType
-     */
-    public function getVideoType()
-    {
-        return $this->video_type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.VideoType video_type = 301;</code>
-     * @param \VideoType $var
-     * @return $this
-     */
-    public function setVideoType($var)
-    {
-        GPBUtil::checkMessage($var, \VideoType::class);
-        $this->video_type = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/MediaType_Kind.php b/languages/php/MediaType_Kind.php
deleted file mode 100644
index 1031752..0000000
--- a/languages/php/MediaType_Kind.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-/**
- * Protobuf enum <code>MediaType\Kind</code>
- */
-class MediaType_Kind
-{
-    /**
-     * Generated from protobuf enum <code>LINK = 0;</code>
-     */
-    const LINK = 0;
-    /**
-     * Generated from protobuf enum <code>IMAGE = 1;</code>
-     */
-    const IMAGE = 1;
-    /**
-     * Generated from protobuf enum <code>DOCUMENT = 2;</code>
-     */
-    const DOCUMENT = 2;
-    /**
-     * Generated from protobuf enum <code>VIDEO = 3;</code>
-     */
-    const VIDEO = 3;
-}
-
diff --git a/languages/php/Name.php b/languages/php/Name.php
deleted file mode 100644
index e36209c..0000000
--- a/languages/php/Name.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Name.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>Name</code>
- */
-class Name extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * basic name
-     *
-     * Generated from protobuf field <code>string primary = 1;</code>
-     */
-    private $primary = '';
-    /**
-     * display name
-     *
-     * Generated from protobuf field <code>string display = 2;</code>
-     */
-    private $display = '';
-
-    public function __construct() {
-        \GPBMetadata\Content\Name::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * basic name
-     *
-     * Generated from protobuf field <code>string primary = 1;</code>
-     * @return string
-     */
-    public function getPrimary()
-    {
-        return $this->primary;
-    }
-
-    /**
-     * basic name
-     *
-     * Generated from protobuf field <code>string primary = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setPrimary($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->primary = $var;
-
-        return $this;
-    }
-
-    /**
-     * display name
-     *
-     * Generated from protobuf field <code>string display = 2;</code>
-     * @return string
-     */
-    public function getDisplay()
-    {
-        return $this->display;
-    }
-
-    /**
-     * display name
-     *
-     * Generated from protobuf field <code>string display = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setDisplay($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->display = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/PricingDescriptor.php b/languages/php/PricingDescriptor.php
deleted file mode 100644
index ad849c0..0000000
--- a/languages/php/PricingDescriptor.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Pricing: Main Descriptor
- *
- * Generated from protobuf message <code>PricingDescriptor</code>
- */
-class PricingDescriptor extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.PricingType type = 1;</code>
-     */
-    private $type = 0;
-    /**
-     * -- descriptors
-     *
-     * Generated from protobuf field <code>.UnitPricingDescriptor unit = 20;</code>
-     */
-    private $unit = null;
-    /**
-     * Generated from protobuf field <code>.WeightedPricingDescriptor weighted = 21;</code>
-     */
-    private $weighted = null;
-    /**
-     * Generated from protobuf field <code>.FreebiePricingDescriptor freebie = 22;</code>
-     */
-    private $freebie = null;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.PricingType type = 1;</code>
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.PricingType type = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkEnum($var, \PricingType::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * -- descriptors
-     *
-     * Generated from protobuf field <code>.UnitPricingDescriptor unit = 20;</code>
-     * @return \UnitPricingDescriptor
-     */
-    public function getUnit()
-    {
-        return $this->unit;
-    }
-
-    /**
-     * -- descriptors
-     *
-     * Generated from protobuf field <code>.UnitPricingDescriptor unit = 20;</code>
-     * @param \UnitPricingDescriptor $var
-     * @return $this
-     */
-    public function setUnit($var)
-    {
-        GPBUtil::checkMessage($var, \UnitPricingDescriptor::class);
-        $this->unit = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.WeightedPricingDescriptor weighted = 21;</code>
-     * @return \WeightedPricingDescriptor
-     */
-    public function getWeighted()
-    {
-        return $this->weighted;
-    }
-
-    /**
-     * Generated from protobuf field <code>.WeightedPricingDescriptor weighted = 21;</code>
-     * @param \WeightedPricingDescriptor $var
-     * @return $this
-     */
-    public function setWeighted($var)
-    {
-        GPBUtil::checkMessage($var, \WeightedPricingDescriptor::class);
-        $this->weighted = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.FreebiePricingDescriptor freebie = 22;</code>
-     * @return \FreebiePricingDescriptor
-     */
-    public function getFreebie()
-    {
-        return $this->freebie;
-    }
-
-    /**
-     * Generated from protobuf field <code>.FreebiePricingDescriptor freebie = 22;</code>
-     * @param \FreebiePricingDescriptor $var
-     * @return $this
-     */
-    public function setFreebie($var)
-    {
-        GPBUtil::checkMessage($var, \FreebiePricingDescriptor::class);
-        $this->freebie = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/PricingTierAvailability.php b/languages/php/PricingTierAvailability.php
deleted file mode 100644
index c1eac64..0000000
--- a/languages/php/PricingTierAvailability.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>PricingTierAvailability</code>
- */
-class PricingTierAvailability extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>bool offered = 1;</code>
-     */
-    private $offered = false;
-    /**
-     * Generated from protobuf field <code>bool available = 2;</code>
-     */
-    private $available = false;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>bool offered = 1;</code>
-     * @return bool
-     */
-    public function getOffered()
-    {
-        return $this->offered;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool offered = 1;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setOffered($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->offered = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool available = 2;</code>
-     * @return bool
-     */
-    public function getAvailable()
-    {
-        return $this->available;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool available = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setAvailable($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->available = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/PricingType.php b/languages/php/PricingType.php
deleted file mode 100644
index 58c84f3..0000000
--- a/languages/php/PricingType.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-/**
- * -- Pricing: Objects
- *
- * Protobuf enum <code>PricingType</code>
- */
-class PricingType
-{
-    /**
-     * Generated from protobuf enum <code>UNIT = 0;</code>
-     */
-    const UNIT = 0;
-    /**
-     * Generated from protobuf enum <code>WEIGHTED = 1;</code>
-     */
-    const WEIGHTED = 1;
-    /**
-     * Generated from protobuf enum <code>FREEBIE = 2;</code>
-     */
-    const FREEBIE = 2;
-}
-
diff --git a/languages/php/PricingWeightTier.php b/languages/php/PricingWeightTier.php
deleted file mode 100644
index a7adf2b..0000000
--- a/languages/php/PricingWeightTier.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-/**
- * Protobuf enum <code>PricingWeightTier</code>
- */
-class PricingWeightTier
-{
-    /**
-     * Generated from protobuf enum <code>OTHER = 0;</code>
-     */
-    const OTHER = 0;
-    /**
-     * Generated from protobuf enum <code>GRAM = 1;</code>
-     */
-    const GRAM = 1;
-    /**
-     * Generated from protobuf enum <code>HALFGRAM = 2;</code>
-     */
-    const HALFGRAM = 2;
-    /**
-     * Generated from protobuf enum <code>QUARTERGRAM = 3;</code>
-     */
-    const QUARTERGRAM = 3;
-    /**
-     * Generated from protobuf enum <code>DUB = 4;</code>
-     */
-    const DUB = 4;
-    /**
-     * Generated from protobuf enum <code>EIGHTH = 5;</code>
-     */
-    const EIGHTH = 5;
-    /**
-     * Generated from protobuf enum <code>QUARTER = 6;</code>
-     */
-    const QUARTER = 6;
-    /**
-     * Generated from protobuf enum <code>HALF = 7;</code>
-     */
-    const HALF = 7;
-    /**
-     * Generated from protobuf enum <code>OUNCE = 8;</code>
-     */
-    const OUNCE = 8;
-    /**
-     * Generated from protobuf enum <code>POUND = 9;</code>
-     */
-    const POUND = 9;
-}
-
diff --git a/languages/php/Product.php b/languages/php/Product.php
deleted file mode 100644
index d86b6d9..0000000
--- a/languages/php/Product.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: Product.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Product Type: Top-level -- //
- *
- * Generated from protobuf message <code>Product</code>
- */
-class Product extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.ProductKey key = 1;</code>
-     */
-    private $key = null;
-    /**
-     * Generated from protobuf field <code>.ProductType type = 2;</code>
-     */
-    private $type = null;
-    /**
-     * Generated from protobuf field <code>.google.protobuf.Any data = 3;</code>
-     */
-    private $data = null;
-
-    public function __construct() {
-        \GPBMetadata\Product::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductKey key = 1;</code>
-     * @return \ProductKey
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductKey key = 1;</code>
-     * @param \ProductKey $var
-     * @return $this
-     */
-    public function setKey($var)
-    {
-        GPBUtil::checkMessage($var, \ProductKey::class);
-        $this->key = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductType type = 2;</code>
-     * @return \ProductType
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductType type = 2;</code>
-     * @param \ProductType $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkMessage($var, \ProductType::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.google.protobuf.Any data = 3;</code>
-     * @return \Google\Protobuf\Any
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Generated from protobuf field <code>.google.protobuf.Any data = 3;</code>
-     * @param \Google\Protobuf\Any $var
-     * @return $this
-     */
-    public function setData($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Any::class);
-        $this->data = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ProductContent.php b/languages/php/ProductContent.php
deleted file mode 100644
index 32fa78c..0000000
--- a/languages/php/ProductContent.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/ProductContent.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>ProductContent</code>
- */
-class ProductContent extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * -- Basic Properties
-     *
-     * Generated from protobuf field <code>.Name name = 1;</code>
-     */
-    private $name = null;
-    /**
-     * narrative summary
-     *
-     * Generated from protobuf field <code>.Content summary = 2;</code>
-     */
-    private $summary = null;
-    /**
-     * product's brand
-     *
-     * Generated from protobuf field <code>.Brand brand = 3;</code>
-     */
-    private $brand = null;
-    /**
-     * -- Media
-     *
-     * Generated from protobuf field <code>repeated .MediaItem media = 20;</code>
-     */
-    private $media;
-    /**
-     * -- Extended Attributes
-     *
-     * Generated from protobuf field <code>.Content usage = 30;</code>
-     */
-    private $usage = null;
-    /**
-     * dosage advice
-     *
-     * Generated from protobuf field <code>.Content dosage = 31;</code>
-     */
-    private $dosage = null;
-    /**
-     * internal advice
-     *
-     * Generated from protobuf field <code>.Content advice = 32;</code>
-     */
-    private $advice = null;
-
-    public function __construct() {
-        \GPBMetadata\Content\ProductContent::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * -- Basic Properties
-     *
-     * Generated from protobuf field <code>.Name name = 1;</code>
-     * @return \Name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * -- Basic Properties
-     *
-     * Generated from protobuf field <code>.Name name = 1;</code>
-     * @param \Name $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkMessage($var, \Name::class);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * narrative summary
-     *
-     * Generated from protobuf field <code>.Content summary = 2;</code>
-     * @return \Content
-     */
-    public function getSummary()
-    {
-        return $this->summary;
-    }
-
-    /**
-     * narrative summary
-     *
-     * Generated from protobuf field <code>.Content summary = 2;</code>
-     * @param \Content $var
-     * @return $this
-     */
-    public function setSummary($var)
-    {
-        GPBUtil::checkMessage($var, \Content::class);
-        $this->summary = $var;
-
-        return $this;
-    }
-
-    /**
-     * product's brand
-     *
-     * Generated from protobuf field <code>.Brand brand = 3;</code>
-     * @return \Brand
-     */
-    public function getBrand()
-    {
-        return $this->brand;
-    }
-
-    /**
-     * product's brand
-     *
-     * Generated from protobuf field <code>.Brand brand = 3;</code>
-     * @param \Brand $var
-     * @return $this
-     */
-    public function setBrand($var)
-    {
-        GPBUtil::checkMessage($var, \Brand::class);
-        $this->brand = $var;
-
-        return $this;
-    }
-
-    /**
-     * -- Media
-     *
-     * Generated from protobuf field <code>repeated .MediaItem media = 20;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getMedia()
-    {
-        return $this->media;
-    }
-
-    /**
-     * -- Media
-     *
-     * Generated from protobuf field <code>repeated .MediaItem media = 20;</code>
-     * @param \MediaItem[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setMedia($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \MediaItem::class);
-        $this->media = $arr;
-
-        return $this;
-    }
-
-    /**
-     * -- Extended Attributes
-     *
-     * Generated from protobuf field <code>.Content usage = 30;</code>
-     * @return \Content
-     */
-    public function getUsage()
-    {
-        return $this->usage;
-    }
-
-    /**
-     * -- Extended Attributes
-     *
-     * Generated from protobuf field <code>.Content usage = 30;</code>
-     * @param \Content $var
-     * @return $this
-     */
-    public function setUsage($var)
-    {
-        GPBUtil::checkMessage($var, \Content::class);
-        $this->usage = $var;
-
-        return $this;
-    }
-
-    /**
-     * dosage advice
-     *
-     * Generated from protobuf field <code>.Content dosage = 31;</code>
-     * @return \Content
-     */
-    public function getDosage()
-    {
-        return $this->dosage;
-    }
-
-    /**
-     * dosage advice
-     *
-     * Generated from protobuf field <code>.Content dosage = 31;</code>
-     * @param \Content $var
-     * @return $this
-     */
-    public function setDosage($var)
-    {
-        GPBUtil::checkMessage($var, \Content::class);
-        $this->dosage = $var;
-
-        return $this;
-    }
-
-    /**
-     * internal advice
-     *
-     * Generated from protobuf field <code>.Content advice = 32;</code>
-     * @return \Content
-     */
-    public function getAdvice()
-    {
-        return $this->advice;
-    }
-
-    /**
-     * internal advice
-     *
-     * Generated from protobuf field <code>.Content advice = 32;</code>
-     * @param \Content $var
-     * @return $this
-     */
-    public function setAdvice($var)
-    {
-        GPBUtil::checkMessage($var, \Content::class);
-        $this->advice = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ProductFlag.php b/languages/php/ProductFlag.php
deleted file mode 100644
index 35de405..0000000
--- a/languages/php/ProductFlag.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-/**
- * Protobuf enum <code>ProductFlag</code>
- */
-class ProductFlag
-{
-    /**
-     * Generated from protobuf enum <code>VISIBLE = 0;</code>
-     */
-    const VISIBLE = 0;
-    /**
-     * Generated from protobuf enum <code>PREMIUM = 1;</code>
-     */
-    const PREMIUM = 1;
-    /**
-     * Generated from protobuf enum <code>FEATURED = 2;</code>
-     */
-    const FEATURED = 2;
-    /**
-     * Generated from protobuf enum <code>LASTCHANCE = 3;</code>
-     */
-    const LASTCHANCE = 3;
-    /**
-     * Generated from protobuf enum <code>INHOUSE = 4;</code>
-     */
-    const INHOUSE = 4;
-}
-
diff --git a/languages/php/ProductFlagValue.php b/languages/php/ProductFlagValue.php
deleted file mode 100644
index 855bb3c..0000000
--- a/languages/php/ProductFlagValue.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>ProductFlagValue</code>
- */
-class ProductFlagValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.ProductFlag type = 1;</code>
-     */
-    private $type = 0;
-    /**
-     * Generated from protobuf field <code>bool value = 2;</code>
-     */
-    private $value = false;
-
-    public function __construct() {
-        \GPBMetadata\Structs\FlagsDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductFlag type = 1;</code>
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductFlag type = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkEnum($var, \ProductFlag::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool value = 2;</code>
-     * @return bool
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Generated from protobuf field <code>bool value = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ProductFlagset.php b/languages/php/ProductFlagset.php
deleted file mode 100644
index f41d1b2..0000000
--- a/languages/php/ProductFlagset.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>ProductFlagset</code>
- */
-class ProductFlagset extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>repeated .ProductFlagValue flags = 1;</code>
-     */
-    private $flags;
-
-    public function __construct() {
-        \GPBMetadata\Structs\FlagsDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .ProductFlagValue flags = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getFlags()
-    {
-        return $this->flags;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .ProductFlagValue flags = 1;</code>
-     * @param \ProductFlagValue[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setFlags($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \ProductFlagValue::class);
-        $this->flags = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ProductKey.php b/languages/php/ProductKey.php
deleted file mode 100644
index b71f0e3..0000000
--- a/languages/php/ProductKey.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKey.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>ProductKey</code>
- */
-class ProductKey extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>string id = 1;</code>
-     */
-    private $id = '';
-
-    public function __construct() {
-        \GPBMetadata\Base\ProductKey::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>string id = 1;</code>
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Generated from protobuf field <code>string id = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setId($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->id = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ProductKind.php b/languages/php/ProductKind.php
deleted file mode 100644
index bf7a512..0000000
--- a/languages/php/ProductKind.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKind.proto
-
-/**
- * Protobuf enum <code>ProductKind</code>
- */
-class ProductKind
-{
-    /**
-     * Generated from protobuf enum <code>FLOWERS = 0;</code>
-     */
-    const FLOWERS = 0;
-    /**
-     * Generated from protobuf enum <code>EDIBLES = 1;</code>
-     */
-    const EDIBLES = 1;
-    /**
-     * Generated from protobuf enum <code>EXTRACTS = 2;</code>
-     */
-    const EXTRACTS = 2;
-    /**
-     * Generated from protobuf enum <code>PREROLLS = 3;</code>
-     */
-    const PREROLLS = 3;
-    /**
-     * Generated from protobuf enum <code>APOTHECARY = 4;</code>
-     */
-    const APOTHECARY = 4;
-    /**
-     * Generated from protobuf enum <code>CARTRIDGES = 5;</code>
-     */
-    const CARTRIDGES = 5;
-    /**
-     * Generated from protobuf enum <code>PLANTS = 6;</code>
-     */
-    const PLANTS = 6;
-    /**
-     * Generated from protobuf enum <code>MERCHANDISE = 7;</code>
-     */
-    const MERCHANDISE = 7;
-}
-
diff --git a/languages/php/ProductPricing.php b/languages/php/ProductPricing.php
deleted file mode 100644
index 8f5995a..0000000
--- a/languages/php/ProductPricing.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Pricing: Product-level Object
- *
- * Generated from protobuf message <code>ProductPricing</code>
- */
-class ProductPricing extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>repeated .SaleDescriptor discounts = 1;</code>
-     */
-    private $discounts;
-    /**
-     * Generated from protobuf field <code>repeated .PricingDescriptor manifest = 2;</code>
-     */
-    private $manifest;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .SaleDescriptor discounts = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getDiscounts()
-    {
-        return $this->discounts;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .SaleDescriptor discounts = 1;</code>
-     * @param \SaleDescriptor[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setDiscounts($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \SaleDescriptor::class);
-        $this->discounts = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .PricingDescriptor manifest = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getManifest()
-    {
-        return $this->manifest;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .PricingDescriptor manifest = 2;</code>
-     * @param \PricingDescriptor[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setManifest($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \PricingDescriptor::class);
-        $this->manifest = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/ProductType.php b/languages/php/ProductType.php
deleted file mode 100644
index d4c32a6..0000000
--- a/languages/php/ProductType.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductType.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Product Type: Top-level -- //
- *
- * Generated from protobuf message <code>ProductType</code>
- */
-class ProductType extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.ProductKind kind = 1;</code>
-     */
-    private $kind = 0;
-
-    public function __construct() {
-        \GPBMetadata\Base\ProductType::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductKind kind = 1;</code>
-     * @return int
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
-
-    /**
-     * Generated from protobuf field <code>.ProductKind kind = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setKind($var)
-    {
-        GPBUtil::checkEnum($var, \ProductKind::class);
-        $this->kind = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/SaleDescriptor.php b/languages/php/SaleDescriptor.php
deleted file mode 100644
index 2ea6e92..0000000
--- a/languages/php/SaleDescriptor.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/SaleDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>SaleDescriptor</code>
- */
-class SaleDescriptor extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * sale metadata
-     *
-     * Generated from protobuf field <code>.SaleType type = 1;</code>
-     */
-    private $type = 0;
-    /**
-     * Generated from protobuf field <code>uint64 effective = 2;</code>
-     */
-    private $effective = 0;
-    /**
-     * Generated from protobuf field <code>uint64 expiration = 3;</code>
-     */
-    private $expiration = 0;
-    /**
-     * sale amount and trigger properties
-     *
-     * Generated from protobuf field <code>uint32 percentage_amount = 20;</code>
-     */
-    private $percentage_amount = 0;
-    /**
-     * Generated from protobuf field <code>uint32 bogo_trigger = 21;</code>
-     */
-    private $bogo_trigger = 0;
-    /**
-     * Generated from protobuf field <code>uint32 bogo_reward = 22;</code>
-     */
-    private $bogo_reward = 0;
-    /**
-     * Generated from protobuf field <code>uint32 loyalty_trigger = 23;</code>
-     */
-    private $loyalty_trigger = 0;
-    /**
-     * Generated from protobuf field <code>uint32 loyalty_reward = 24;</code>
-     */
-    private $loyalty_reward = 0;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\SaleDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * sale metadata
-     *
-     * Generated from protobuf field <code>.SaleType type = 1;</code>
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * sale metadata
-     *
-     * Generated from protobuf field <code>.SaleType type = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkEnum($var, \SaleType::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint64 effective = 2;</code>
-     * @return int|string
-     */
-    public function getEffective()
-    {
-        return $this->effective;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint64 effective = 2;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setEffective($var)
-    {
-        GPBUtil::checkUint64($var);
-        $this->effective = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint64 expiration = 3;</code>
-     * @return int|string
-     */
-    public function getExpiration()
-    {
-        return $this->expiration;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint64 expiration = 3;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setExpiration($var)
-    {
-        GPBUtil::checkUint64($var);
-        $this->expiration = $var;
-
-        return $this;
-    }
-
-    /**
-     * sale amount and trigger properties
-     *
-     * Generated from protobuf field <code>uint32 percentage_amount = 20;</code>
-     * @return int
-     */
-    public function getPercentageAmount()
-    {
-        return $this->percentage_amount;
-    }
-
-    /**
-     * sale amount and trigger properties
-     *
-     * Generated from protobuf field <code>uint32 percentage_amount = 20;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setPercentageAmount($var)
-    {
-        GPBUtil::checkUint32($var);
-        $this->percentage_amount = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 bogo_trigger = 21;</code>
-     * @return int
-     */
-    public function getBogoTrigger()
-    {
-        return $this->bogo_trigger;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 bogo_trigger = 21;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setBogoTrigger($var)
-    {
-        GPBUtil::checkUint32($var);
-        $this->bogo_trigger = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 bogo_reward = 22;</code>
-     * @return int
-     */
-    public function getBogoReward()
-    {
-        return $this->bogo_reward;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 bogo_reward = 22;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setBogoReward($var)
-    {
-        GPBUtil::checkUint32($var);
-        $this->bogo_reward = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 loyalty_trigger = 23;</code>
-     * @return int
-     */
-    public function getLoyaltyTrigger()
-    {
-        return $this->loyalty_trigger;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 loyalty_trigger = 23;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setLoyaltyTrigger($var)
-    {
-        GPBUtil::checkUint32($var);
-        $this->loyalty_trigger = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 loyalty_reward = 24;</code>
-     * @return int
-     */
-    public function getLoyaltyReward()
-    {
-        return $this->loyalty_reward;
-    }
-
-    /**
-     * Generated from protobuf field <code>uint32 loyalty_reward = 24;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setLoyaltyReward($var)
-    {
-        GPBUtil::checkUint32($var);
-        $this->loyalty_reward = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/SaleType.php b/languages/php/SaleType.php
deleted file mode 100644
index 195e65f..0000000
--- a/languages/php/SaleType.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/SaleDescriptor.proto
-
-/**
- * Protobuf enum <code>SaleType</code>
- */
-class SaleType
-{
-    /**
-     * Generated from protobuf enum <code>PERCENTAGE = 0;</code>
-     */
-    const PERCENTAGE = 0;
-    /**
-     * Generated from protobuf enum <code>BOGO = 1;</code>
-     */
-    const BOGO = 1;
-    /**
-     * Generated from protobuf enum <code>LOYALTY = 2;</code>
-     */
-    const LOYALTY = 2;
-}
-
diff --git a/languages/php/Species.php b/languages/php/Species.php
deleted file mode 100644
index a24250b..0000000
--- a/languages/php/Species.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Species.proto
-
-/**
- * Protobuf enum <code>Species</code>
- */
-class Species
-{
-    /**
-     * Generated from protobuf enum <code>UNSPECIFIED = 0;</code>
-     */
-    const UNSPECIFIED = 0;
-    /**
-     * Generated from protobuf enum <code>SATIVA = 1;</code>
-     */
-    const SATIVA = 1;
-    /**
-     * Generated from protobuf enum <code>HYBRID_SATIVA = 2;</code>
-     */
-    const HYBRID_SATIVA = 2;
-    /**
-     * Generated from protobuf enum <code>HYBRID = 3;</code>
-     */
-    const HYBRID = 3;
-    /**
-     * Generated from protobuf enum <code>HYBRID_INDICA = 4;</code>
-     */
-    const HYBRID_INDICA = 4;
-    /**
-     * Generated from protobuf enum <code>INDICA = 5;</code>
-     */
-    const INDICA = 5;
-}
-
diff --git a/languages/php/UnitPricingDescriptor.php b/languages/php/UnitPricingDescriptor.php
deleted file mode 100644
index fd8856d..0000000
--- a/languages/php/UnitPricingDescriptor.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Pricing: Typed Descriptors
- *
- * Generated from protobuf message <code>UnitPricingDescriptor</code>
- */
-class UnitPricingDescriptor extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>float price_value = 1;</code>
-     */
-    private $price_value = 0.0;
-    /**
-     * Generated from protobuf field <code>.PricingTierAvailability status = 2;</code>
-     */
-    private $status = null;
-    /**
-     * Generated from protobuf field <code>repeated .SaleDescriptor discounts = 3;</code>
-     */
-    private $discounts;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>float price_value = 1;</code>
-     * @return float
-     */
-    public function getPriceValue()
-    {
-        return $this->price_value;
-    }
-
-    /**
-     * Generated from protobuf field <code>float price_value = 1;</code>
-     * @param float $var
-     * @return $this
-     */
-    public function setPriceValue($var)
-    {
-        GPBUtil::checkFloat($var);
-        $this->price_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.PricingTierAvailability status = 2;</code>
-     * @return \PricingTierAvailability
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Generated from protobuf field <code>.PricingTierAvailability status = 2;</code>
-     * @param \PricingTierAvailability $var
-     * @return $this
-     */
-    public function setStatus($var)
-    {
-        GPBUtil::checkMessage($var, \PricingTierAvailability::class);
-        $this->status = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .SaleDescriptor discounts = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getDiscounts()
-    {
-        return $this->discounts;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .SaleDescriptor discounts = 3;</code>
-     * @param \SaleDescriptor[]|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setDiscounts($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \SaleDescriptor::class);
-        $this->discounts = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/VideoType.php b/languages/php/VideoType.php
deleted file mode 100644
index cd6df6e..0000000
--- a/languages/php/VideoType.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * -- Media Type: Video -- //
- *
- * Generated from protobuf message <code>VideoType</code>
- */
-class VideoType extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.VideoType.VideoKind kind = 1;</code>
-     */
-    private $kind = 0;
-
-    public function __construct() {
-        \GPBMetadata\Media\MediaType::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.VideoType.VideoKind kind = 1;</code>
-     * @return int
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
-
-    /**
-     * Generated from protobuf field <code>.VideoType.VideoKind kind = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setKind($var)
-    {
-        GPBUtil::checkEnum($var, \VideoType_VideoKind::class);
-        $this->kind = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/php/VideoType_VideoKind.php b/languages/php/VideoType_VideoKind.php
deleted file mode 100644
index 69140d6..0000000
--- a/languages/php/VideoType_VideoKind.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-/**
- * Protobuf enum <code>VideoType\VideoKind</code>
- */
-class VideoType_VideoKind
-{
-    /**
-     * Generated from protobuf enum <code>MP4 = 0;</code>
-     */
-    const MP4 = 0;
-    /**
-     * Generated from protobuf enum <code>FLV = 1;</code>
-     */
-    const FLV = 1;
-    /**
-     * Generated from protobuf enum <code>HLS = 2;</code>
-     */
-    const HLS = 2;
-}
-
diff --git a/languages/php/WeightedPricingDescriptor.php b/languages/php/WeightedPricingDescriptor.php
deleted file mode 100644
index e3b7dfb..0000000
--- a/languages/php/WeightedPricingDescriptor.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>WeightedPricingDescriptor</code>
- */
-class WeightedPricingDescriptor extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>.PricingWeightTier weight = 1;</code>
-     */
-    private $weight = 0;
-    /**
-     * Generated from protobuf field <code>.UnitPricingDescriptor tier = 2;</code>
-     */
-    private $tier = null;
-    /**
-     * Generated from protobuf field <code>float weightInGrams = 3;</code>
-     */
-    private $weightInGrams = 0.0;
-
-    public function __construct() {
-        \GPBMetadata\Structs\Pricing\PricingDescriptor::initOnce();
-        parent::__construct();
-    }
-
-    /**
-     * Generated from protobuf field <code>.PricingWeightTier weight = 1;</code>
-     * @return int
-     */
-    public function getWeight()
-    {
-        return $this->weight;
-    }
-
-    /**
-     * Generated from protobuf field <code>.PricingWeightTier weight = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setWeight($var)
-    {
-        GPBUtil::checkEnum($var, \PricingWeightTier::class);
-        $this->weight = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>.UnitPricingDescriptor tier = 2;</code>
-     * @return \UnitPricingDescriptor
-     */
-    public function getTier()
-    {
-        return $this->tier;
-    }
-
-    /**
-     * Generated from protobuf field <code>.UnitPricingDescriptor tier = 2;</code>
-     * @param \UnitPricingDescriptor $var
-     * @return $this
-     */
-    public function setTier($var)
-    {
-        GPBUtil::checkMessage($var, \UnitPricingDescriptor::class);
-        $this->tier = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>float weightInGrams = 3;</code>
-     * @return float
-     */
-    public function getWeightInGrams()
-    {
-        return $this->weightInGrams;
-    }
-
-    /**
-     * Generated from protobuf field <code>float weightInGrams = 3;</code>
-     * @param float $var
-     * @return $this
-     */
-    public function setWeightInGrams($var)
-    {
-        GPBUtil::checkFloat($var);
-        $this->weightInGrams = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/languages/python/Product_pb2.py b/languages/python/Product_pb2.py
deleted file mode 100644
index 38ae925..0000000
--- a/languages/python/Product_pb2.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: Product.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from base import ProductKey_pb2 as base_dot_ProductKey__pb2
-from base import ProductType_pb2 as base_dot_ProductType__pb2
-from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='Product.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\rProduct.proto\x1a\x15\x62\x61se/ProductKey.proto\x1a\x16\x62\x61se/ProductType.proto\x1a\x19google/protobuf/any.proto\"c\n\x07Product\x12\x18\n\x03key\x18\x01 \x01(\x0b\x32\x0b.ProductKey\x12\x1a\n\x04type\x18\x02 \x01(\x0b\x32\x0c.ProductType\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyB-\n\x17io.bloombox.schema.baseB\x0b\x42\x61seProductH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[base_dot_ProductKey__pb2.DESCRIPTOR,base_dot_ProductType__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,])
-
-
-
-
-_PRODUCT = _descriptor.Descriptor(
-  name='Product',
-  full_name='Product',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='key', full_name='Product.key', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='type', full_name='Product.type', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='data', full_name='Product.data', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=91,
-  serialized_end=190,
-)
-
-_PRODUCT.fields_by_name['key'].message_type = base_dot_ProductKey__pb2._PRODUCTKEY
-_PRODUCT.fields_by_name['type'].message_type = base_dot_ProductType__pb2._PRODUCTTYPE
-_PRODUCT.fields_by_name['data'].message_type = google_dot_protobuf_dot_any__pb2._ANY
-DESCRIPTOR.message_types_by_name['Product'] = _PRODUCT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Product = _reflection.GeneratedProtocolMessageType('Product', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCT,
-  __module__ = 'Product_pb2'
-  # @@protoc_insertion_point(class_scope:Product)
-  ))
-_sym_db.RegisterMessage(Product)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseB\013BaseProductH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/base/Compression_pb2.py b/languages/python/base/Compression_pb2.py
deleted file mode 100644
index 72c3829..0000000
--- a/languages/python/base/Compression_pb2.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Compression.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='base/Compression.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x16\x62\x61se/Compression.proto\"Q\n\x0b\x43ompression\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x1f\n\x04type\x18\x02 \x01(\x0e\x32\x11.Compression.Type\"\x10\n\x04Type\x12\x08\n\x04GZIP\x10\x00\x42\x31\n\x17io.bloombox.schema.baseB\x0f\x42\x61seCompressionH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-
-
-_COMPRESSION_TYPE = _descriptor.EnumDescriptor(
-  name='Type',
-  full_name='Compression.Type',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='GZIP', index=0, number=0,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=91,
-  serialized_end=107,
-)
-_sym_db.RegisterEnumDescriptor(_COMPRESSION_TYPE)
-
-
-_COMPRESSION = _descriptor.Descriptor(
-  name='Compression',
-  full_name='Compression',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='enabled', full_name='Compression.enabled', index=0,
-      number=1, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='type', full_name='Compression.type', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-    _COMPRESSION_TYPE,
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=26,
-  serialized_end=107,
-)
-
-_COMPRESSION.fields_by_name['type'].enum_type = _COMPRESSION_TYPE
-_COMPRESSION_TYPE.containing_type = _COMPRESSION
-DESCRIPTOR.message_types_by_name['Compression'] = _COMPRESSION
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Compression = _reflection.GeneratedProtocolMessageType('Compression', (_message.Message,), dict(
-  DESCRIPTOR = _COMPRESSION,
-  __module__ = 'base.Compression_pb2'
-  # @@protoc_insertion_point(class_scope:Compression)
-  ))
-_sym_db.RegisterMessage(Compression)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseB\017BaseCompressionH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/base/Language_pb2.py b/languages/python/base/Language_pb2.py
deleted file mode 100644
index 6b5d9f0..0000000
--- a/languages/python/base/Language_pb2.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Language.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='base/Language.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x13\x62\x61se/Language.proto*0\n\x08Language\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\x0b\n\x07SPANISH\x10\x01\x12\n\n\x06\x46RENCH\x10\x02\x42.\n\x17io.bloombox.schema.baseB\x0c\x42\x61seLanguageH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-_LANGUAGE = _descriptor.EnumDescriptor(
-  name='Language',
-  full_name='Language',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='ENGLISH', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SPANISH', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='FRENCH', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=23,
-  serialized_end=71,
-)
-_sym_db.RegisterEnumDescriptor(_LANGUAGE)
-
-Language = enum_type_wrapper.EnumTypeWrapper(_LANGUAGE)
-ENGLISH = 0
-SPANISH = 1
-FRENCH = 2
-
-
-DESCRIPTOR.enum_types_by_name['Language'] = _LANGUAGE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseB\014BaseLanguageH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/base/ProductKey_pb2.py b/languages/python/base/ProductKey_pb2.py
deleted file mode 100644
index 262a10a..0000000
--- a/languages/python/base/ProductKey_pb2.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKey.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='base/ProductKey.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x15\x62\x61se/ProductKey.proto\"\x18\n\nProductKey\x12\n\n\x02id\x18\x01 \x01(\tB0\n\x17io.bloombox.schema.baseB\x0e\x42\x61seProductKeyH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-
-
-
-_PRODUCTKEY = _descriptor.Descriptor(
-  name='ProductKey',
-  full_name='ProductKey',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='id', full_name='ProductKey.id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=25,
-  serialized_end=49,
-)
-
-DESCRIPTOR.message_types_by_name['ProductKey'] = _PRODUCTKEY
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-ProductKey = _reflection.GeneratedProtocolMessageType('ProductKey', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCTKEY,
-  __module__ = 'base.ProductKey_pb2'
-  # @@protoc_insertion_point(class_scope:ProductKey)
-  ))
-_sym_db.RegisterMessage(ProductKey)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseB\016BaseProductKeyH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/base/ProductKind_pb2.py b/languages/python/base/ProductKind_pb2.py
deleted file mode 100644
index 04058a9..0000000
--- a/languages/python/base/ProductKind_pb2.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKind.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='base/ProductKind.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x16\x62\x61se/ProductKind.proto*\x80\x01\n\x0bProductKind\x12\x0b\n\x07\x46LOWERS\x10\x00\x12\x0b\n\x07\x45\x44IBLES\x10\x01\x12\x0c\n\x08\x45XTRACTS\x10\x02\x12\x0c\n\x08PREROLLS\x10\x03\x12\x0e\n\nAPOTHECARY\x10\x04\x12\x0e\n\nCARTRIDGES\x10\x05\x12\n\n\x06PLANTS\x10\x06\x12\x0f\n\x0bMERCHANDISE\x10\x07\x42\x31\n\x17io.bloombox.schema.baseB\x0f\x42\x61seProductKindH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-_PRODUCTKIND = _descriptor.EnumDescriptor(
-  name='ProductKind',
-  full_name='ProductKind',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='FLOWERS', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EDIBLES', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EXTRACTS', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='PREROLLS', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='APOTHECARY', index=4, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CARTRIDGES', index=5, number=5,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='PLANTS', index=6, number=6,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MERCHANDISE', index=7, number=7,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=27,
-  serialized_end=155,
-)
-_sym_db.RegisterEnumDescriptor(_PRODUCTKIND)
-
-ProductKind = enum_type_wrapper.EnumTypeWrapper(_PRODUCTKIND)
-FLOWERS = 0
-EDIBLES = 1
-EXTRACTS = 2
-PREROLLS = 3
-APOTHECARY = 4
-CARTRIDGES = 5
-PLANTS = 6
-MERCHANDISE = 7
-
-
-DESCRIPTOR.enum_types_by_name['ProductKind'] = _PRODUCTKIND
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseB\017BaseProductKindH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/base/ProductType_pb2.py b/languages/python/base/ProductType_pb2.py
deleted file mode 100644
index 91da63e..0000000
--- a/languages/python/base/ProductType_pb2.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductType.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from base import ProductKind_pb2 as base_dot_ProductKind__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='base/ProductType.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x16\x62\x61se/ProductType.proto\x1a\x16\x62\x61se/ProductKind.proto\")\n\x0bProductType\x12\x1a\n\x04kind\x18\x01 \x01(\x0e\x32\x0c.ProductKindB1\n\x17io.bloombox.schema.baseB\x0f\x42\x61seProductTypeH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[base_dot_ProductKind__pb2.DESCRIPTOR,])
-
-
-
-
-_PRODUCTTYPE = _descriptor.Descriptor(
-  name='ProductType',
-  full_name='ProductType',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='kind', full_name='ProductType.kind', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=50,
-  serialized_end=91,
-)
-
-_PRODUCTTYPE.fields_by_name['kind'].enum_type = base_dot_ProductKind__pb2._PRODUCTKIND
-DESCRIPTOR.message_types_by_name['ProductType'] = _PRODUCTTYPE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-ProductType = _reflection.GeneratedProtocolMessageType('ProductType', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCTTYPE,
-  __module__ = 'base.ProductType_pb2'
-  # @@protoc_insertion_point(class_scope:ProductType)
-  ))
-_sym_db.RegisterMessage(ProductType)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseB\017BaseProductTypeH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/base/Product_pb2.py b/languages/python/base/Product_pb2.py
deleted file mode 100644
index 33abcff..0000000
--- a/languages/python/base/Product_pb2.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Product.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from base import ProductKey_pb2 as base_dot_ProductKey__pb2
-from base import ProductType_pb2 as base_dot_ProductType__pb2
-from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='base/Product.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x12\x62\x61se/Product.proto\x1a\x15\x62\x61se/ProductKey.proto\x1a\x16\x62\x61se/ProductType.proto\x1a\x19google/protobuf/any.proto\"c\n\x07Product\x12\x18\n\x03key\x18\x01 \x01(\x0b\x32\x0b.ProductKey\x12\x1a\n\x04type\x18\x02 \x01(\x0b\x32\x0c.ProductType\x12\"\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyB\x1b\n\x17io.bloombox.schema.baseP\x01\x62\x06proto3')
-  ,
-  dependencies=[base_dot_ProductKey__pb2.DESCRIPTOR,base_dot_ProductType__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,])
-
-
-
-
-_PRODUCT = _descriptor.Descriptor(
-  name='Product',
-  full_name='Product',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='key', full_name='Product.key', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='type', full_name='Product.type', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='data', full_name='Product.data', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=96,
-  serialized_end=195,
-)
-
-_PRODUCT.fields_by_name['key'].message_type = base_dot_ProductKey__pb2._PRODUCTKEY
-_PRODUCT.fields_by_name['type'].message_type = base_dot_ProductType__pb2._PRODUCTTYPE
-_PRODUCT.fields_by_name['data'].message_type = google_dot_protobuf_dot_any__pb2._ANY
-DESCRIPTOR.message_types_by_name['Product'] = _PRODUCT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Product = _reflection.GeneratedProtocolMessageType('Product', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCT,
-  __module__ = 'base.Product_pb2'
-  # @@protoc_insertion_point(class_scope:Product)
-  ))
-_sym_db.RegisterMessage(Product)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027io.bloombox.schema.baseP\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/content/Brand_pb2.py b/languages/python/content/Brand_pb2.py
deleted file mode 100644
index 56bc1d4..0000000
--- a/languages/python/content/Brand_pb2.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Brand.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from content import Name_pb2 as content_dot_Name__pb2
-from content import Content_pb2 as content_dot_Content__pb2
-from media import MediaItem_pb2 as media_dot_MediaItem__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='content/Brand.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x13\x63ontent/Brand.proto\x1a\x12\x63ontent/Name.proto\x1a\x15\x63ontent/Content.proto\x1a\x15media/MediaItem.proto\"j\n\x05\x42rand\x12\x13\n\x04name\x18\x01 \x01(\x0b\x32\x05.Name\x12\x16\n\x06parent\x18\x02 \x01(\x0b\x32\x06.Brand\x12\x19\n\x07summary\x18\x03 \x01(\x0b\x32\x08.Content\x12\x19\n\x05media\x18\x14 \x03(\x0b\x32\n.MediaItemB1\n\x1aio.bloombox.schema.contentB\x0c\x42randContentH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[content_dot_Name__pb2.DESCRIPTOR,content_dot_Content__pb2.DESCRIPTOR,media_dot_MediaItem__pb2.DESCRIPTOR,])
-
-
-
-
-_BRAND = _descriptor.Descriptor(
-  name='Brand',
-  full_name='Brand',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='name', full_name='Brand.name', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='parent', full_name='Brand.parent', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='summary', full_name='Brand.summary', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='media', full_name='Brand.media', index=3,
-      number=20, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=89,
-  serialized_end=195,
-)
-
-_BRAND.fields_by_name['name'].message_type = content_dot_Name__pb2._NAME
-_BRAND.fields_by_name['parent'].message_type = _BRAND
-_BRAND.fields_by_name['summary'].message_type = content_dot_Content__pb2._CONTENT
-_BRAND.fields_by_name['media'].message_type = media_dot_MediaItem__pb2._MEDIAITEM
-DESCRIPTOR.message_types_by_name['Brand'] = _BRAND
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Brand = _reflection.GeneratedProtocolMessageType('Brand', (_message.Message,), dict(
-  DESCRIPTOR = _BRAND,
-  __module__ = 'content.Brand_pb2'
-  # @@protoc_insertion_point(class_scope:Brand)
-  ))
-_sym_db.RegisterMessage(Brand)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032io.bloombox.schema.contentB\014BrandContentH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/content/Content_pb2.py b/languages/python/content/Content_pb2.py
deleted file mode 100644
index 2a3ac44..0000000
--- a/languages/python/content/Content_pb2.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Content.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from base import Language_pb2 as base_dot_Language__pb2
-from base import Compression_pb2 as base_dot_Compression__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='content/Content.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x15\x63ontent/Content.proto\x1a\x13\x62\x61se/Language.proto\x1a\x16\x62\x61se/Compression.proto\"\xdc\x01\n\x07\x43ontent\x12\x1b\n\x04type\x18\x01 \x01(\x0e\x32\r.Content.Type\x12#\n\x08\x65ncoding\x18\x02 \x01(\x0e\x32\x11.Content.Encoding\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\x0c\x12\x1b\n\x08language\x18\x04 \x01(\x0e\x32\t.Language\x12!\n\x0b\x63ompression\x18\x05 \x01(\x0b\x32\x0c.Compression\"(\n\x04Type\x12\x08\n\x04TEXT\x10\x00\x12\x0c\n\x08MARKDOWN\x10\x01\x12\x08\n\x04HTML\x10\x02\"\x14\n\x08\x45ncoding\x12\x08\n\x04UTF8\x10\x00\x42\x33\n\x1aio.bloombox.schema.contentB\x0eGenericContentH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[base_dot_Language__pb2.DESCRIPTOR,base_dot_Compression__pb2.DESCRIPTOR,])
-
-
-
-_CONTENT_TYPE = _descriptor.EnumDescriptor(
-  name='Type',
-  full_name='Content.Type',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='TEXT', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MARKDOWN', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HTML', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=229,
-  serialized_end=269,
-)
-_sym_db.RegisterEnumDescriptor(_CONTENT_TYPE)
-
-_CONTENT_ENCODING = _descriptor.EnumDescriptor(
-  name='Encoding',
-  full_name='Content.Encoding',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='UTF8', index=0, number=0,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=271,
-  serialized_end=291,
-)
-_sym_db.RegisterEnumDescriptor(_CONTENT_ENCODING)
-
-
-_CONTENT = _descriptor.Descriptor(
-  name='Content',
-  full_name='Content',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='type', full_name='Content.type', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='encoding', full_name='Content.encoding', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='content', full_name='Content.content', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(""),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='language', full_name='Content.language', index=3,
-      number=4, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='compression', full_name='Content.compression', index=4,
-      number=5, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-    _CONTENT_TYPE,
-    _CONTENT_ENCODING,
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=71,
-  serialized_end=291,
-)
-
-_CONTENT.fields_by_name['type'].enum_type = _CONTENT_TYPE
-_CONTENT.fields_by_name['encoding'].enum_type = _CONTENT_ENCODING
-_CONTENT.fields_by_name['language'].enum_type = base_dot_Language__pb2._LANGUAGE
-_CONTENT.fields_by_name['compression'].message_type = base_dot_Compression__pb2._COMPRESSION
-_CONTENT_TYPE.containing_type = _CONTENT
-_CONTENT_ENCODING.containing_type = _CONTENT
-DESCRIPTOR.message_types_by_name['Content'] = _CONTENT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Content = _reflection.GeneratedProtocolMessageType('Content', (_message.Message,), dict(
-  DESCRIPTOR = _CONTENT,
-  __module__ = 'content.Content_pb2'
-  # @@protoc_insertion_point(class_scope:Content)
-  ))
-_sym_db.RegisterMessage(Content)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032io.bloombox.schema.contentB\016GenericContentH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/content/MaterialsData_pb2.py b/languages/python/content/MaterialsData_pb2.py
deleted file mode 100644
index c86ccc7..0000000
--- a/languages/python/content/MaterialsData_pb2.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/MaterialsData.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from structs import Grow_pb2 as structs_dot_Grow__pb2
-from structs import Species_pb2 as structs_dot_Species__pb2
-from structs import Genetics_pb2 as structs_dot_Genetics__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='content/MaterialsData.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x1b\x63ontent/MaterialsData.proto\x1a\x12structs/Grow.proto\x1a\x15structs/Species.proto\x1a\x16structs/Genetics.proto\"q\n\rMaterialsData\x12\x13\n\x0bingredients\x18\x01 \x03(\t\x12\x13\n\x04grow\x18\x02 \x01(\x0e\x32\x05.Grow\x12\x19\n\x07species\x18\x03 \x01(\x0e\x32\x08.Species\x12\x1b\n\x08genetics\x18\x04 \x01(\x0b\x32\t.GeneticsB5\n\x1aio.bloombox.schema.contentB\x10MaterialsContentH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[structs_dot_Grow__pb2.DESCRIPTOR,structs_dot_Species__pb2.DESCRIPTOR,structs_dot_Genetics__pb2.DESCRIPTOR,])
-
-
-
-
-_MATERIALSDATA = _descriptor.Descriptor(
-  name='MaterialsData',
-  full_name='MaterialsData',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='ingredients', full_name='MaterialsData.ingredients', index=0,
-      number=1, type=9, cpp_type=9, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='grow', full_name='MaterialsData.grow', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='species', full_name='MaterialsData.species', index=2,
-      number=3, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='genetics', full_name='MaterialsData.genetics', index=3,
-      number=4, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=98,
-  serialized_end=211,
-)
-
-_MATERIALSDATA.fields_by_name['grow'].enum_type = structs_dot_Grow__pb2._GROW
-_MATERIALSDATA.fields_by_name['species'].enum_type = structs_dot_Species__pb2._SPECIES
-_MATERIALSDATA.fields_by_name['genetics'].message_type = structs_dot_Genetics__pb2._GENETICS
-DESCRIPTOR.message_types_by_name['MaterialsData'] = _MATERIALSDATA
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-MaterialsData = _reflection.GeneratedProtocolMessageType('MaterialsData', (_message.Message,), dict(
-  DESCRIPTOR = _MATERIALSDATA,
-  __module__ = 'content.MaterialsData_pb2'
-  # @@protoc_insertion_point(class_scope:MaterialsData)
-  ))
-_sym_db.RegisterMessage(MaterialsData)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032io.bloombox.schema.contentB\020MaterialsContentH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/content/Name_pb2.py b/languages/python/content/Name_pb2.py
deleted file mode 100644
index b22623e..0000000
--- a/languages/python/content/Name_pb2.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Name.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='content/Name.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x12\x63ontent/Name.proto\"(\n\x04Name\x12\x0f\n\x07primary\x18\x01 \x01(\t\x12\x0f\n\x07\x64isplay\x18\x02 \x01(\tB0\n\x1aio.bloombox.schema.contentB\x0bNameContentH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-
-
-
-_NAME = _descriptor.Descriptor(
-  name='Name',
-  full_name='Name',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='primary', full_name='Name.primary', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='display', full_name='Name.display', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=22,
-  serialized_end=62,
-)
-
-DESCRIPTOR.message_types_by_name['Name'] = _NAME
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Name = _reflection.GeneratedProtocolMessageType('Name', (_message.Message,), dict(
-  DESCRIPTOR = _NAME,
-  __module__ = 'content.Name_pb2'
-  # @@protoc_insertion_point(class_scope:Name)
-  ))
-_sym_db.RegisterMessage(Name)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032io.bloombox.schema.contentB\013NameContentH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/content/ProductContent_pb2.py b/languages/python/content/ProductContent_pb2.py
deleted file mode 100644
index 43ef067..0000000
--- a/languages/python/content/ProductContent_pb2.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/ProductContent.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from content import Name_pb2 as content_dot_Name__pb2
-from content import Content_pb2 as content_dot_Content__pb2
-from content import Brand_pb2 as content_dot_Brand__pb2
-from media import MediaItem_pb2 as media_dot_MediaItem__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='content/ProductContent.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x1c\x63ontent/ProductContent.proto\x1a\x12\x63ontent/Name.proto\x1a\x15\x63ontent/Content.proto\x1a\x13\x63ontent/Brand.proto\x1a\x15media/MediaItem.proto\"\xbf\x01\n\x0eProductContent\x12\x13\n\x04name\x18\x01 \x01(\x0b\x32\x05.Name\x12\x19\n\x07summary\x18\x02 \x01(\x0b\x32\x08.Content\x12\x15\n\x05\x62rand\x18\x03 \x01(\x0b\x32\x06.Brand\x12\x19\n\x05media\x18\x14 \x03(\x0b\x32\n.MediaItem\x12\x17\n\x05usage\x18\x1e \x01(\x0b\x32\x08.Content\x12\x18\n\x06\x64osage\x18\x1f \x01(\x0b\x32\x08.Content\x12\x18\n\x06\x61\x64vice\x18  \x01(\x0b\x32\x08.ContentB4\n\x1aio.bloombox.schema.contentB\x0f\x41ttachedContentH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[content_dot_Name__pb2.DESCRIPTOR,content_dot_Content__pb2.DESCRIPTOR,content_dot_Brand__pb2.DESCRIPTOR,media_dot_MediaItem__pb2.DESCRIPTOR,])
-
-
-
-
-_PRODUCTCONTENT = _descriptor.Descriptor(
-  name='ProductContent',
-  full_name='ProductContent',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='name', full_name='ProductContent.name', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='summary', full_name='ProductContent.summary', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='brand', full_name='ProductContent.brand', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='media', full_name='ProductContent.media', index=3,
-      number=20, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='usage', full_name='ProductContent.usage', index=4,
-      number=30, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='dosage', full_name='ProductContent.dosage', index=5,
-      number=31, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='advice', full_name='ProductContent.advice', index=6,
-      number=32, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=120,
-  serialized_end=311,
-)
-
-_PRODUCTCONTENT.fields_by_name['name'].message_type = content_dot_Name__pb2._NAME
-_PRODUCTCONTENT.fields_by_name['summary'].message_type = content_dot_Content__pb2._CONTENT
-_PRODUCTCONTENT.fields_by_name['brand'].message_type = content_dot_Brand__pb2._BRAND
-_PRODUCTCONTENT.fields_by_name['media'].message_type = media_dot_MediaItem__pb2._MEDIAITEM
-_PRODUCTCONTENT.fields_by_name['usage'].message_type = content_dot_Content__pb2._CONTENT
-_PRODUCTCONTENT.fields_by_name['dosage'].message_type = content_dot_Content__pb2._CONTENT
-_PRODUCTCONTENT.fields_by_name['advice'].message_type = content_dot_Content__pb2._CONTENT
-DESCRIPTOR.message_types_by_name['ProductContent'] = _PRODUCTCONTENT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-ProductContent = _reflection.GeneratedProtocolMessageType('ProductContent', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCTCONTENT,
-  __module__ = 'content.ProductContent_pb2'
-  # @@protoc_insertion_point(class_scope:ProductContent)
-  ))
-_sym_db.RegisterMessage(ProductContent)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032io.bloombox.schema.contentB\017AttachedContentH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/geo/Address_pb2.py b/languages/python/geo/Address_pb2.py
deleted file mode 100644
index ce7a884..0000000
--- a/languages/python/geo/Address_pb2.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: geo/Address.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='geo/Address.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x11geo/Address.proto\"q\n\x07\x41\x64\x64ress\x12\x12\n\nfirst_line\x18\x01 \x01(\t\x12\x13\n\x0bsecond_line\x18\x02 \x01(\t\x12\x0c\n\x04\x63ity\x18\x03 \x01(\t\x12\r\n\x05state\x18\x04 \x01(\t\x12\x0f\n\x07zipcode\x18\x05 \x01(\t\x12\x0f\n\x07\x63ountry\x18\x06 \x01(\tB\x1c\n\x16io.bloombox.schema.geoH\x01P\x01\x62\x06proto3')
-)
-
-
-
-
-_ADDRESS = _descriptor.Descriptor(
-  name='Address',
-  full_name='Address',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='first_line', full_name='Address.first_line', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='second_line', full_name='Address.second_line', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='city', full_name='Address.city', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='state', full_name='Address.state', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='zipcode', full_name='Address.zipcode', index=4,
-      number=5, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='country', full_name='Address.country', index=5,
-      number=6, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=21,
-  serialized_end=134,
-)
-
-DESCRIPTOR.message_types_by_name['Address'] = _ADDRESS
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Address = _reflection.GeneratedProtocolMessageType('Address', (_message.Message,), dict(
-  DESCRIPTOR = _ADDRESS,
-  __module__ = 'geo.Address_pb2'
-  # @@protoc_insertion_point(class_scope:Address)
-  ))
-_sym_db.RegisterMessage(Address)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026io.bloombox.schema.geoH\001P\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/media/MediaItem_pb2.py b/languages/python/media/MediaItem_pb2.py
deleted file mode 100644
index 50767e3..0000000
--- a/languages/python/media/MediaItem_pb2.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaItem.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from media import MediaKey_pb2 as media_dot_MediaKey__pb2
-from media import MediaType_pb2 as media_dot_MediaType__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='media/MediaItem.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x15media/MediaItem.proto\x1a\x14media/MediaKey.proto\x1a\x15media/MediaType.proto\"K\n\tMediaItem\x12\x16\n\x03key\x18\x01 \x01(\x0b\x32\t.MediaKey\x12\x18\n\x04type\x18\x02 \x01(\x0b\x32\n.MediaType\x12\x0c\n\x04name\x18\x03 \x01(\tB0\n\x18io.bloombox.schema.mediaB\rAttachedMediaH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[media_dot_MediaKey__pb2.DESCRIPTOR,media_dot_MediaType__pb2.DESCRIPTOR,])
-
-
-
-
-_MEDIAITEM = _descriptor.Descriptor(
-  name='MediaItem',
-  full_name='MediaItem',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='key', full_name='MediaItem.key', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='type', full_name='MediaItem.type', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='name', full_name='MediaItem.name', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=70,
-  serialized_end=145,
-)
-
-_MEDIAITEM.fields_by_name['key'].message_type = media_dot_MediaKey__pb2._MEDIAKEY
-_MEDIAITEM.fields_by_name['type'].message_type = media_dot_MediaType__pb2._MEDIATYPE
-DESCRIPTOR.message_types_by_name['MediaItem'] = _MEDIAITEM
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-MediaItem = _reflection.GeneratedProtocolMessageType('MediaItem', (_message.Message,), dict(
-  DESCRIPTOR = _MEDIAITEM,
-  __module__ = 'media.MediaItem_pb2'
-  # @@protoc_insertion_point(class_scope:MediaItem)
-  ))
-_sym_db.RegisterMessage(MediaItem)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\030io.bloombox.schema.mediaB\rAttachedMediaH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/media/MediaKey_pb2.py b/languages/python/media/MediaKey_pb2.py
deleted file mode 100644
index b0ca9ab..0000000
--- a/languages/python/media/MediaKey_pb2.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaKey.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='media/MediaKey.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x14media/MediaKey.proto\"\x16\n\x08MediaKey\x12\n\n\x02id\x18\x01 \x01(\tB/\n\x18io.bloombox.schema.mediaB\x0cMediaItemKeyH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-
-
-
-_MEDIAKEY = _descriptor.Descriptor(
-  name='MediaKey',
-  full_name='MediaKey',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='id', full_name='MediaKey.id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=24,
-  serialized_end=46,
-)
-
-DESCRIPTOR.message_types_by_name['MediaKey'] = _MEDIAKEY
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-MediaKey = _reflection.GeneratedProtocolMessageType('MediaKey', (_message.Message,), dict(
-  DESCRIPTOR = _MEDIAKEY,
-  __module__ = 'media.MediaKey_pb2'
-  # @@protoc_insertion_point(class_scope:MediaKey)
-  ))
-_sym_db.RegisterMessage(MediaKey)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\030io.bloombox.schema.mediaB\014MediaItemKeyH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/media/MediaType_pb2.py b/languages/python/media/MediaType_pb2.py
deleted file mode 100644
index 068a2f0..0000000
--- a/languages/python/media/MediaType_pb2.py
+++ /dev/null
@@ -1,351 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='media/MediaType.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x15media/MediaType.proto\"\xc8\x01\n\tMediaType\x12\x1d\n\x04kind\x18\x01 \x01(\x0e\x32\x0f.MediaType.Kind\x12\x1e\n\nimage_type\x18\x65 \x01(\x0b\x32\n.ImageType\x12%\n\rdocument_type\x18\xc9\x01 \x01(\x0b\x32\r.DocumentType\x12\x1f\n\nvideo_type\x18\xad\x02 \x01(\x0b\x32\n.VideoType\"4\n\x04Kind\x12\x08\n\x04LINK\x10\x00\x12\t\n\x05IMAGE\x10\x01\x12\x0c\n\x08\x44OCUMENT\x10\x02\x12\t\n\x05VIDEO\x10\x03\"j\n\tImageType\x12\"\n\x04kind\x18\x01 \x01(\x0e\x32\x14.ImageType.ImageKind\"9\n\tImageKind\x12\x07\n\x03PNG\x10\x00\x12\x07\n\x03JPG\x10\x01\x12\x07\n\x03GIF\x10\x02\x12\x07\n\x03SVG\x10\x03\x12\x08\n\x04WEBP\x10\x04\"\x86\x01\n\x0c\x44ocumentType\x12(\n\x04kind\x18\x01 \x01(\x0e\x32\x1a.DocumentType.DocumentKind\x12\x12\n\ncompressed\x18\x02 \x01(\x08\"8\n\x0c\x44ocumentKind\x12\x07\n\x03TXT\x10\x00\x12\x08\n\x04HTML\x10\x01\x12\x07\n\x03PDF\x10\x02\x12\x0c\n\x08MARKDOWN\x10\x03\"W\n\tVideoType\x12\"\n\x04kind\x18\x01 \x01(\x0e\x32\x14.VideoType.VideoKind\"&\n\tVideoKind\x12\x07\n\x03MP4\x10\x00\x12\x07\n\x03\x46LV\x10\x01\x12\x07\n\x03HLS\x10\x02\x42\x30\n\x18io.bloombox.schema.mediaB\rMediaItemTypeH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-
-
-_MEDIATYPE_KIND = _descriptor.EnumDescriptor(
-  name='Kind',
-  full_name='MediaType.Kind',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='LINK', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='IMAGE', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='DOCUMENT', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='VIDEO', index=3, number=3,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=174,
-  serialized_end=226,
-)
-_sym_db.RegisterEnumDescriptor(_MEDIATYPE_KIND)
-
-_IMAGETYPE_IMAGEKIND = _descriptor.EnumDescriptor(
-  name='ImageKind',
-  full_name='ImageType.ImageKind',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='PNG', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='JPG', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='GIF', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SVG', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WEBP', index=4, number=4,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=277,
-  serialized_end=334,
-)
-_sym_db.RegisterEnumDescriptor(_IMAGETYPE_IMAGEKIND)
-
-_DOCUMENTTYPE_DOCUMENTKIND = _descriptor.EnumDescriptor(
-  name='DocumentKind',
-  full_name='DocumentType.DocumentKind',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='TXT', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HTML', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='PDF', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MARKDOWN', index=3, number=3,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=415,
-  serialized_end=471,
-)
-_sym_db.RegisterEnumDescriptor(_DOCUMENTTYPE_DOCUMENTKIND)
-
-_VIDEOTYPE_VIDEOKIND = _descriptor.EnumDescriptor(
-  name='VideoKind',
-  full_name='VideoType.VideoKind',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='MP4', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='FLV', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HLS', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=522,
-  serialized_end=560,
-)
-_sym_db.RegisterEnumDescriptor(_VIDEOTYPE_VIDEOKIND)
-
-
-_MEDIATYPE = _descriptor.Descriptor(
-  name='MediaType',
-  full_name='MediaType',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='kind', full_name='MediaType.kind', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='image_type', full_name='MediaType.image_type', index=1,
-      number=101, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='document_type', full_name='MediaType.document_type', index=2,
-      number=201, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='video_type', full_name='MediaType.video_type', index=3,
-      number=301, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-    _MEDIATYPE_KIND,
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=26,
-  serialized_end=226,
-)
-
-
-_IMAGETYPE = _descriptor.Descriptor(
-  name='ImageType',
-  full_name='ImageType',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='kind', full_name='ImageType.kind', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-    _IMAGETYPE_IMAGEKIND,
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=228,
-  serialized_end=334,
-)
-
-
-_DOCUMENTTYPE = _descriptor.Descriptor(
-  name='DocumentType',
-  full_name='DocumentType',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='kind', full_name='DocumentType.kind', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='compressed', full_name='DocumentType.compressed', index=1,
-      number=2, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-    _DOCUMENTTYPE_DOCUMENTKIND,
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=337,
-  serialized_end=471,
-)
-
-
-_VIDEOTYPE = _descriptor.Descriptor(
-  name='VideoType',
-  full_name='VideoType',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='kind', full_name='VideoType.kind', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-    _VIDEOTYPE_VIDEOKIND,
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=473,
-  serialized_end=560,
-)
-
-_MEDIATYPE.fields_by_name['kind'].enum_type = _MEDIATYPE_KIND
-_MEDIATYPE.fields_by_name['image_type'].message_type = _IMAGETYPE
-_MEDIATYPE.fields_by_name['document_type'].message_type = _DOCUMENTTYPE
-_MEDIATYPE.fields_by_name['video_type'].message_type = _VIDEOTYPE
-_MEDIATYPE_KIND.containing_type = _MEDIATYPE
-_IMAGETYPE.fields_by_name['kind'].enum_type = _IMAGETYPE_IMAGEKIND
-_IMAGETYPE_IMAGEKIND.containing_type = _IMAGETYPE
-_DOCUMENTTYPE.fields_by_name['kind'].enum_type = _DOCUMENTTYPE_DOCUMENTKIND
-_DOCUMENTTYPE_DOCUMENTKIND.containing_type = _DOCUMENTTYPE
-_VIDEOTYPE.fields_by_name['kind'].enum_type = _VIDEOTYPE_VIDEOKIND
-_VIDEOTYPE_VIDEOKIND.containing_type = _VIDEOTYPE
-DESCRIPTOR.message_types_by_name['MediaType'] = _MEDIATYPE
-DESCRIPTOR.message_types_by_name['ImageType'] = _IMAGETYPE
-DESCRIPTOR.message_types_by_name['DocumentType'] = _DOCUMENTTYPE
-DESCRIPTOR.message_types_by_name['VideoType'] = _VIDEOTYPE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-MediaType = _reflection.GeneratedProtocolMessageType('MediaType', (_message.Message,), dict(
-  DESCRIPTOR = _MEDIATYPE,
-  __module__ = 'media.MediaType_pb2'
-  # @@protoc_insertion_point(class_scope:MediaType)
-  ))
-_sym_db.RegisterMessage(MediaType)
-
-ImageType = _reflection.GeneratedProtocolMessageType('ImageType', (_message.Message,), dict(
-  DESCRIPTOR = _IMAGETYPE,
-  __module__ = 'media.MediaType_pb2'
-  # @@protoc_insertion_point(class_scope:ImageType)
-  ))
-_sym_db.RegisterMessage(ImageType)
-
-DocumentType = _reflection.GeneratedProtocolMessageType('DocumentType', (_message.Message,), dict(
-  DESCRIPTOR = _DOCUMENTTYPE,
-  __module__ = 'media.MediaType_pb2'
-  # @@protoc_insertion_point(class_scope:DocumentType)
-  ))
-_sym_db.RegisterMessage(DocumentType)
-
-VideoType = _reflection.GeneratedProtocolMessageType('VideoType', (_message.Message,), dict(
-  DESCRIPTOR = _VIDEOTYPE,
-  __module__ = 'media.MediaType_pb2'
-  # @@protoc_insertion_point(class_scope:VideoType)
-  ))
-_sym_db.RegisterMessage(VideoType)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\030io.bloombox.schema.mediaB\rMediaItemTypeH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/products/Flower_pb2.py b/languages/python/products/Flower_pb2.py
deleted file mode 100644
index 4e59736..0000000
--- a/languages/python/products/Flower_pb2.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: products/Flower.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from base import ProductKey_pb2 as base_dot_ProductKey__pb2
-from content import MaterialsData_pb2 as content_dot_MaterialsData__pb2
-from content import ProductContent_pb2 as content_dot_ProductContent__pb2
-from structs import FlagsDescriptor_pb2 as structs_dot_FlagsDescriptor__pb2
-from structs.pricing import PricingDescriptor_pb2 as structs_dot_pricing_dot_PricingDescriptor__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='products/Flower.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x15products/Flower.proto\x1a\x15\x62\x61se/ProductKey.proto\x1a\x1b\x63ontent/MaterialsData.proto\x1a\x1c\x63ontent/ProductContent.proto\x1a\x1dstructs/FlagsDescriptor.proto\x1a\'structs/pricing/PricingDescriptor.proto\"\xb3\x01\n\x06\x46lower\x12\x18\n\x03key\x18\x01 \x01(\x0b\x32\x0b.ProductKey\x12%\n\x0cproduct_data\x18\x14 \x01(\x0b\x32\x0f.ProductContent\x12%\n\rmaterial_data\x18\x15 \x01(\x0b\x32\x0e.MaterialsData\x12\x1f\n\x05\x66lags\x18\x16 \x01(\x0b\x32\x10.FlagsDescriptor\x12 \n\x07pricing\x18\x17 \x01(\x0b\x32\x0f.ProductPricingB2\n\x1aio.bloombox.schema.productB\rFlowerProductH\x01P\x00\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[base_dot_ProductKey__pb2.DESCRIPTOR,content_dot_MaterialsData__pb2.DESCRIPTOR,content_dot_ProductContent__pb2.DESCRIPTOR,structs_dot_FlagsDescriptor__pb2.DESCRIPTOR,structs_dot_pricing_dot_PricingDescriptor__pb2.DESCRIPTOR,])
-
-
-
-
-_FLOWER = _descriptor.Descriptor(
-  name='Flower',
-  full_name='Flower',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='key', full_name='Flower.key', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='product_data', full_name='Flower.product_data', index=1,
-      number=20, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='material_data', full_name='Flower.material_data', index=2,
-      number=21, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='flags', full_name='Flower.flags', index=3,
-      number=22, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='pricing', full_name='Flower.pricing', index=4,
-      number=23, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=180,
-  serialized_end=359,
-)
-
-_FLOWER.fields_by_name['key'].message_type = base_dot_ProductKey__pb2._PRODUCTKEY
-_FLOWER.fields_by_name['product_data'].message_type = content_dot_ProductContent__pb2._PRODUCTCONTENT
-_FLOWER.fields_by_name['material_data'].message_type = content_dot_MaterialsData__pb2._MATERIALSDATA
-_FLOWER.fields_by_name['flags'].message_type = structs_dot_FlagsDescriptor__pb2._FLAGSDESCRIPTOR
-_FLOWER.fields_by_name['pricing'].message_type = structs_dot_pricing_dot_PricingDescriptor__pb2._PRODUCTPRICING
-DESCRIPTOR.message_types_by_name['Flower'] = _FLOWER
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Flower = _reflection.GeneratedProtocolMessageType('Flower', (_message.Message,), dict(
-  DESCRIPTOR = _FLOWER,
-  __module__ = 'products.Flower_pb2'
-  # @@protoc_insertion_point(class_scope:Flower)
-  ))
-_sym_db.RegisterMessage(Flower)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\032io.bloombox.schema.productB\rFlowerProductH\001P\000\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/structs/FlagsDescriptor_pb2.py b/languages/python/structs/FlagsDescriptor_pb2.py
deleted file mode 100644
index 4f3869c..0000000
--- a/languages/python/structs/FlagsDescriptor_pb2.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='structs/FlagsDescriptor.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x1dstructs/FlagsDescriptor.proto\"=\n\x10ProductFlagValue\x12\x1a\n\x04type\x18\x01 \x01(\x0e\x32\x0c.ProductFlag\x12\r\n\x05value\x18\x02 \x01(\x08\"2\n\x0eProductFlagset\x12 \n\x05\x66lags\x18\x01 \x03(\x0b\x32\x11.ProductFlagValue\"j\n\x0f\x46lagsDescriptor\x12\x0f\n\x07visible\x18\x01 \x01(\x08\x12\x0f\n\x07premium\x18\x02 \x01(\x08\x12\x10\n\x08\x66\x65\x61tured\x18\x03 \x01(\x08\x12\x12\n\nlastchance\x18\x04 \x01(\x08\x12\x0f\n\x07inhouse\x18\x05 \x01(\x08*R\n\x0bProductFlag\x12\x0b\n\x07VISIBLE\x10\x00\x12\x0b\n\x07PREMIUM\x10\x01\x12\x0c\n\x08\x46\x45\x41TURED\x10\x02\x12\x0e\n\nLASTCHANCE\x10\x03\x12\x0b\n\x07INHOUSE\x10\x04\x42\x37\n!io.bloombox.schema.product.structB\x0b\x42\x61seStructsH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-_PRODUCTFLAG = _descriptor.EnumDescriptor(
-  name='ProductFlag',
-  full_name='ProductFlag',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='VISIBLE', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='PREMIUM', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='FEATURED', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='LASTCHANCE', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='INHOUSE', index=4, number=4,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=256,
-  serialized_end=338,
-)
-_sym_db.RegisterEnumDescriptor(_PRODUCTFLAG)
-
-ProductFlag = enum_type_wrapper.EnumTypeWrapper(_PRODUCTFLAG)
-VISIBLE = 0
-PREMIUM = 1
-FEATURED = 2
-LASTCHANCE = 3
-INHOUSE = 4
-
-
-
-_PRODUCTFLAGVALUE = _descriptor.Descriptor(
-  name='ProductFlagValue',
-  full_name='ProductFlagValue',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='type', full_name='ProductFlagValue.type', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='value', full_name='ProductFlagValue.value', index=1,
-      number=2, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=33,
-  serialized_end=94,
-)
-
-
-_PRODUCTFLAGSET = _descriptor.Descriptor(
-  name='ProductFlagset',
-  full_name='ProductFlagset',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='flags', full_name='ProductFlagset.flags', index=0,
-      number=1, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=96,
-  serialized_end=146,
-)
-
-
-_FLAGSDESCRIPTOR = _descriptor.Descriptor(
-  name='FlagsDescriptor',
-  full_name='FlagsDescriptor',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='visible', full_name='FlagsDescriptor.visible', index=0,
-      number=1, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='premium', full_name='FlagsDescriptor.premium', index=1,
-      number=2, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='featured', full_name='FlagsDescriptor.featured', index=2,
-      number=3, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='lastchance', full_name='FlagsDescriptor.lastchance', index=3,
-      number=4, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='inhouse', full_name='FlagsDescriptor.inhouse', index=4,
-      number=5, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=148,
-  serialized_end=254,
-)
-
-_PRODUCTFLAGVALUE.fields_by_name['type'].enum_type = _PRODUCTFLAG
-_PRODUCTFLAGSET.fields_by_name['flags'].message_type = _PRODUCTFLAGVALUE
-DESCRIPTOR.message_types_by_name['ProductFlagValue'] = _PRODUCTFLAGVALUE
-DESCRIPTOR.message_types_by_name['ProductFlagset'] = _PRODUCTFLAGSET
-DESCRIPTOR.message_types_by_name['FlagsDescriptor'] = _FLAGSDESCRIPTOR
-DESCRIPTOR.enum_types_by_name['ProductFlag'] = _PRODUCTFLAG
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-ProductFlagValue = _reflection.GeneratedProtocolMessageType('ProductFlagValue', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCTFLAGVALUE,
-  __module__ = 'structs.FlagsDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:ProductFlagValue)
-  ))
-_sym_db.RegisterMessage(ProductFlagValue)
-
-ProductFlagset = _reflection.GeneratedProtocolMessageType('ProductFlagset', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCTFLAGSET,
-  __module__ = 'structs.FlagsDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:ProductFlagset)
-  ))
-_sym_db.RegisterMessage(ProductFlagset)
-
-FlagsDescriptor = _reflection.GeneratedProtocolMessageType('FlagsDescriptor', (_message.Message,), dict(
-  DESCRIPTOR = _FLAGSDESCRIPTOR,
-  __module__ = 'structs.FlagsDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:FlagsDescriptor)
-  ))
-_sym_db.RegisterMessage(FlagsDescriptor)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!io.bloombox.schema.product.structB\013BaseStructsH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/structs/Genetics_pb2.py b/languages/python/structs/Genetics_pb2.py
deleted file mode 100644
index dbdda10..0000000
--- a/languages/python/structs/Genetics_pb2.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Genetics.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from content import Name_pb2 as content_dot_Name__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='structs/Genetics.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x16structs/Genetics.proto\x1a\x12\x63ontent/Name.proto\"6\n\x08Genetics\x12\x13\n\x04male\x18\x01 \x01(\x0b\x32\x05.Name\x12\x15\n\x06\x66\x65male\x18\x02 \x01(\x0b\x32\x05.NameB;\n!io.bloombox.schema.product.structB\x0fGeneticsStructsH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[content_dot_Name__pb2.DESCRIPTOR,])
-
-
-
-
-_GENETICS = _descriptor.Descriptor(
-  name='Genetics',
-  full_name='Genetics',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='male', full_name='Genetics.male', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='female', full_name='Genetics.female', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=46,
-  serialized_end=100,
-)
-
-_GENETICS.fields_by_name['male'].message_type = content_dot_Name__pb2._NAME
-_GENETICS.fields_by_name['female'].message_type = content_dot_Name__pb2._NAME
-DESCRIPTOR.message_types_by_name['Genetics'] = _GENETICS
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-Genetics = _reflection.GeneratedProtocolMessageType('Genetics', (_message.Message,), dict(
-  DESCRIPTOR = _GENETICS,
-  __module__ = 'structs.Genetics_pb2'
-  # @@protoc_insertion_point(class_scope:Genetics)
-  ))
-_sym_db.RegisterMessage(Genetics)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!io.bloombox.schema.product.structB\017GeneticsStructsH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/structs/Grow_pb2.py b/languages/python/structs/Grow_pb2.py
deleted file mode 100644
index c8cf292..0000000
--- a/languages/python/structs/Grow_pb2.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Grow.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='structs/Grow.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x12structs/Grow.proto*<\n\x04Grow\x12\x0b\n\x07GENERIC\x10\x00\x12\n\n\x06INDOOR\x10\x01\x12\x0e\n\nGREENHOUSE\x10\x02\x12\x0b\n\x07OUTDOOR\x10\x03\x42\x38\n!io.bloombox.schema.product.structB\x0cMaterialGrowH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-_GROW = _descriptor.EnumDescriptor(
-  name='Grow',
-  full_name='Grow',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='GENERIC', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='INDOOR', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='GREENHOUSE', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='OUTDOOR', index=3, number=3,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=22,
-  serialized_end=82,
-)
-_sym_db.RegisterEnumDescriptor(_GROW)
-
-Grow = enum_type_wrapper.EnumTypeWrapper(_GROW)
-GENERIC = 0
-INDOOR = 1
-GREENHOUSE = 2
-OUTDOOR = 3
-
-
-DESCRIPTOR.enum_types_by_name['Grow'] = _GROW
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!io.bloombox.schema.product.structB\014MaterialGrowH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/structs/Species_pb2.py b/languages/python/structs/Species_pb2.py
deleted file mode 100644
index 88289f5..0000000
--- a/languages/python/structs/Species_pb2.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Species.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='structs/Species.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\x15structs/Species.proto*d\n\x07Species\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\n\n\x06SATIVA\x10\x01\x12\x11\n\rHYBRID_SATIVA\x10\x02\x12\n\n\x06HYBRID\x10\x03\x12\x11\n\rHYBRID_INDICA\x10\x04\x12\n\n\x06INDICA\x10\x05\x42;\n!io.bloombox.schema.product.structB\x0fMaterialSpeciesH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-_SPECIES = _descriptor.EnumDescriptor(
-  name='Species',
-  full_name='Species',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='UNSPECIFIED', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SATIVA', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HYBRID_SATIVA', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HYBRID', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HYBRID_INDICA', index=4, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='INDICA', index=5, number=5,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=25,
-  serialized_end=125,
-)
-_sym_db.RegisterEnumDescriptor(_SPECIES)
-
-Species = enum_type_wrapper.EnumTypeWrapper(_SPECIES)
-UNSPECIFIED = 0
-SATIVA = 1
-HYBRID_SATIVA = 2
-HYBRID = 3
-HYBRID_INDICA = 4
-INDICA = 5
-
-
-DESCRIPTOR.enum_types_by_name['Species'] = _SPECIES
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!io.bloombox.schema.product.structB\017MaterialSpeciesH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/structs/pricing/PricingDescriptor_pb2.py b/languages/python/structs/pricing/PricingDescriptor_pb2.py
deleted file mode 100644
index 827c3ae..0000000
--- a/languages/python/structs/pricing/PricingDescriptor_pb2.py
+++ /dev/null
@@ -1,432 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from structs.pricing import SaleDescriptor_pb2 as structs_dot_pricing_dot_SaleDescriptor__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='structs/pricing/PricingDescriptor.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n\'structs/pricing/PricingDescriptor.proto\x1a$structs/pricing/SaleDescriptor.proto\"=\n\x17PricingTierAvailability\x12\x0f\n\x07offered\x18\x01 \x01(\x08\x12\x11\n\tavailable\x18\x02 \x01(\x08\"z\n\x15UnitPricingDescriptor\x12\x13\n\x0bprice_value\x18\x01 \x01(\x02\x12(\n\x06status\x18\x02 \x01(\x0b\x32\x18.PricingTierAvailability\x12\"\n\tdiscounts\x18\x03 \x03(\x0b\x32\x0f.SaleDescriptor\"|\n\x19WeightedPricingDescriptor\x12\"\n\x06weight\x18\x01 \x01(\x0e\x32\x12.PricingWeightTier\x12$\n\x04tier\x18\x02 \x01(\x0b\x32\x16.UnitPricingDescriptor\x12\x15\n\rweightInGrams\x18\x03 \x01(\x02\"\x1a\n\x18\x46reebiePricingDescriptor\"\xaf\x01\n\x11PricingDescriptor\x12\x1a\n\x04type\x18\x01 \x01(\x0e\x32\x0c.PricingType\x12$\n\x04unit\x18\x14 \x01(\x0b\x32\x16.UnitPricingDescriptor\x12,\n\x08weighted\x18\x15 \x01(\x0b\x32\x1a.WeightedPricingDescriptor\x12*\n\x07\x66reebie\x18\x16 \x01(\x0b\x32\x19.FreebiePricingDescriptor\"Z\n\x0eProductPricing\x12\"\n\tdiscounts\x18\x01 \x03(\x0b\x32\x0f.SaleDescriptor\x12$\n\x08manifest\x18\x02 \x03(\x0b\x32\x12.PricingDescriptor*2\n\x0bPricingType\x12\x08\n\x04UNIT\x10\x00\x12\x0c\n\x08WEIGHTED\x10\x01\x12\x0b\n\x07\x46REEBIE\x10\x02*\x89\x01\n\x11PricingWeightTier\x12\t\n\x05OTHER\x10\x00\x12\x08\n\x04GRAM\x10\x01\x12\x0c\n\x08HALFGRAM\x10\x02\x12\x0f\n\x0bQUARTERGRAM\x10\x03\x12\x07\n\x03\x44UB\x10\x04\x12\n\n\x06\x45IGHTH\x10\x05\x12\x0b\n\x07QUARTER\x10\x06\x12\x08\n\x04HALF\x10\x07\x12\t\n\x05OUNCE\x10\x08\x12\t\n\x05POUND\x10\tB>\n!io.bloombox.schema.product.structB\x12ProductPricingSpecH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-  ,
-  dependencies=[structs_dot_pricing_dot_SaleDescriptor__pb2.DESCRIPTOR,])
-
-_PRICINGTYPE = _descriptor.EnumDescriptor(
-  name='PricingType',
-  full_name='PricingType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='UNIT', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WEIGHTED', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='FREEBIE', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=692,
-  serialized_end=742,
-)
-_sym_db.RegisterEnumDescriptor(_PRICINGTYPE)
-
-PricingType = enum_type_wrapper.EnumTypeWrapper(_PRICINGTYPE)
-_PRICINGWEIGHTTIER = _descriptor.EnumDescriptor(
-  name='PricingWeightTier',
-  full_name='PricingWeightTier',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='OTHER', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='GRAM', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HALFGRAM', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='QUARTERGRAM', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='DUB', index=4, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EIGHTH', index=5, number=5,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='QUARTER', index=6, number=6,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HALF', index=7, number=7,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='OUNCE', index=8, number=8,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='POUND', index=9, number=9,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=745,
-  serialized_end=882,
-)
-_sym_db.RegisterEnumDescriptor(_PRICINGWEIGHTTIER)
-
-PricingWeightTier = enum_type_wrapper.EnumTypeWrapper(_PRICINGWEIGHTTIER)
-UNIT = 0
-WEIGHTED = 1
-FREEBIE = 2
-OTHER = 0
-GRAM = 1
-HALFGRAM = 2
-QUARTERGRAM = 3
-DUB = 4
-EIGHTH = 5
-QUARTER = 6
-HALF = 7
-OUNCE = 8
-POUND = 9
-
-
-
-_PRICINGTIERAVAILABILITY = _descriptor.Descriptor(
-  name='PricingTierAvailability',
-  full_name='PricingTierAvailability',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='offered', full_name='PricingTierAvailability.offered', index=0,
-      number=1, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='available', full_name='PricingTierAvailability.available', index=1,
-      number=2, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=81,
-  serialized_end=142,
-)
-
-
-_UNITPRICINGDESCRIPTOR = _descriptor.Descriptor(
-  name='UnitPricingDescriptor',
-  full_name='UnitPricingDescriptor',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='price_value', full_name='UnitPricingDescriptor.price_value', index=0,
-      number=1, type=2, cpp_type=6, label=1,
-      has_default_value=False, default_value=float(0),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='status', full_name='UnitPricingDescriptor.status', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='discounts', full_name='UnitPricingDescriptor.discounts', index=2,
-      number=3, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=144,
-  serialized_end=266,
-)
-
-
-_WEIGHTEDPRICINGDESCRIPTOR = _descriptor.Descriptor(
-  name='WeightedPricingDescriptor',
-  full_name='WeightedPricingDescriptor',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='weight', full_name='WeightedPricingDescriptor.weight', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='tier', full_name='WeightedPricingDescriptor.tier', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='weightInGrams', full_name='WeightedPricingDescriptor.weightInGrams', index=2,
-      number=3, type=2, cpp_type=6, label=1,
-      has_default_value=False, default_value=float(0),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=268,
-  serialized_end=392,
-)
-
-
-_FREEBIEPRICINGDESCRIPTOR = _descriptor.Descriptor(
-  name='FreebiePricingDescriptor',
-  full_name='FreebiePricingDescriptor',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=394,
-  serialized_end=420,
-)
-
-
-_PRICINGDESCRIPTOR = _descriptor.Descriptor(
-  name='PricingDescriptor',
-  full_name='PricingDescriptor',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='type', full_name='PricingDescriptor.type', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='unit', full_name='PricingDescriptor.unit', index=1,
-      number=20, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='weighted', full_name='PricingDescriptor.weighted', index=2,
-      number=21, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='freebie', full_name='PricingDescriptor.freebie', index=3,
-      number=22, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=423,
-  serialized_end=598,
-)
-
-
-_PRODUCTPRICING = _descriptor.Descriptor(
-  name='ProductPricing',
-  full_name='ProductPricing',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='discounts', full_name='ProductPricing.discounts', index=0,
-      number=1, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='manifest', full_name='ProductPricing.manifest', index=1,
-      number=2, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=600,
-  serialized_end=690,
-)
-
-_UNITPRICINGDESCRIPTOR.fields_by_name['status'].message_type = _PRICINGTIERAVAILABILITY
-_UNITPRICINGDESCRIPTOR.fields_by_name['discounts'].message_type = structs_dot_pricing_dot_SaleDescriptor__pb2._SALEDESCRIPTOR
-_WEIGHTEDPRICINGDESCRIPTOR.fields_by_name['weight'].enum_type = _PRICINGWEIGHTTIER
-_WEIGHTEDPRICINGDESCRIPTOR.fields_by_name['tier'].message_type = _UNITPRICINGDESCRIPTOR
-_PRICINGDESCRIPTOR.fields_by_name['type'].enum_type = _PRICINGTYPE
-_PRICINGDESCRIPTOR.fields_by_name['unit'].message_type = _UNITPRICINGDESCRIPTOR
-_PRICINGDESCRIPTOR.fields_by_name['weighted'].message_type = _WEIGHTEDPRICINGDESCRIPTOR
-_PRICINGDESCRIPTOR.fields_by_name['freebie'].message_type = _FREEBIEPRICINGDESCRIPTOR
-_PRODUCTPRICING.fields_by_name['discounts'].message_type = structs_dot_pricing_dot_SaleDescriptor__pb2._SALEDESCRIPTOR
-_PRODUCTPRICING.fields_by_name['manifest'].message_type = _PRICINGDESCRIPTOR
-DESCRIPTOR.message_types_by_name['PricingTierAvailability'] = _PRICINGTIERAVAILABILITY
-DESCRIPTOR.message_types_by_name['UnitPricingDescriptor'] = _UNITPRICINGDESCRIPTOR
-DESCRIPTOR.message_types_by_name['WeightedPricingDescriptor'] = _WEIGHTEDPRICINGDESCRIPTOR
-DESCRIPTOR.message_types_by_name['FreebiePricingDescriptor'] = _FREEBIEPRICINGDESCRIPTOR
-DESCRIPTOR.message_types_by_name['PricingDescriptor'] = _PRICINGDESCRIPTOR
-DESCRIPTOR.message_types_by_name['ProductPricing'] = _PRODUCTPRICING
-DESCRIPTOR.enum_types_by_name['PricingType'] = _PRICINGTYPE
-DESCRIPTOR.enum_types_by_name['PricingWeightTier'] = _PRICINGWEIGHTTIER
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-PricingTierAvailability = _reflection.GeneratedProtocolMessageType('PricingTierAvailability', (_message.Message,), dict(
-  DESCRIPTOR = _PRICINGTIERAVAILABILITY,
-  __module__ = 'structs.pricing.PricingDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:PricingTierAvailability)
-  ))
-_sym_db.RegisterMessage(PricingTierAvailability)
-
-UnitPricingDescriptor = _reflection.GeneratedProtocolMessageType('UnitPricingDescriptor', (_message.Message,), dict(
-  DESCRIPTOR = _UNITPRICINGDESCRIPTOR,
-  __module__ = 'structs.pricing.PricingDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:UnitPricingDescriptor)
-  ))
-_sym_db.RegisterMessage(UnitPricingDescriptor)
-
-WeightedPricingDescriptor = _reflection.GeneratedProtocolMessageType('WeightedPricingDescriptor', (_message.Message,), dict(
-  DESCRIPTOR = _WEIGHTEDPRICINGDESCRIPTOR,
-  __module__ = 'structs.pricing.PricingDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:WeightedPricingDescriptor)
-  ))
-_sym_db.RegisterMessage(WeightedPricingDescriptor)
-
-FreebiePricingDescriptor = _reflection.GeneratedProtocolMessageType('FreebiePricingDescriptor', (_message.Message,), dict(
-  DESCRIPTOR = _FREEBIEPRICINGDESCRIPTOR,
-  __module__ = 'structs.pricing.PricingDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:FreebiePricingDescriptor)
-  ))
-_sym_db.RegisterMessage(FreebiePricingDescriptor)
-
-PricingDescriptor = _reflection.GeneratedProtocolMessageType('PricingDescriptor', (_message.Message,), dict(
-  DESCRIPTOR = _PRICINGDESCRIPTOR,
-  __module__ = 'structs.pricing.PricingDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:PricingDescriptor)
-  ))
-_sym_db.RegisterMessage(PricingDescriptor)
-
-ProductPricing = _reflection.GeneratedProtocolMessageType('ProductPricing', (_message.Message,), dict(
-  DESCRIPTOR = _PRODUCTPRICING,
-  __module__ = 'structs.pricing.PricingDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:ProductPricing)
-  ))
-_sym_db.RegisterMessage(ProductPricing)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!io.bloombox.schema.product.structB\022ProductPricingSpecH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/python/structs/pricing/SaleDescriptor_pb2.py b/languages/python/structs/pricing/SaleDescriptor_pb2.py
deleted file mode 100644
index 616ce25..0000000
--- a/languages/python/structs/pricing/SaleDescriptor_pb2.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/SaleDescriptor.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='structs/pricing/SaleDescriptor.proto',
-  package='',
-  syntax='proto3',
-  serialized_pb=_b('\n$structs/pricing/SaleDescriptor.proto\"\xc7\x01\n\x0eSaleDescriptor\x12\x17\n\x04type\x18\x01 \x01(\x0e\x32\t.SaleType\x12\x11\n\teffective\x18\x02 \x01(\x04\x12\x12\n\nexpiration\x18\x03 \x01(\x04\x12\x19\n\x11percentage_amount\x18\x14 \x01(\r\x12\x14\n\x0c\x62ogo_trigger\x18\x15 \x01(\r\x12\x13\n\x0b\x62ogo_reward\x18\x16 \x01(\r\x12\x17\n\x0floyalty_trigger\x18\x17 \x01(\r\x12\x16\n\x0eloyalty_reward\x18\x18 \x01(\r*1\n\x08SaleType\x12\x0e\n\nPERCENTAGE\x10\x00\x12\x08\n\x04\x42OGO\x10\x01\x12\x0b\n\x07LOYALTY\x10\x02\x42;\n!io.bloombox.schema.product.structB\x0fProductDiscountH\x01P\x01\xf8\x01\x01\x62\x06proto3')
-)
-
-_SALETYPE = _descriptor.EnumDescriptor(
-  name='SaleType',
-  full_name='SaleType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='PERCENTAGE', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='BOGO', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='LOYALTY', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=242,
-  serialized_end=291,
-)
-_sym_db.RegisterEnumDescriptor(_SALETYPE)
-
-SaleType = enum_type_wrapper.EnumTypeWrapper(_SALETYPE)
-PERCENTAGE = 0
-BOGO = 1
-LOYALTY = 2
-
-
-
-_SALEDESCRIPTOR = _descriptor.Descriptor(
-  name='SaleDescriptor',
-  full_name='SaleDescriptor',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='type', full_name='SaleDescriptor.type', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='effective', full_name='SaleDescriptor.effective', index=1,
-      number=2, type=4, cpp_type=4, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='expiration', full_name='SaleDescriptor.expiration', index=2,
-      number=3, type=4, cpp_type=4, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='percentage_amount', full_name='SaleDescriptor.percentage_amount', index=3,
-      number=20, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='bogo_trigger', full_name='SaleDescriptor.bogo_trigger', index=4,
-      number=21, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='bogo_reward', full_name='SaleDescriptor.bogo_reward', index=5,
-      number=22, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='loyalty_trigger', full_name='SaleDescriptor.loyalty_trigger', index=6,
-      number=23, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='loyalty_reward', full_name='SaleDescriptor.loyalty_reward', index=7,
-      number=24, type=13, cpp_type=3, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=41,
-  serialized_end=240,
-)
-
-_SALEDESCRIPTOR.fields_by_name['type'].enum_type = _SALETYPE
-DESCRIPTOR.message_types_by_name['SaleDescriptor'] = _SALEDESCRIPTOR
-DESCRIPTOR.enum_types_by_name['SaleType'] = _SALETYPE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-SaleDescriptor = _reflection.GeneratedProtocolMessageType('SaleDescriptor', (_message.Message,), dict(
-  DESCRIPTOR = _SALEDESCRIPTOR,
-  __module__ = 'structs.pricing.SaleDescriptor_pb2'
-  # @@protoc_insertion_point(class_scope:SaleDescriptor)
-  ))
-_sym_db.RegisterMessage(SaleDescriptor)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!io.bloombox.schema.product.structB\017ProductDiscountH\001P\001\370\001\001'))
-# @@protoc_insertion_point(module_scope)
diff --git a/languages/ruby/Product_pb.rb b/languages/ruby/Product_pb.rb
deleted file mode 100644
index 2a4de5e..0000000
--- a/languages/ruby/Product_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: Product.proto
-
-require 'google/protobuf'
-
-require 'base/ProductKey_pb'
-require 'base/ProductType_pb'
-require 'google/protobuf/any_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Product" do
-    optional :key, :message, 1, "ProductKey"
-    optional :type, :message, 2, "ProductType"
-    optional :data, :message, 3, "google.protobuf.Any"
-  end
-end
-
-Product = Google::Protobuf::DescriptorPool.generated_pool.lookup("Product").msgclass
diff --git a/languages/ruby/base/Compression_pb.rb b/languages/ruby/base/Compression_pb.rb
deleted file mode 100644
index 40ae74b..0000000
--- a/languages/ruby/base/Compression_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Compression.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Compression" do
-    optional :enabled, :bool, 1
-    optional :type, :enum, 2, "Compression.Type"
-  end
-  add_enum "Compression.Type" do
-    value :GZIP, 0
-  end
-end
-
-Compression = Google::Protobuf::DescriptorPool.generated_pool.lookup("Compression").msgclass
-Compression::Type = Google::Protobuf::DescriptorPool.generated_pool.lookup("Compression.Type").enummodule
diff --git a/languages/ruby/base/Language_pb.rb b/languages/ruby/base/Language_pb.rb
deleted file mode 100644
index 6042f71..0000000
--- a/languages/ruby/base/Language_pb.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Language.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "Language" do
-    value :ENGLISH, 0
-    value :SPANISH, 1
-    value :FRENCH, 2
-  end
-end
-
-Language = Google::Protobuf::DescriptorPool.generated_pool.lookup("Language").enummodule
diff --git a/languages/ruby/base/ProductKey_pb.rb b/languages/ruby/base/ProductKey_pb.rb
deleted file mode 100644
index edc90f8..0000000
--- a/languages/ruby/base/ProductKey_pb.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKey.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "ProductKey" do
-    optional :id, :string, 1
-  end
-end
-
-ProductKey = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductKey").msgclass
diff --git a/languages/ruby/base/ProductKind_pb.rb b/languages/ruby/base/ProductKind_pb.rb
deleted file mode 100644
index ef56e20..0000000
--- a/languages/ruby/base/ProductKind_pb.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductKind.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "ProductKind" do
-    value :FLOWERS, 0
-    value :EDIBLES, 1
-    value :EXTRACTS, 2
-    value :PREROLLS, 3
-    value :APOTHECARY, 4
-    value :CARTRIDGES, 5
-    value :PLANTS, 6
-    value :MERCHANDISE, 7
-  end
-end
-
-ProductKind = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductKind").enummodule
diff --git a/languages/ruby/base/ProductType_pb.rb b/languages/ruby/base/ProductType_pb.rb
deleted file mode 100644
index bb6d2cf..0000000
--- a/languages/ruby/base/ProductType_pb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/ProductType.proto
-
-require 'google/protobuf'
-
-require 'base/ProductKind_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "ProductType" do
-    optional :kind, :enum, 1, "ProductKind"
-  end
-end
-
-ProductType = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductType").msgclass
diff --git a/languages/ruby/base/Product_pb.rb b/languages/ruby/base/Product_pb.rb
deleted file mode 100644
index b1f53fb..0000000
--- a/languages/ruby/base/Product_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: base/Product.proto
-
-require 'google/protobuf'
-
-require 'base/ProductKey_pb'
-require 'base/ProductType_pb'
-require 'google/protobuf/any_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Product" do
-    optional :key, :message, 1, "ProductKey"
-    optional :type, :message, 2, "ProductType"
-    optional :data, :message, 3, "google.protobuf.Any"
-  end
-end
-
-Product = Google::Protobuf::DescriptorPool.generated_pool.lookup("Product").msgclass
diff --git a/languages/ruby/content/Brand_pb.rb b/languages/ruby/content/Brand_pb.rb
deleted file mode 100644
index e9590bb..0000000
--- a/languages/ruby/content/Brand_pb.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Brand.proto
-
-require 'google/protobuf'
-
-require 'content/Name_pb'
-require 'content/Content_pb'
-require 'media/MediaItem_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Brand" do
-    optional :name, :message, 1, "Name"
-    optional :parent, :message, 2, "Brand"
-    optional :summary, :message, 3, "Content"
-    repeated :media, :message, 20, "MediaItem"
-  end
-end
-
-Brand = Google::Protobuf::DescriptorPool.generated_pool.lookup("Brand").msgclass
diff --git a/languages/ruby/content/Content_pb.rb b/languages/ruby/content/Content_pb.rb
deleted file mode 100644
index 0e9c414..0000000
--- a/languages/ruby/content/Content_pb.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Content.proto
-
-require 'google/protobuf'
-
-require 'base/Language_pb'
-require 'base/Compression_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Content" do
-    optional :type, :enum, 1, "Content.Type"
-    optional :encoding, :enum, 2, "Content.Encoding"
-    optional :content, :bytes, 3
-    optional :language, :enum, 4, "Language"
-    optional :compression, :message, 5, "Compression"
-  end
-  add_enum "Content.Type" do
-    value :TEXT, 0
-    value :MARKDOWN, 1
-    value :HTML, 2
-  end
-  add_enum "Content.Encoding" do
-    value :UTF8, 0
-  end
-end
-
-Content = Google::Protobuf::DescriptorPool.generated_pool.lookup("Content").msgclass
-Content::Type = Google::Protobuf::DescriptorPool.generated_pool.lookup("Content.Type").enummodule
-Content::Encoding = Google::Protobuf::DescriptorPool.generated_pool.lookup("Content.Encoding").enummodule
diff --git a/languages/ruby/content/MaterialsData_pb.rb b/languages/ruby/content/MaterialsData_pb.rb
deleted file mode 100644
index c845164..0000000
--- a/languages/ruby/content/MaterialsData_pb.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/MaterialsData.proto
-
-require 'google/protobuf'
-
-require 'structs/Grow_pb'
-require 'structs/Species_pb'
-require 'structs/Genetics_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "MaterialsData" do
-    repeated :ingredients, :string, 1
-    optional :grow, :enum, 2, "Grow"
-    optional :species, :enum, 3, "Species"
-    optional :genetics, :message, 4, "Genetics"
-  end
-end
-
-MaterialsData = Google::Protobuf::DescriptorPool.generated_pool.lookup("MaterialsData").msgclass
diff --git a/languages/ruby/content/Name_pb.rb b/languages/ruby/content/Name_pb.rb
deleted file mode 100644
index 56947c1..0000000
--- a/languages/ruby/content/Name_pb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/Name.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Name" do
-    optional :primary, :string, 1
-    optional :display, :string, 2
-  end
-end
-
-Name = Google::Protobuf::DescriptorPool.generated_pool.lookup("Name").msgclass
diff --git a/languages/ruby/content/ProductContent_pb.rb b/languages/ruby/content/ProductContent_pb.rb
deleted file mode 100644
index 69bffae..0000000
--- a/languages/ruby/content/ProductContent_pb.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: content/ProductContent.proto
-
-require 'google/protobuf'
-
-require 'content/Name_pb'
-require 'content/Content_pb'
-require 'content/Brand_pb'
-require 'media/MediaItem_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "ProductContent" do
-    optional :name, :message, 1, "Name"
-    optional :summary, :message, 2, "Content"
-    optional :brand, :message, 3, "Brand"
-    repeated :media, :message, 20, "MediaItem"
-    optional :usage, :message, 30, "Content"
-    optional :dosage, :message, 31, "Content"
-    optional :advice, :message, 32, "Content"
-  end
-end
-
-ProductContent = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductContent").msgclass
diff --git a/languages/ruby/geo/Address_pb.rb b/languages/ruby/geo/Address_pb.rb
deleted file mode 100644
index 095945c..0000000
--- a/languages/ruby/geo/Address_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: geo/Address.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Address" do
-    optional :first_line, :string, 1
-    optional :second_line, :string, 2
-    optional :city, :string, 3
-    optional :state, :string, 4
-    optional :zipcode, :string, 5
-    optional :country, :string, 6
-  end
-end
-
-Address = Google::Protobuf::DescriptorPool.generated_pool.lookup("Address").msgclass
diff --git a/languages/ruby/media/MediaItem_pb.rb b/languages/ruby/media/MediaItem_pb.rb
deleted file mode 100644
index 3bfcbc9..0000000
--- a/languages/ruby/media/MediaItem_pb.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaItem.proto
-
-require 'google/protobuf'
-
-require 'media/MediaKey_pb'
-require 'media/MediaType_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "MediaItem" do
-    optional :key, :message, 1, "MediaKey"
-    optional :type, :message, 2, "MediaType"
-    optional :name, :string, 3
-  end
-end
-
-MediaItem = Google::Protobuf::DescriptorPool.generated_pool.lookup("MediaItem").msgclass
diff --git a/languages/ruby/media/MediaKey_pb.rb b/languages/ruby/media/MediaKey_pb.rb
deleted file mode 100644
index ce12b9e..0000000
--- a/languages/ruby/media/MediaKey_pb.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaKey.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "MediaKey" do
-    optional :id, :string, 1
-  end
-end
-
-MediaKey = Google::Protobuf::DescriptorPool.generated_pool.lookup("MediaKey").msgclass
diff --git a/languages/ruby/media/MediaType_pb.rb b/languages/ruby/media/MediaType_pb.rb
deleted file mode 100644
index 1f2cd55..0000000
--- a/languages/ruby/media/MediaType_pb.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: media/MediaType.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "MediaType" do
-    optional :kind, :enum, 1, "MediaType.Kind"
-    optional :image_type, :message, 101, "ImageType"
-    optional :document_type, :message, 201, "DocumentType"
-    optional :video_type, :message, 301, "VideoType"
-  end
-  add_enum "MediaType.Kind" do
-    value :LINK, 0
-    value :IMAGE, 1
-    value :DOCUMENT, 2
-    value :VIDEO, 3
-  end
-  add_message "ImageType" do
-    optional :kind, :enum, 1, "ImageType.ImageKind"
-  end
-  add_enum "ImageType.ImageKind" do
-    value :PNG, 0
-    value :JPG, 1
-    value :GIF, 2
-    value :SVG, 3
-    value :WEBP, 4
-  end
-  add_message "DocumentType" do
-    optional :kind, :enum, 1, "DocumentType.DocumentKind"
-    optional :compressed, :bool, 2
-  end
-  add_enum "DocumentType.DocumentKind" do
-    value :TXT, 0
-    value :HTML, 1
-    value :PDF, 2
-    value :MARKDOWN, 3
-  end
-  add_message "VideoType" do
-    optional :kind, :enum, 1, "VideoType.VideoKind"
-  end
-  add_enum "VideoType.VideoKind" do
-    value :MP4, 0
-    value :FLV, 1
-    value :HLS, 2
-  end
-end
-
-MediaType = Google::Protobuf::DescriptorPool.generated_pool.lookup("MediaType").msgclass
-MediaType::Kind = Google::Protobuf::DescriptorPool.generated_pool.lookup("MediaType.Kind").enummodule
-ImageType = Google::Protobuf::DescriptorPool.generated_pool.lookup("ImageType").msgclass
-ImageType::ImageKind = Google::Protobuf::DescriptorPool.generated_pool.lookup("ImageType.ImageKind").enummodule
-DocumentType = Google::Protobuf::DescriptorPool.generated_pool.lookup("DocumentType").msgclass
-DocumentType::DocumentKind = Google::Protobuf::DescriptorPool.generated_pool.lookup("DocumentType.DocumentKind").enummodule
-VideoType = Google::Protobuf::DescriptorPool.generated_pool.lookup("VideoType").msgclass
-VideoType::VideoKind = Google::Protobuf::DescriptorPool.generated_pool.lookup("VideoType.VideoKind").enummodule
diff --git a/languages/ruby/products/Flower_pb.rb b/languages/ruby/products/Flower_pb.rb
deleted file mode 100644
index d5c20fc..0000000
--- a/languages/ruby/products/Flower_pb.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: products/Flower.proto
-
-require 'google/protobuf'
-
-require 'base/ProductKey_pb'
-require 'content/MaterialsData_pb'
-require 'content/ProductContent_pb'
-require 'structs/FlagsDescriptor_pb'
-require 'structs/pricing/PricingDescriptor_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Flower" do
-    optional :key, :message, 1, "ProductKey"
-    optional :product_data, :message, 20, "ProductContent"
-    optional :material_data, :message, 21, "MaterialsData"
-    optional :flags, :message, 22, "FlagsDescriptor"
-    optional :pricing, :message, 23, "ProductPricing"
-  end
-end
-
-Flower = Google::Protobuf::DescriptorPool.generated_pool.lookup("Flower").msgclass
diff --git a/languages/ruby/structs/FlagsDescriptor_pb.rb b/languages/ruby/structs/FlagsDescriptor_pb.rb
deleted file mode 100644
index 86ed94e..0000000
--- a/languages/ruby/structs/FlagsDescriptor_pb.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/FlagsDescriptor.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "ProductFlagValue" do
-    optional :type, :enum, 1, "ProductFlag"
-    optional :value, :bool, 2
-  end
-  add_message "ProductFlagset" do
-    repeated :flags, :message, 1, "ProductFlagValue"
-  end
-  add_message "FlagsDescriptor" do
-    optional :visible, :bool, 1
-    optional :premium, :bool, 2
-    optional :featured, :bool, 3
-    optional :lastchance, :bool, 4
-    optional :inhouse, :bool, 5
-  end
-  add_enum "ProductFlag" do
-    value :VISIBLE, 0
-    value :PREMIUM, 1
-    value :FEATURED, 2
-    value :LASTCHANCE, 3
-    value :INHOUSE, 4
-  end
-end
-
-ProductFlagValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductFlagValue").msgclass
-ProductFlagset = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductFlagset").msgclass
-FlagsDescriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup("FlagsDescriptor").msgclass
-ProductFlag = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductFlag").enummodule
diff --git a/languages/ruby/structs/Genetics_pb.rb b/languages/ruby/structs/Genetics_pb.rb
deleted file mode 100644
index 89951f8..0000000
--- a/languages/ruby/structs/Genetics_pb.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Genetics.proto
-
-require 'google/protobuf'
-
-require 'content/Name_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "Genetics" do
-    optional :male, :message, 1, "Name"
-    optional :female, :message, 2, "Name"
-  end
-end
-
-Genetics = Google::Protobuf::DescriptorPool.generated_pool.lookup("Genetics").msgclass
diff --git a/languages/ruby/structs/Grow_pb.rb b/languages/ruby/structs/Grow_pb.rb
deleted file mode 100644
index 7c6f094..0000000
--- a/languages/ruby/structs/Grow_pb.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Grow.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "Grow" do
-    value :GENERIC, 0
-    value :INDOOR, 1
-    value :GREENHOUSE, 2
-    value :OUTDOOR, 3
-  end
-end
-
-Grow = Google::Protobuf::DescriptorPool.generated_pool.lookup("Grow").enummodule
diff --git a/languages/ruby/structs/Species_pb.rb b/languages/ruby/structs/Species_pb.rb
deleted file mode 100644
index 4ee7341..0000000
--- a/languages/ruby/structs/Species_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/Species.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "Species" do
-    value :UNSPECIFIED, 0
-    value :SATIVA, 1
-    value :HYBRID_SATIVA, 2
-    value :HYBRID, 3
-    value :HYBRID_INDICA, 4
-    value :INDICA, 5
-  end
-end
-
-Species = Google::Protobuf::DescriptorPool.generated_pool.lookup("Species").enummodule
diff --git a/languages/ruby/structs/pricing/PricingDescriptor_pb.rb b/languages/ruby/structs/pricing/PricingDescriptor_pb.rb
deleted file mode 100644
index 0eb9c20..0000000
--- a/languages/ruby/structs/pricing/PricingDescriptor_pb.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/PricingDescriptor.proto
-
-require 'google/protobuf'
-
-require 'structs/pricing/SaleDescriptor_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "PricingTierAvailability" do
-    optional :offered, :bool, 1
-    optional :available, :bool, 2
-  end
-  add_message "UnitPricingDescriptor" do
-    optional :price_value, :float, 1
-    optional :status, :message, 2, "PricingTierAvailability"
-    repeated :discounts, :message, 3, "SaleDescriptor"
-  end
-  add_message "WeightedPricingDescriptor" do
-    optional :weight, :enum, 1, "PricingWeightTier"
-    optional :tier, :message, 2, "UnitPricingDescriptor"
-    optional :weightInGrams, :float, 3
-  end
-  add_message "FreebiePricingDescriptor" do
-  end
-  add_message "PricingDescriptor" do
-    optional :type, :enum, 1, "PricingType"
-    optional :unit, :message, 20, "UnitPricingDescriptor"
-    optional :weighted, :message, 21, "WeightedPricingDescriptor"
-    optional :freebie, :message, 22, "FreebiePricingDescriptor"
-  end
-  add_message "ProductPricing" do
-    repeated :discounts, :message, 1, "SaleDescriptor"
-    repeated :manifest, :message, 2, "PricingDescriptor"
-  end
-  add_enum "PricingType" do
-    value :UNIT, 0
-    value :WEIGHTED, 1
-    value :FREEBIE, 2
-  end
-  add_enum "PricingWeightTier" do
-    value :OTHER, 0
-    value :GRAM, 1
-    value :HALFGRAM, 2
-    value :QUARTERGRAM, 3
-    value :DUB, 4
-    value :EIGHTH, 5
-    value :QUARTER, 6
-    value :HALF, 7
-    value :OUNCE, 8
-    value :POUND, 9
-  end
-end
-
-PricingTierAvailability = Google::Protobuf::DescriptorPool.generated_pool.lookup("PricingTierAvailability").msgclass
-UnitPricingDescriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup("UnitPricingDescriptor").msgclass
-WeightedPricingDescriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup("WeightedPricingDescriptor").msgclass
-FreebiePricingDescriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup("FreebiePricingDescriptor").msgclass
-PricingDescriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup("PricingDescriptor").msgclass
-ProductPricing = Google::Protobuf::DescriptorPool.generated_pool.lookup("ProductPricing").msgclass
-PricingType = Google::Protobuf::DescriptorPool.generated_pool.lookup("PricingType").enummodule
-PricingWeightTier = Google::Protobuf::DescriptorPool.generated_pool.lookup("PricingWeightTier").enummodule
diff --git a/languages/ruby/structs/pricing/SaleDescriptor_pb.rb b/languages/ruby/structs/pricing/SaleDescriptor_pb.rb
deleted file mode 100644
index 3872ce6..0000000
--- a/languages/ruby/structs/pricing/SaleDescriptor_pb.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: structs/pricing/SaleDescriptor.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "SaleDescriptor" do
-    optional :type, :enum, 1, "SaleType"
-    optional :effective, :uint64, 2
-    optional :expiration, :uint64, 3
-    optional :percentage_amount, :uint32, 20
-    optional :bogo_trigger, :uint32, 21
-    optional :bogo_reward, :uint32, 22
-    optional :loyalty_trigger, :uint32, 23
-    optional :loyalty_reward, :uint32, 24
-  end
-  add_enum "SaleType" do
-    value :PERCENTAGE, 0
-    value :BOGO, 1
-    value :LOYALTY, 2
-  end
-end
-
-SaleDescriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup("SaleDescriptor").msgclass
-SaleType = Google::Protobuf::DescriptorPool.generated_pool.lookup("SaleType").enummodule
diff --git a/languages/swift/Address.pb.swift b/languages/swift/Address.pb.swift
deleted file mode 100644
index a4bc0eb..0000000
--- a/languages/swift/Address.pb.swift
+++ /dev/null
@@ -1,108 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: geo/Address.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Address: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Address"
-
-  public var firstLine: String = String()
-
-  public var secondLine: String = String()
-
-  public var city: String = String()
-
-  public var state: String = String()
-
-  public var zipcode: String = String()
-
-  public var country: String = String()
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularStringField(value: &self.firstLine)
-      case 2: try decoder.decodeSingularStringField(value: &self.secondLine)
-      case 3: try decoder.decodeSingularStringField(value: &self.city)
-      case 4: try decoder.decodeSingularStringField(value: &self.state)
-      case 5: try decoder.decodeSingularStringField(value: &self.zipcode)
-      case 6: try decoder.decodeSingularStringField(value: &self.country)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.firstLine.isEmpty {
-      try visitor.visitSingularStringField(value: self.firstLine, fieldNumber: 1)
-    }
-    if !self.secondLine.isEmpty {
-      try visitor.visitSingularStringField(value: self.secondLine, fieldNumber: 2)
-    }
-    if !self.city.isEmpty {
-      try visitor.visitSingularStringField(value: self.city, fieldNumber: 3)
-    }
-    if !self.state.isEmpty {
-      try visitor.visitSingularStringField(value: self.state, fieldNumber: 4)
-    }
-    if !self.zipcode.isEmpty {
-      try visitor.visitSingularStringField(value: self.zipcode, fieldNumber: 5)
-    }
-    if !self.country.isEmpty {
-      try visitor.visitSingularStringField(value: self.country, fieldNumber: 6)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Address: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .standard(proto: "first_line"),
-    2: .standard(proto: "second_line"),
-    3: .same(proto: "city"),
-    4: .same(proto: "state"),
-    5: .same(proto: "zipcode"),
-    6: .same(proto: "country"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: Address) -> Bool {
-    if self.firstLine != other.firstLine {return false}
-    if self.secondLine != other.secondLine {return false}
-    if self.city != other.city {return false}
-    if self.state != other.state {return false}
-    if self.zipcode != other.zipcode {return false}
-    if self.country != other.country {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Brand.pb.swift b/languages/swift/Brand.pb.swift
deleted file mode 100644
index d615c20..0000000
--- a/languages/swift/Brand.pb.swift
+++ /dev/null
@@ -1,158 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: content/Brand.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Brand: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Brand"
-
-  /// -- Basic Properties
-  public var name: Name {
-    get {return _storage._name ?? Name()}
-    set {_uniqueStorage()._name = newValue}
-  }
-  /// Returns true if `name` has been explicitly set.
-  public var hasName: Bool {return _storage._name != nil}
-  /// Clears the value of `name`. Subsequent reads from it will return its default value.
-  public mutating func clearName() {_storage._name = nil}
-
-  public var parent: Brand {
-    get {return _storage._parent ?? Brand()}
-    set {_uniqueStorage()._parent = newValue}
-  }
-  /// Returns true if `parent` has been explicitly set.
-  public var hasParent: Bool {return _storage._parent != nil}
-  /// Clears the value of `parent`. Subsequent reads from it will return its default value.
-  public mutating func clearParent() {_storage._parent = nil}
-
-  public var summary: Content {
-    get {return _storage._summary ?? Content()}
-    set {_uniqueStorage()._summary = newValue}
-  }
-  /// Returns true if `summary` has been explicitly set.
-  public var hasSummary: Bool {return _storage._summary != nil}
-  /// Clears the value of `summary`. Subsequent reads from it will return its default value.
-  public mutating func clearSummary() {_storage._summary = nil}
-
-  /// -- Media
-  public var media: [MediaItem] {
-    get {return _storage._media}
-    set {_uniqueStorage()._media = newValue}
-  }
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularMessageField(value: &_storage._name)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._parent)
-        case 3: try decoder.decodeSingularMessageField(value: &_storage._summary)
-        case 20: try decoder.decodeRepeatedMessageField(value: &_storage._media)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if let v = _storage._name {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
-      }
-      if let v = _storage._parent {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-      if let v = _storage._summary {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
-      }
-      if !_storage._media.isEmpty {
-        try visitor.visitRepeatedMessageField(value: _storage._media, fieldNumber: 20)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Brand: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "name"),
-    2: .same(proto: "parent"),
-    3: .same(proto: "summary"),
-    20: .same(proto: "media"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _name: Name? = nil
-    var _parent: Brand? = nil
-    var _summary: Content? = nil
-    var _media: [MediaItem] = []
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _name = source._name
-      _parent = source._parent
-      _summary = source._summary
-      _media = source._media
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: Brand) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._name != other_storage._name {return false}
-        if _storage._parent != other_storage._parent {return false}
-        if _storage._summary != other_storage._summary {return false}
-        if _storage._media != other_storage._media {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Compression.pb.swift b/languages/swift/Compression.pb.swift
deleted file mode 100644
index d29e03e..0000000
--- a/languages/swift/Compression.pb.swift
+++ /dev/null
@@ -1,107 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: base/Compression.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Compression: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Compression"
-
-  public var enabled: Bool = false
-
-  public var type: Compression.TypeEnum = .gzip
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public enum TypeEnum: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case gzip // = 0
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .gzip
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .gzip
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .gzip: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularBoolField(value: &self.enabled)
-      case 2: try decoder.decodeSingularEnumField(value: &self.type)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.enabled != false {
-      try visitor.visitSingularBoolField(value: self.enabled, fieldNumber: 1)
-    }
-    if self.type != .gzip {
-      try visitor.visitSingularEnumField(value: self.type, fieldNumber: 2)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Compression: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "enabled"),
-    2: .same(proto: "type"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: Compression) -> Bool {
-    if self.enabled != other.enabled {return false}
-    if self.type != other.type {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension Compression.TypeEnum: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "GZIP"),
-  ]
-}
diff --git a/languages/swift/Content.pb.swift b/languages/swift/Content.pb.swift
deleted file mode 100644
index 60e419b..0000000
--- a/languages/swift/Content.pb.swift
+++ /dev/null
@@ -1,231 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: content/Content.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Content: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Content"
-
-  public var type: Content.TypeEnum {
-    get {return _storage._type}
-    set {_uniqueStorage()._type = newValue}
-  }
-
-  public var encoding: Content.Encoding {
-    get {return _storage._encoding}
-    set {_uniqueStorage()._encoding = newValue}
-  }
-
-  public var content: Data {
-    get {return _storage._content}
-    set {_uniqueStorage()._content = newValue}
-  }
-
-  public var language: Language {
-    get {return _storage._language}
-    set {_uniqueStorage()._language = newValue}
-  }
-
-  public var compression: Compression {
-    get {return _storage._compression ?? Compression()}
-    set {_uniqueStorage()._compression = newValue}
-  }
-  /// Returns true if `compression` has been explicitly set.
-  public var hasCompression: Bool {return _storage._compression != nil}
-  /// Clears the value of `compression`. Subsequent reads from it will return its default value.
-  public mutating func clearCompression() {_storage._compression = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public enum TypeEnum: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case text // = 0
-    case markdown // = 1
-    case html // = 2
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .text
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .text
-      case 1: self = .markdown
-      case 2: self = .html
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .text: return 0
-      case .markdown: return 1
-      case .html: return 2
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public enum Encoding: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case utf8 // = 0
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .utf8
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .utf8
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .utf8: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularEnumField(value: &_storage._type)
-        case 2: try decoder.decodeSingularEnumField(value: &_storage._encoding)
-        case 3: try decoder.decodeSingularBytesField(value: &_storage._content)
-        case 4: try decoder.decodeSingularEnumField(value: &_storage._language)
-        case 5: try decoder.decodeSingularMessageField(value: &_storage._compression)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if _storage._type != .text {
-        try visitor.visitSingularEnumField(value: _storage._type, fieldNumber: 1)
-      }
-      if _storage._encoding != .utf8 {
-        try visitor.visitSingularEnumField(value: _storage._encoding, fieldNumber: 2)
-      }
-      if !_storage._content.isEmpty {
-        try visitor.visitSingularBytesField(value: _storage._content, fieldNumber: 3)
-      }
-      if _storage._language != .english {
-        try visitor.visitSingularEnumField(value: _storage._language, fieldNumber: 4)
-      }
-      if let v = _storage._compression {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Content: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "type"),
-    2: .same(proto: "encoding"),
-    3: .same(proto: "content"),
-    4: .same(proto: "language"),
-    5: .same(proto: "compression"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _type: Content.TypeEnum = .text
-    var _encoding: Content.Encoding = .utf8
-    var _content: Data = SwiftProtobuf.Internal.emptyData
-    var _language: Language = .english
-    var _compression: Compression? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _type = source._type
-      _encoding = source._encoding
-      _content = source._content
-      _language = source._language
-      _compression = source._compression
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: Content) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._type != other_storage._type {return false}
-        if _storage._encoding != other_storage._encoding {return false}
-        if _storage._content != other_storage._content {return false}
-        if _storage._language != other_storage._language {return false}
-        if _storage._compression != other_storage._compression {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension Content.TypeEnum: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "TEXT"),
-    1: .same(proto: "MARKDOWN"),
-    2: .same(proto: "HTML"),
-  ]
-}
-
-extension Content.Encoding: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "UTF8"),
-  ]
-}
diff --git a/languages/swift/FlagsDescriptor.pb.swift b/languages/swift/FlagsDescriptor.pb.swift
deleted file mode 100644
index 744b18d..0000000
--- a/languages/swift/FlagsDescriptor.pb.swift
+++ /dev/null
@@ -1,247 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: structs/FlagsDescriptor.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public enum ProductFlag: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case visible // = 0
-  case premium // = 1
-  case featured // = 2
-  case lastchance // = 3
-  case inhouse // = 4
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .visible
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .visible
-    case 1: self = .premium
-    case 2: self = .featured
-    case 3: self = .lastchance
-    case 4: self = .inhouse
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .visible: return 0
-    case .premium: return 1
-    case .featured: return 2
-    case .lastchance: return 3
-    case .inhouse: return 4
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-public struct ProductFlagValue: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ProductFlagValue"
-
-  public var type: ProductFlag = .visible
-
-  public var value: Bool = false
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularEnumField(value: &self.type)
-      case 2: try decoder.decodeSingularBoolField(value: &self.value)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.type != .visible {
-      try visitor.visitSingularEnumField(value: self.type, fieldNumber: 1)
-    }
-    if self.value != false {
-      try visitor.visitSingularBoolField(value: self.value, fieldNumber: 2)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-public struct ProductFlagset: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ProductFlagset"
-
-  public var flags: [ProductFlagValue] = []
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeRepeatedMessageField(value: &self.flags)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.flags.isEmpty {
-      try visitor.visitRepeatedMessageField(value: self.flags, fieldNumber: 1)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-public struct FlagsDescriptor: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "FlagsDescriptor"
-
-  public var visible: Bool = false
-
-  public var premium: Bool = false
-
-  public var featured: Bool = false
-
-  public var lastchance: Bool = false
-
-  public var inhouse: Bool = false
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularBoolField(value: &self.visible)
-      case 2: try decoder.decodeSingularBoolField(value: &self.premium)
-      case 3: try decoder.decodeSingularBoolField(value: &self.featured)
-      case 4: try decoder.decodeSingularBoolField(value: &self.lastchance)
-      case 5: try decoder.decodeSingularBoolField(value: &self.inhouse)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.visible != false {
-      try visitor.visitSingularBoolField(value: self.visible, fieldNumber: 1)
-    }
-    if self.premium != false {
-      try visitor.visitSingularBoolField(value: self.premium, fieldNumber: 2)
-    }
-    if self.featured != false {
-      try visitor.visitSingularBoolField(value: self.featured, fieldNumber: 3)
-    }
-    if self.lastchance != false {
-      try visitor.visitSingularBoolField(value: self.lastchance, fieldNumber: 4)
-    }
-    if self.inhouse != false {
-      try visitor.visitSingularBoolField(value: self.inhouse, fieldNumber: 5)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension ProductFlag: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "VISIBLE"),
-    1: .same(proto: "PREMIUM"),
-    2: .same(proto: "FEATURED"),
-    3: .same(proto: "LASTCHANCE"),
-    4: .same(proto: "INHOUSE"),
-  ]
-}
-
-extension ProductFlagValue: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "type"),
-    2: .same(proto: "value"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: ProductFlagValue) -> Bool {
-    if self.type != other.type {return false}
-    if self.value != other.value {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension ProductFlagset: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "flags"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: ProductFlagset) -> Bool {
-    if self.flags != other.flags {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension FlagsDescriptor: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "visible"),
-    2: .same(proto: "premium"),
-    3: .same(proto: "featured"),
-    4: .same(proto: "lastchance"),
-    5: .same(proto: "inhouse"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: FlagsDescriptor) -> Bool {
-    if self.visible != other.visible {return false}
-    if self.premium != other.premium {return false}
-    if self.featured != other.featured {return false}
-    if self.lastchance != other.lastchance {return false}
-    if self.inhouse != other.inhouse {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Flower.pb.swift b/languages/swift/Flower.pb.swift
deleted file mode 100644
index a9a7a15..0000000
--- a/languages/swift/Flower.pb.swift
+++ /dev/null
@@ -1,180 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: products/Flower.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Flower: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Flower"
-
-  /// -- Object Key
-  public var key: ProductKey {
-    get {return _storage._key ?? ProductKey()}
-    set {_uniqueStorage()._key = newValue}
-  }
-  /// Returns true if `key` has been explicitly set.
-  public var hasKey: Bool {return _storage._key != nil}
-  /// Clears the value of `key`. Subsequent reads from it will return its default value.
-  public mutating func clearKey() {_storage._key = nil}
-
-  /// -- Basic Product & Materials Data
-  public var productData: ProductContent {
-    get {return _storage._productData ?? ProductContent()}
-    set {_uniqueStorage()._productData = newValue}
-  }
-  /// Returns true if `productData` has been explicitly set.
-  public var hasProductData: Bool {return _storage._productData != nil}
-  /// Clears the value of `productData`. Subsequent reads from it will return its default value.
-  public mutating func clearProductData() {_storage._productData = nil}
-
-  public var materialData: MaterialsData {
-    get {return _storage._materialData ?? MaterialsData()}
-    set {_uniqueStorage()._materialData = newValue}
-  }
-  /// Returns true if `materialData` has been explicitly set.
-  public var hasMaterialData: Bool {return _storage._materialData != nil}
-  /// Clears the value of `materialData`. Subsequent reads from it will return its default value.
-  public mutating func clearMaterialData() {_storage._materialData = nil}
-
-  /// -- Flags and Pricing
-  public var flags: FlagsDescriptor {
-    get {return _storage._flags ?? FlagsDescriptor()}
-    set {_uniqueStorage()._flags = newValue}
-  }
-  /// Returns true if `flags` has been explicitly set.
-  public var hasFlags: Bool {return _storage._flags != nil}
-  /// Clears the value of `flags`. Subsequent reads from it will return its default value.
-  public mutating func clearFlags() {_storage._flags = nil}
-
-  public var pricing: ProductPricing {
-    get {return _storage._pricing ?? ProductPricing()}
-    set {_uniqueStorage()._pricing = newValue}
-  }
-  /// Returns true if `pricing` has been explicitly set.
-  public var hasPricing: Bool {return _storage._pricing != nil}
-  /// Clears the value of `pricing`. Subsequent reads from it will return its default value.
-  public mutating func clearPricing() {_storage._pricing = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularMessageField(value: &_storage._key)
-        case 20: try decoder.decodeSingularMessageField(value: &_storage._productData)
-        case 21: try decoder.decodeSingularMessageField(value: &_storage._materialData)
-        case 22: try decoder.decodeSingularMessageField(value: &_storage._flags)
-        case 23: try decoder.decodeSingularMessageField(value: &_storage._pricing)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if let v = _storage._key {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
-      }
-      if let v = _storage._productData {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 20)
-      }
-      if let v = _storage._materialData {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 21)
-      }
-      if let v = _storage._flags {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 22)
-      }
-      if let v = _storage._pricing {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 23)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Flower: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "key"),
-    20: .standard(proto: "product_data"),
-    21: .standard(proto: "material_data"),
-    22: .same(proto: "flags"),
-    23: .same(proto: "pricing"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _key: ProductKey? = nil
-    var _productData: ProductContent? = nil
-    var _materialData: MaterialsData? = nil
-    var _flags: FlagsDescriptor? = nil
-    var _pricing: ProductPricing? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _key = source._key
-      _productData = source._productData
-      _materialData = source._materialData
-      _flags = source._flags
-      _pricing = source._pricing
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: Flower) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._key != other_storage._key {return false}
-        if _storage._productData != other_storage._productData {return false}
-        if _storage._materialData != other_storage._materialData {return false}
-        if _storage._flags != other_storage._flags {return false}
-        if _storage._pricing != other_storage._pricing {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Genetics.pb.swift b/languages/swift/Genetics.pb.swift
deleted file mode 100644
index bc67edd..0000000
--- a/languages/swift/Genetics.pb.swift
+++ /dev/null
@@ -1,126 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: structs/Genetics.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Genetics: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Genetics"
-
-  public var male: Name {
-    get {return _storage._male ?? Name()}
-    set {_uniqueStorage()._male = newValue}
-  }
-  /// Returns true if `male` has been explicitly set.
-  public var hasMale: Bool {return _storage._male != nil}
-  /// Clears the value of `male`. Subsequent reads from it will return its default value.
-  public mutating func clearMale() {_storage._male = nil}
-
-  public var female: Name {
-    get {return _storage._female ?? Name()}
-    set {_uniqueStorage()._female = newValue}
-  }
-  /// Returns true if `female` has been explicitly set.
-  public var hasFemale: Bool {return _storage._female != nil}
-  /// Clears the value of `female`. Subsequent reads from it will return its default value.
-  public mutating func clearFemale() {_storage._female = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularMessageField(value: &_storage._male)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._female)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if let v = _storage._male {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
-      }
-      if let v = _storage._female {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Genetics: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "male"),
-    2: .same(proto: "female"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _male: Name? = nil
-    var _female: Name? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _male = source._male
-      _female = source._female
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: Genetics) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._male != other_storage._male {return false}
-        if _storage._female != other_storage._female {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Grow.pb.swift b/languages/swift/Grow.pb.swift
deleted file mode 100644
index 42a4c15..0000000
--- a/languages/swift/Grow.pb.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: structs/Grow.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public enum Grow: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case generic // = 0
-  case indoor // = 1
-  case greenhouse // = 2
-  case outdoor // = 3
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .generic
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .generic
-    case 1: self = .indoor
-    case 2: self = .greenhouse
-    case 3: self = .outdoor
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .generic: return 0
-    case .indoor: return 1
-    case .greenhouse: return 2
-    case .outdoor: return 3
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Grow: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "GENERIC"),
-    1: .same(proto: "INDOOR"),
-    2: .same(proto: "GREENHOUSE"),
-    3: .same(proto: "OUTDOOR"),
-  ]
-}
diff --git a/languages/swift/Language.pb.swift b/languages/swift/Language.pb.swift
deleted file mode 100644
index 73b6755..0000000
--- a/languages/swift/Language.pb.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: base/Language.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public enum Language: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case english // = 0
-  case spanish // = 1
-  case french // = 2
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .english
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .english
-    case 1: self = .spanish
-    case 2: self = .french
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .english: return 0
-    case .spanish: return 1
-    case .french: return 2
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Language: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "ENGLISH"),
-    1: .same(proto: "SPANISH"),
-    2: .same(proto: "FRENCH"),
-  ]
-}
diff --git a/languages/swift/MaterialsData.pb.swift b/languages/swift/MaterialsData.pb.swift
deleted file mode 100644
index de87b72..0000000
--- a/languages/swift/MaterialsData.pb.swift
+++ /dev/null
@@ -1,148 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: content/MaterialsData.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct MaterialsData: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "MaterialsData"
-
-  public var ingredients: [String] {
-    get {return _storage._ingredients}
-    set {_uniqueStorage()._ingredients = newValue}
-  }
-
-  public var grow: Grow {
-    get {return _storage._grow}
-    set {_uniqueStorage()._grow = newValue}
-  }
-
-  public var species: Species {
-    get {return _storage._species}
-    set {_uniqueStorage()._species = newValue}
-  }
-
-  public var genetics: Genetics {
-    get {return _storage._genetics ?? Genetics()}
-    set {_uniqueStorage()._genetics = newValue}
-  }
-  /// Returns true if `genetics` has been explicitly set.
-  public var hasGenetics: Bool {return _storage._genetics != nil}
-  /// Clears the value of `genetics`. Subsequent reads from it will return its default value.
-  public mutating func clearGenetics() {_storage._genetics = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeRepeatedStringField(value: &_storage._ingredients)
-        case 2: try decoder.decodeSingularEnumField(value: &_storage._grow)
-        case 3: try decoder.decodeSingularEnumField(value: &_storage._species)
-        case 4: try decoder.decodeSingularMessageField(value: &_storage._genetics)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if !_storage._ingredients.isEmpty {
-        try visitor.visitRepeatedStringField(value: _storage._ingredients, fieldNumber: 1)
-      }
-      if _storage._grow != .generic {
-        try visitor.visitSingularEnumField(value: _storage._grow, fieldNumber: 2)
-      }
-      if _storage._species != .unspecified {
-        try visitor.visitSingularEnumField(value: _storage._species, fieldNumber: 3)
-      }
-      if let v = _storage._genetics {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension MaterialsData: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "ingredients"),
-    2: .same(proto: "grow"),
-    3: .same(proto: "species"),
-    4: .same(proto: "genetics"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _ingredients: [String] = []
-    var _grow: Grow = .generic
-    var _species: Species = .unspecified
-    var _genetics: Genetics? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _ingredients = source._ingredients
-      _grow = source._grow
-      _species = source._species
-      _genetics = source._genetics
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: MaterialsData) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._ingredients != other_storage._ingredients {return false}
-        if _storage._grow != other_storage._grow {return false}
-        if _storage._species != other_storage._species {return false}
-        if _storage._genetics != other_storage._genetics {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/MediaItem.pb.swift b/languages/swift/MediaItem.pb.swift
deleted file mode 100644
index c16e9fe..0000000
--- a/languages/swift/MediaItem.pb.swift
+++ /dev/null
@@ -1,139 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: media/MediaItem.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct MediaItem: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "MediaItem"
-
-  public var key: MediaKey {
-    get {return _storage._key ?? MediaKey()}
-    set {_uniqueStorage()._key = newValue}
-  }
-  /// Returns true if `key` has been explicitly set.
-  public var hasKey: Bool {return _storage._key != nil}
-  /// Clears the value of `key`. Subsequent reads from it will return its default value.
-  public mutating func clearKey() {_storage._key = nil}
-
-  public var type: MediaType {
-    get {return _storage._type ?? MediaType()}
-    set {_uniqueStorage()._type = newValue}
-  }
-  /// Returns true if `type` has been explicitly set.
-  public var hasType: Bool {return _storage._type != nil}
-  /// Clears the value of `type`. Subsequent reads from it will return its default value.
-  public mutating func clearType() {_storage._type = nil}
-
-  public var name: String {
-    get {return _storage._name}
-    set {_uniqueStorage()._name = newValue}
-  }
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularMessageField(value: &_storage._key)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._type)
-        case 3: try decoder.decodeSingularStringField(value: &_storage._name)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if let v = _storage._key {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
-      }
-      if let v = _storage._type {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-      if !_storage._name.isEmpty {
-        try visitor.visitSingularStringField(value: _storage._name, fieldNumber: 3)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension MediaItem: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "key"),
-    2: .same(proto: "type"),
-    3: .same(proto: "name"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _key: MediaKey? = nil
-    var _type: MediaType? = nil
-    var _name: String = String()
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _key = source._key
-      _type = source._type
-      _name = source._name
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: MediaItem) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._key != other_storage._key {return false}
-        if _storage._type != other_storage._type {return false}
-        if _storage._name != other_storage._name {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/MediaKey.pb.swift b/languages/swift/MediaKey.pb.swift
deleted file mode 100644
index 0f8774a..0000000
--- a/languages/swift/MediaKey.pb.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: media/MediaKey.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct MediaKey: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "MediaKey"
-
-  public var id: String = String()
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularStringField(value: &self.id)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.id.isEmpty {
-      try visitor.visitSingularStringField(value: self.id, fieldNumber: 1)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension MediaKey: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "id"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: MediaKey) -> Bool {
-    if self.id != other.id {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/MediaType.pb.swift b/languages/swift/MediaType.pb.swift
deleted file mode 100644
index abbd176..0000000
--- a/languages/swift/MediaType.pb.swift
+++ /dev/null
@@ -1,478 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: media/MediaType.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-/// -- Media Type: Top-level -- //
-public struct MediaType: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "MediaType"
-
-  public var kind: MediaType.Kind {
-    get {return _storage._kind}
-    set {_uniqueStorage()._kind = newValue}
-  }
-
-  public var imageType: ImageType {
-    get {return _storage._imageType ?? ImageType()}
-    set {_uniqueStorage()._imageType = newValue}
-  }
-  /// Returns true if `imageType` has been explicitly set.
-  public var hasImageType: Bool {return _storage._imageType != nil}
-  /// Clears the value of `imageType`. Subsequent reads from it will return its default value.
-  public mutating func clearImageType() {_storage._imageType = nil}
-
-  public var documentType: DocumentType {
-    get {return _storage._documentType ?? DocumentType()}
-    set {_uniqueStorage()._documentType = newValue}
-  }
-  /// Returns true if `documentType` has been explicitly set.
-  public var hasDocumentType: Bool {return _storage._documentType != nil}
-  /// Clears the value of `documentType`. Subsequent reads from it will return its default value.
-  public mutating func clearDocumentType() {_storage._documentType = nil}
-
-  public var videoType: VideoType {
-    get {return _storage._videoType ?? VideoType()}
-    set {_uniqueStorage()._videoType = newValue}
-  }
-  /// Returns true if `videoType` has been explicitly set.
-  public var hasVideoType: Bool {return _storage._videoType != nil}
-  /// Clears the value of `videoType`. Subsequent reads from it will return its default value.
-  public mutating func clearVideoType() {_storage._videoType = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public enum Kind: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case link // = 0
-    case image // = 1
-    case document // = 2
-    case video // = 3
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .link
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .link
-      case 1: self = .image
-      case 2: self = .document
-      case 3: self = .video
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .link: return 0
-      case .image: return 1
-      case .document: return 2
-      case .video: return 3
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularEnumField(value: &_storage._kind)
-        case 101: try decoder.decodeSingularMessageField(value: &_storage._imageType)
-        case 201: try decoder.decodeSingularMessageField(value: &_storage._documentType)
-        case 301: try decoder.decodeSingularMessageField(value: &_storage._videoType)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if _storage._kind != .link {
-        try visitor.visitSingularEnumField(value: _storage._kind, fieldNumber: 1)
-      }
-      if let v = _storage._imageType {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 101)
-      }
-      if let v = _storage._documentType {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 201)
-      }
-      if let v = _storage._videoType {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 301)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-/// -- Media Type: Images -- //
-public struct ImageType: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ImageType"
-
-  public var kind: ImageType.ImageKind = .png
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public enum ImageKind: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case png // = 0
-    case jpg // = 1
-    case gif // = 2
-    case svg // = 3
-    case webp // = 4
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .png
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .png
-      case 1: self = .jpg
-      case 2: self = .gif
-      case 3: self = .svg
-      case 4: self = .webp
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .png: return 0
-      case .jpg: return 1
-      case .gif: return 2
-      case .svg: return 3
-      case .webp: return 4
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularEnumField(value: &self.kind)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.kind != .png {
-      try visitor.visitSingularEnumField(value: self.kind, fieldNumber: 1)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-/// -- Media Type: Document -- //
-public struct DocumentType: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "DocumentType"
-
-  public var kind: DocumentType.DocumentKind = .txt
-
-  public var compressed: Bool = false
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public enum DocumentKind: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case txt // = 0
-    case html // = 1
-    case pdf // = 2
-    case markdown // = 3
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .txt
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .txt
-      case 1: self = .html
-      case 2: self = .pdf
-      case 3: self = .markdown
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .txt: return 0
-      case .html: return 1
-      case .pdf: return 2
-      case .markdown: return 3
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularEnumField(value: &self.kind)
-      case 2: try decoder.decodeSingularBoolField(value: &self.compressed)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.kind != .txt {
-      try visitor.visitSingularEnumField(value: self.kind, fieldNumber: 1)
-    }
-    if self.compressed != false {
-      try visitor.visitSingularBoolField(value: self.compressed, fieldNumber: 2)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-/// -- Media Type: Video -- //
-public struct VideoType: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "VideoType"
-
-  public var kind: VideoType.VideoKind = .mp4
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public enum VideoKind: SwiftProtobuf.Enum {
-    public typealias RawValue = Int
-    case mp4 // = 0
-    case flv // = 1
-    case hls // = 2
-    case UNRECOGNIZED(Int)
-
-    public init() {
-      self = .mp4
-    }
-
-    public init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .mp4
-      case 1: self = .flv
-      case 2: self = .hls
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    public var rawValue: Int {
-      switch self {
-      case .mp4: return 0
-      case .flv: return 1
-      case .hls: return 2
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-  }
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularEnumField(value: &self.kind)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.kind != .mp4 {
-      try visitor.visitSingularEnumField(value: self.kind, fieldNumber: 1)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension MediaType: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "kind"),
-    101: .standard(proto: "image_type"),
-    201: .standard(proto: "document_type"),
-    301: .standard(proto: "video_type"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _kind: MediaType.Kind = .link
-    var _imageType: ImageType? = nil
-    var _documentType: DocumentType? = nil
-    var _videoType: VideoType? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _kind = source._kind
-      _imageType = source._imageType
-      _documentType = source._documentType
-      _videoType = source._videoType
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: MediaType) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._kind != other_storage._kind {return false}
-        if _storage._imageType != other_storage._imageType {return false}
-        if _storage._documentType != other_storage._documentType {return false}
-        if _storage._videoType != other_storage._videoType {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension MediaType.Kind: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "LINK"),
-    1: .same(proto: "IMAGE"),
-    2: .same(proto: "DOCUMENT"),
-    3: .same(proto: "VIDEO"),
-  ]
-}
-
-extension ImageType: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "kind"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: ImageType) -> Bool {
-    if self.kind != other.kind {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension ImageType.ImageKind: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "PNG"),
-    1: .same(proto: "JPG"),
-    2: .same(proto: "GIF"),
-    3: .same(proto: "SVG"),
-    4: .same(proto: "WEBP"),
-  ]
-}
-
-extension DocumentType: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "kind"),
-    2: .same(proto: "compressed"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: DocumentType) -> Bool {
-    if self.kind != other.kind {return false}
-    if self.compressed != other.compressed {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension DocumentType.DocumentKind: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "TXT"),
-    1: .same(proto: "HTML"),
-    2: .same(proto: "PDF"),
-    3: .same(proto: "MARKDOWN"),
-  ]
-}
-
-extension VideoType: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "kind"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: VideoType) -> Bool {
-    if self.kind != other.kind {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension VideoType.VideoKind: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "MP4"),
-    1: .same(proto: "FLV"),
-    2: .same(proto: "HLS"),
-  ]
-}
diff --git a/languages/swift/Name.pb.swift b/languages/swift/Name.pb.swift
deleted file mode 100644
index d868f8a..0000000
--- a/languages/swift/Name.pb.swift
+++ /dev/null
@@ -1,78 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: content/Name.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct Name: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Name"
-
-  /// basic name
-  public var primary: String = String()
-
-  /// display name
-  public var display: String = String()
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularStringField(value: &self.primary)
-      case 2: try decoder.decodeSingularStringField(value: &self.display)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.primary.isEmpty {
-      try visitor.visitSingularStringField(value: self.primary, fieldNumber: 1)
-    }
-    if !self.display.isEmpty {
-      try visitor.visitSingularStringField(value: self.display, fieldNumber: 2)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Name: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "primary"),
-    2: .same(proto: "display"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: Name) -> Bool {
-    if self.primary != other.primary {return false}
-    if self.display != other.display {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/PricingDescriptor.pb.swift b/languages/swift/PricingDescriptor.pb.swift
deleted file mode 100644
index b2fa5ff..0000000
--- a/languages/swift/PricingDescriptor.pb.swift
+++ /dev/null
@@ -1,635 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: structs/pricing/PricingDescriptor.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-/// -- Pricing: Objects
-public enum PricingType: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case unit // = 0
-  case weighted // = 1
-  case freebie // = 2
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .unit
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .unit
-    case 1: self = .weighted
-    case 2: self = .freebie
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .unit: return 0
-    case .weighted: return 1
-    case .freebie: return 2
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-public enum PricingWeightTier: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case other // = 0
-  case gram // = 1
-  case halfgram // = 2
-  case quartergram // = 3
-  case dub // = 4
-  case eighth // = 5
-  case quarter // = 6
-  case half // = 7
-  case ounce // = 8
-  case pound // = 9
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .other
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .other
-    case 1: self = .gram
-    case 2: self = .halfgram
-    case 3: self = .quartergram
-    case 4: self = .dub
-    case 5: self = .eighth
-    case 6: self = .quarter
-    case 7: self = .half
-    case 8: self = .ounce
-    case 9: self = .pound
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .other: return 0
-    case .gram: return 1
-    case .halfgram: return 2
-    case .quartergram: return 3
-    case .dub: return 4
-    case .eighth: return 5
-    case .quarter: return 6
-    case .half: return 7
-    case .ounce: return 8
-    case .pound: return 9
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-public struct PricingTierAvailability: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "PricingTierAvailability"
-
-  public var offered: Bool = false
-
-  public var available: Bool = false
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularBoolField(value: &self.offered)
-      case 2: try decoder.decodeSingularBoolField(value: &self.available)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.offered != false {
-      try visitor.visitSingularBoolField(value: self.offered, fieldNumber: 1)
-    }
-    if self.available != false {
-      try visitor.visitSingularBoolField(value: self.available, fieldNumber: 2)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-/// -- Pricing: Typed Descriptors
-public struct UnitPricingDescriptor: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "UnitPricingDescriptor"
-
-  public var priceValue: Float {
-    get {return _storage._priceValue}
-    set {_uniqueStorage()._priceValue = newValue}
-  }
-
-  public var status: PricingTierAvailability {
-    get {return _storage._status ?? PricingTierAvailability()}
-    set {_uniqueStorage()._status = newValue}
-  }
-  /// Returns true if `status` has been explicitly set.
-  public var hasStatus: Bool {return _storage._status != nil}
-  /// Clears the value of `status`. Subsequent reads from it will return its default value.
-  public mutating func clearStatus() {_storage._status = nil}
-
-  public var discounts: [SaleDescriptor] {
-    get {return _storage._discounts}
-    set {_uniqueStorage()._discounts = newValue}
-  }
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularFloatField(value: &_storage._priceValue)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._status)
-        case 3: try decoder.decodeRepeatedMessageField(value: &_storage._discounts)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if _storage._priceValue != 0 {
-        try visitor.visitSingularFloatField(value: _storage._priceValue, fieldNumber: 1)
-      }
-      if let v = _storage._status {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-      if !_storage._discounts.isEmpty {
-        try visitor.visitRepeatedMessageField(value: _storage._discounts, fieldNumber: 3)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-public struct WeightedPricingDescriptor: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "WeightedPricingDescriptor"
-
-  public var weight: PricingWeightTier {
-    get {return _storage._weight}
-    set {_uniqueStorage()._weight = newValue}
-  }
-
-  public var tier: UnitPricingDescriptor {
-    get {return _storage._tier ?? UnitPricingDescriptor()}
-    set {_uniqueStorage()._tier = newValue}
-  }
-  /// Returns true if `tier` has been explicitly set.
-  public var hasTier: Bool {return _storage._tier != nil}
-  /// Clears the value of `tier`. Subsequent reads from it will return its default value.
-  public mutating func clearTier() {_storage._tier = nil}
-
-  public var weightInGrams: Float {
-    get {return _storage._weightInGrams}
-    set {_uniqueStorage()._weightInGrams = newValue}
-  }
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularEnumField(value: &_storage._weight)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._tier)
-        case 3: try decoder.decodeSingularFloatField(value: &_storage._weightInGrams)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if _storage._weight != .other {
-        try visitor.visitSingularEnumField(value: _storage._weight, fieldNumber: 1)
-      }
-      if let v = _storage._tier {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-      if _storage._weightInGrams != 0 {
-        try visitor.visitSingularFloatField(value: _storage._weightInGrams, fieldNumber: 3)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-public struct FreebiePricingDescriptor: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "FreebiePricingDescriptor"
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let _ = try decoder.nextFieldNumber() {
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-/// -- Pricing: Main Descriptor
-public struct PricingDescriptor: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "PricingDescriptor"
-
-  public var type: PricingType {
-    get {return _storage._type}
-    set {_uniqueStorage()._type = newValue}
-  }
-
-  /// -- descriptors
-  public var unit: UnitPricingDescriptor {
-    get {return _storage._unit ?? UnitPricingDescriptor()}
-    set {_uniqueStorage()._unit = newValue}
-  }
-  /// Returns true if `unit` has been explicitly set.
-  public var hasUnit: Bool {return _storage._unit != nil}
-  /// Clears the value of `unit`. Subsequent reads from it will return its default value.
-  public mutating func clearUnit() {_storage._unit = nil}
-
-  public var weighted: WeightedPricingDescriptor {
-    get {return _storage._weighted ?? WeightedPricingDescriptor()}
-    set {_uniqueStorage()._weighted = newValue}
-  }
-  /// Returns true if `weighted` has been explicitly set.
-  public var hasWeighted: Bool {return _storage._weighted != nil}
-  /// Clears the value of `weighted`. Subsequent reads from it will return its default value.
-  public mutating func clearWeighted() {_storage._weighted = nil}
-
-  public var freebie: FreebiePricingDescriptor {
-    get {return _storage._freebie ?? FreebiePricingDescriptor()}
-    set {_uniqueStorage()._freebie = newValue}
-  }
-  /// Returns true if `freebie` has been explicitly set.
-  public var hasFreebie: Bool {return _storage._freebie != nil}
-  /// Clears the value of `freebie`. Subsequent reads from it will return its default value.
-  public mutating func clearFreebie() {_storage._freebie = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularEnumField(value: &_storage._type)
-        case 20: try decoder.decodeSingularMessageField(value: &_storage._unit)
-        case 21: try decoder.decodeSingularMessageField(value: &_storage._weighted)
-        case 22: try decoder.decodeSingularMessageField(value: &_storage._freebie)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if _storage._type != .unit {
-        try visitor.visitSingularEnumField(value: _storage._type, fieldNumber: 1)
-      }
-      if let v = _storage._unit {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 20)
-      }
-      if let v = _storage._weighted {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 21)
-      }
-      if let v = _storage._freebie {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 22)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-/// -- Pricing: Product-level Object
-public struct ProductPricing: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ProductPricing"
-
-  public var discounts: [SaleDescriptor] = []
-
-  public var manifest: [PricingDescriptor] = []
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeRepeatedMessageField(value: &self.discounts)
-      case 2: try decoder.decodeRepeatedMessageField(value: &self.manifest)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.discounts.isEmpty {
-      try visitor.visitRepeatedMessageField(value: self.discounts, fieldNumber: 1)
-    }
-    if !self.manifest.isEmpty {
-      try visitor.visitRepeatedMessageField(value: self.manifest, fieldNumber: 2)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension PricingType: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "UNIT"),
-    1: .same(proto: "WEIGHTED"),
-    2: .same(proto: "FREEBIE"),
-  ]
-}
-
-extension PricingWeightTier: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "OTHER"),
-    1: .same(proto: "GRAM"),
-    2: .same(proto: "HALFGRAM"),
-    3: .same(proto: "QUARTERGRAM"),
-    4: .same(proto: "DUB"),
-    5: .same(proto: "EIGHTH"),
-    6: .same(proto: "QUARTER"),
-    7: .same(proto: "HALF"),
-    8: .same(proto: "OUNCE"),
-    9: .same(proto: "POUND"),
-  ]
-}
-
-extension PricingTierAvailability: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "offered"),
-    2: .same(proto: "available"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: PricingTierAvailability) -> Bool {
-    if self.offered != other.offered {return false}
-    if self.available != other.available {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension UnitPricingDescriptor: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .standard(proto: "price_value"),
-    2: .same(proto: "status"),
-    3: .same(proto: "discounts"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _priceValue: Float = 0
-    var _status: PricingTierAvailability? = nil
-    var _discounts: [SaleDescriptor] = []
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _priceValue = source._priceValue
-      _status = source._status
-      _discounts = source._discounts
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: UnitPricingDescriptor) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._priceValue != other_storage._priceValue {return false}
-        if _storage._status != other_storage._status {return false}
-        if _storage._discounts != other_storage._discounts {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension WeightedPricingDescriptor: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "weight"),
-    2: .same(proto: "tier"),
-    3: .same(proto: "weightInGrams"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _weight: PricingWeightTier = .other
-    var _tier: UnitPricingDescriptor? = nil
-    var _weightInGrams: Float = 0
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _weight = source._weight
-      _tier = source._tier
-      _weightInGrams = source._weightInGrams
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: WeightedPricingDescriptor) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._weight != other_storage._weight {return false}
-        if _storage._tier != other_storage._tier {return false}
-        if _storage._weightInGrams != other_storage._weightInGrams {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension FreebiePricingDescriptor: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap = SwiftProtobuf._NameMap()
-
-  public func _protobuf_generated_isEqualTo(other: FreebiePricingDescriptor) -> Bool {
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension PricingDescriptor: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "type"),
-    20: .same(proto: "unit"),
-    21: .same(proto: "weighted"),
-    22: .same(proto: "freebie"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _type: PricingType = .unit
-    var _unit: UnitPricingDescriptor? = nil
-    var _weighted: WeightedPricingDescriptor? = nil
-    var _freebie: FreebiePricingDescriptor? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _type = source._type
-      _unit = source._unit
-      _weighted = source._weighted
-      _freebie = source._freebie
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: PricingDescriptor) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._type != other_storage._type {return false}
-        if _storage._unit != other_storage._unit {return false}
-        if _storage._weighted != other_storage._weighted {return false}
-        if _storage._freebie != other_storage._freebie {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
-
-extension ProductPricing: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "discounts"),
-    2: .same(proto: "manifest"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: ProductPricing) -> Bool {
-    if self.discounts != other.discounts {return false}
-    if self.manifest != other.manifest {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Product.pb.swift b/languages/swift/Product.pb.swift
deleted file mode 100644
index 7cc298f..0000000
--- a/languages/swift/Product.pb.swift
+++ /dev/null
@@ -1,144 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: Product.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-/// -- Product Type: Top-level -- //
-public struct Product: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "Product"
-
-  public var key: ProductKey {
-    get {return _storage._key ?? ProductKey()}
-    set {_uniqueStorage()._key = newValue}
-  }
-  /// Returns true if `key` has been explicitly set.
-  public var hasKey: Bool {return _storage._key != nil}
-  /// Clears the value of `key`. Subsequent reads from it will return its default value.
-  public mutating func clearKey() {_storage._key = nil}
-
-  public var type: ProductType {
-    get {return _storage._type ?? ProductType()}
-    set {_uniqueStorage()._type = newValue}
-  }
-  /// Returns true if `type` has been explicitly set.
-  public var hasType: Bool {return _storage._type != nil}
-  /// Clears the value of `type`. Subsequent reads from it will return its default value.
-  public mutating func clearType() {_storage._type = nil}
-
-  public var data: SwiftProtobuf.Google_Protobuf_Any {
-    get {return _storage._data ?? SwiftProtobuf.Google_Protobuf_Any()}
-    set {_uniqueStorage()._data = newValue}
-  }
-  /// Returns true if `data` has been explicitly set.
-  public var hasData: Bool {return _storage._data != nil}
-  /// Clears the value of `data`. Subsequent reads from it will return its default value.
-  public mutating func clearData() {_storage._data = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularMessageField(value: &_storage._key)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._type)
-        case 3: try decoder.decodeSingularMessageField(value: &_storage._data)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if let v = _storage._key {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
-      }
-      if let v = _storage._type {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-      if let v = _storage._data {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Product: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "key"),
-    2: .same(proto: "type"),
-    3: .same(proto: "data"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _key: ProductKey? = nil
-    var _type: ProductType? = nil
-    var _data: SwiftProtobuf.Google_Protobuf_Any? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _key = source._key
-      _type = source._type
-      _data = source._data
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: Product) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._key != other_storage._key {return false}
-        if _storage._type != other_storage._type {return false}
-        if _storage._data != other_storage._data {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/ProductContent.pb.swift b/languages/swift/ProductContent.pb.swift
deleted file mode 100644
index cbe68d3..0000000
--- a/languages/swift/ProductContent.pb.swift
+++ /dev/null
@@ -1,214 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: content/ProductContent.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct ProductContent: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ProductContent"
-
-  /// -- Basic Properties
-  public var name: Name {
-    get {return _storage._name ?? Name()}
-    set {_uniqueStorage()._name = newValue}
-  }
-  /// Returns true if `name` has been explicitly set.
-  public var hasName: Bool {return _storage._name != nil}
-  /// Clears the value of `name`. Subsequent reads from it will return its default value.
-  public mutating func clearName() {_storage._name = nil}
-
-  /// narrative summary
-  public var summary: Content {
-    get {return _storage._summary ?? Content()}
-    set {_uniqueStorage()._summary = newValue}
-  }
-  /// Returns true if `summary` has been explicitly set.
-  public var hasSummary: Bool {return _storage._summary != nil}
-  /// Clears the value of `summary`. Subsequent reads from it will return its default value.
-  public mutating func clearSummary() {_storage._summary = nil}
-
-  /// product's brand
-  public var brand: Brand {
-    get {return _storage._brand ?? Brand()}
-    set {_uniqueStorage()._brand = newValue}
-  }
-  /// Returns true if `brand` has been explicitly set.
-  public var hasBrand: Bool {return _storage._brand != nil}
-  /// Clears the value of `brand`. Subsequent reads from it will return its default value.
-  public mutating func clearBrand() {_storage._brand = nil}
-
-  /// -- Media
-  public var media: [MediaItem] {
-    get {return _storage._media}
-    set {_uniqueStorage()._media = newValue}
-  }
-
-  /// -- Extended Attributes
-  public var usage: Content {
-    get {return _storage._usage ?? Content()}
-    set {_uniqueStorage()._usage = newValue}
-  }
-  /// Returns true if `usage` has been explicitly set.
-  public var hasUsage: Bool {return _storage._usage != nil}
-  /// Clears the value of `usage`. Subsequent reads from it will return its default value.
-  public mutating func clearUsage() {_storage._usage = nil}
-
-  /// dosage advice
-  public var dosage: Content {
-    get {return _storage._dosage ?? Content()}
-    set {_uniqueStorage()._dosage = newValue}
-  }
-  /// Returns true if `dosage` has been explicitly set.
-  public var hasDosage: Bool {return _storage._dosage != nil}
-  /// Clears the value of `dosage`. Subsequent reads from it will return its default value.
-  public mutating func clearDosage() {_storage._dosage = nil}
-
-  /// internal advice
-  public var advice: Content {
-    get {return _storage._advice ?? Content()}
-    set {_uniqueStorage()._advice = newValue}
-  }
-  /// Returns true if `advice` has been explicitly set.
-  public var hasAdvice: Bool {return _storage._advice != nil}
-  /// Clears the value of `advice`. Subsequent reads from it will return its default value.
-  public mutating func clearAdvice() {_storage._advice = nil}
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    _ = _uniqueStorage()
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      while let fieldNumber = try decoder.nextFieldNumber() {
-        switch fieldNumber {
-        case 1: try decoder.decodeSingularMessageField(value: &_storage._name)
-        case 2: try decoder.decodeSingularMessageField(value: &_storage._summary)
-        case 3: try decoder.decodeSingularMessageField(value: &_storage._brand)
-        case 20: try decoder.decodeRepeatedMessageField(value: &_storage._media)
-        case 30: try decoder.decodeSingularMessageField(value: &_storage._usage)
-        case 31: try decoder.decodeSingularMessageField(value: &_storage._dosage)
-        case 32: try decoder.decodeSingularMessageField(value: &_storage._advice)
-        default: break
-        }
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
-      if let v = _storage._name {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
-      }
-      if let v = _storage._summary {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-      }
-      if let v = _storage._brand {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
-      }
-      if !_storage._media.isEmpty {
-        try visitor.visitRepeatedMessageField(value: _storage._media, fieldNumber: 20)
-      }
-      if let v = _storage._usage {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 30)
-      }
-      if let v = _storage._dosage {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 31)
-      }
-      if let v = _storage._advice {
-        try visitor.visitSingularMessageField(value: v, fieldNumber: 32)
-      }
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-
-  fileprivate var _storage = _StorageClass.defaultInstance
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension ProductContent: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "name"),
-    2: .same(proto: "summary"),
-    3: .same(proto: "brand"),
-    20: .same(proto: "media"),
-    30: .same(proto: "usage"),
-    31: .same(proto: "dosage"),
-    32: .same(proto: "advice"),
-  ]
-
-  fileprivate class _StorageClass {
-    var _name: Name? = nil
-    var _summary: Content? = nil
-    var _brand: Brand? = nil
-    var _media: [MediaItem] = []
-    var _usage: Content? = nil
-    var _dosage: Content? = nil
-    var _advice: Content? = nil
-
-    static let defaultInstance = _StorageClass()
-
-    private init() {}
-
-    init(copying source: _StorageClass) {
-      _name = source._name
-      _summary = source._summary
-      _brand = source._brand
-      _media = source._media
-      _usage = source._usage
-      _dosage = source._dosage
-      _advice = source._advice
-    }
-  }
-
-  fileprivate mutating func _uniqueStorage() -> _StorageClass {
-    if !isKnownUniquelyReferenced(&_storage) {
-      _storage = _StorageClass(copying: _storage)
-    }
-    return _storage
-  }
-
-  public func _protobuf_generated_isEqualTo(other: ProductContent) -> Bool {
-    if _storage !== other._storage {
-      let storagesAreEqual: Bool = withExtendedLifetime((_storage, other._storage)) { (_args: (_StorageClass, _StorageClass)) in
-        let _storage = _args.0
-        let other_storage = _args.1
-        if _storage._name != other_storage._name {return false}
-        if _storage._summary != other_storage._summary {return false}
-        if _storage._brand != other_storage._brand {return false}
-        if _storage._media != other_storage._media {return false}
-        if _storage._usage != other_storage._usage {return false}
-        if _storage._dosage != other_storage._dosage {return false}
-        if _storage._advice != other_storage._advice {return false}
-        return true
-      }
-      if !storagesAreEqual {return false}
-    }
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/ProductKey.pb.swift b/languages/swift/ProductKey.pb.swift
deleted file mode 100644
index f6c6e97..0000000
--- a/languages/swift/ProductKey.pb.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: base/ProductKey.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public struct ProductKey: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ProductKey"
-
-  public var id: String = String()
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularStringField(value: &self.id)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if !self.id.isEmpty {
-      try visitor.visitSingularStringField(value: self.id, fieldNumber: 1)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension ProductKey: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "id"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: ProductKey) -> Bool {
-    if self.id != other.id {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/ProductKind.pb.swift b/languages/swift/ProductKind.pb.swift
deleted file mode 100644
index 34b4f0a..0000000
--- a/languages/swift/ProductKind.pb.swift
+++ /dev/null
@@ -1,81 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: base/ProductKind.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public enum ProductKind: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case flowers // = 0
-  case edibles // = 1
-  case extracts // = 2
-  case prerolls // = 3
-  case apothecary // = 4
-  case cartridges // = 5
-  case plants // = 6
-  case merchandise // = 7
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .flowers
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .flowers
-    case 1: self = .edibles
-    case 2: self = .extracts
-    case 3: self = .prerolls
-    case 4: self = .apothecary
-    case 5: self = .cartridges
-    case 6: self = .plants
-    case 7: self = .merchandise
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .flowers: return 0
-    case .edibles: return 1
-    case .extracts: return 2
-    case .prerolls: return 3
-    case .apothecary: return 4
-    case .cartridges: return 5
-    case .plants: return 6
-    case .merchandise: return 7
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension ProductKind: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "FLOWERS"),
-    1: .same(proto: "EDIBLES"),
-    2: .same(proto: "EXTRACTS"),
-    3: .same(proto: "PREROLLS"),
-    4: .same(proto: "APOTHECARY"),
-    5: .same(proto: "CARTRIDGES"),
-    6: .same(proto: "PLANTS"),
-    7: .same(proto: "MERCHANDISE"),
-  ]
-}
diff --git a/languages/swift/ProductType.pb.swift b/languages/swift/ProductType.pb.swift
deleted file mode 100644
index 2caff57..0000000
--- a/languages/swift/ProductType.pb.swift
+++ /dev/null
@@ -1,69 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: base/ProductType.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-/// -- Product Type: Top-level -- //
-public struct ProductType: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "ProductType"
-
-  public var kind: ProductKind = .flowers
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularEnumField(value: &self.kind)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.kind != .flowers {
-      try visitor.visitSingularEnumField(value: self.kind, fieldNumber: 1)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension ProductType: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "kind"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: ProductType) -> Bool {
-    if self.kind != other.kind {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/SaleDescriptor.pb.swift b/languages/swift/SaleDescriptor.pb.swift
deleted file mode 100644
index fb4bad6..0000000
--- a/languages/swift/SaleDescriptor.pb.swift
+++ /dev/null
@@ -1,165 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: structs/pricing/SaleDescriptor.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public enum SaleType: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case percentage // = 0
-  case bogo // = 1
-  case loyalty // = 2
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .percentage
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .percentage
-    case 1: self = .bogo
-    case 2: self = .loyalty
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .percentage: return 0
-    case .bogo: return 1
-    case .loyalty: return 2
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-public struct SaleDescriptor: SwiftProtobuf.Message {
-  public static let protoMessageName: String = "SaleDescriptor"
-
-  /// sale metadata
-  public var type: SaleType = .percentage
-
-  public var effective: UInt64 = 0
-
-  public var expiration: UInt64 = 0
-
-  /// sale amount and trigger properties
-  public var percentageAmount: UInt32 = 0
-
-  public var bogoTrigger: UInt32 = 0
-
-  public var bogoReward: UInt32 = 0
-
-  public var loyaltyTrigger: UInt32 = 0
-
-  public var loyaltyReward: UInt32 = 0
-
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
-
-  public init() {}
-
-  /// Used by the decoding initializers in the SwiftProtobuf library, not generally
-  /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
-  /// initializers are defined in the SwiftProtobuf library. See the Message and
-  /// Message+*Additions` files.
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    while let fieldNumber = try decoder.nextFieldNumber() {
-      switch fieldNumber {
-      case 1: try decoder.decodeSingularEnumField(value: &self.type)
-      case 2: try decoder.decodeSingularUInt64Field(value: &self.effective)
-      case 3: try decoder.decodeSingularUInt64Field(value: &self.expiration)
-      case 20: try decoder.decodeSingularUInt32Field(value: &self.percentageAmount)
-      case 21: try decoder.decodeSingularUInt32Field(value: &self.bogoTrigger)
-      case 22: try decoder.decodeSingularUInt32Field(value: &self.bogoReward)
-      case 23: try decoder.decodeSingularUInt32Field(value: &self.loyaltyTrigger)
-      case 24: try decoder.decodeSingularUInt32Field(value: &self.loyaltyReward)
-      default: break
-      }
-    }
-  }
-
-  /// Used by the encoding methods of the SwiftProtobuf library, not generally
-  /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
-  /// other serializer methods are defined in the SwiftProtobuf library. See the
-  /// `Message` and `Message+*Additions` files.
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
-    if self.type != .percentage {
-      try visitor.visitSingularEnumField(value: self.type, fieldNumber: 1)
-    }
-    if self.effective != 0 {
-      try visitor.visitSingularUInt64Field(value: self.effective, fieldNumber: 2)
-    }
-    if self.expiration != 0 {
-      try visitor.visitSingularUInt64Field(value: self.expiration, fieldNumber: 3)
-    }
-    if self.percentageAmount != 0 {
-      try visitor.visitSingularUInt32Field(value: self.percentageAmount, fieldNumber: 20)
-    }
-    if self.bogoTrigger != 0 {
-      try visitor.visitSingularUInt32Field(value: self.bogoTrigger, fieldNumber: 21)
-    }
-    if self.bogoReward != 0 {
-      try visitor.visitSingularUInt32Field(value: self.bogoReward, fieldNumber: 22)
-    }
-    if self.loyaltyTrigger != 0 {
-      try visitor.visitSingularUInt32Field(value: self.loyaltyTrigger, fieldNumber: 23)
-    }
-    if self.loyaltyReward != 0 {
-      try visitor.visitSingularUInt32Field(value: self.loyaltyReward, fieldNumber: 24)
-    }
-    try unknownFields.traverse(visitor: &visitor)
-  }
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension SaleType: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "PERCENTAGE"),
-    1: .same(proto: "BOGO"),
-    2: .same(proto: "LOYALTY"),
-  ]
-}
-
-extension SaleDescriptor: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "type"),
-    2: .same(proto: "effective"),
-    3: .same(proto: "expiration"),
-    20: .standard(proto: "percentage_amount"),
-    21: .standard(proto: "bogo_trigger"),
-    22: .standard(proto: "bogo_reward"),
-    23: .standard(proto: "loyalty_trigger"),
-    24: .standard(proto: "loyalty_reward"),
-  ]
-
-  public func _protobuf_generated_isEqualTo(other: SaleDescriptor) -> Bool {
-    if self.type != other.type {return false}
-    if self.effective != other.effective {return false}
-    if self.expiration != other.expiration {return false}
-    if self.percentageAmount != other.percentageAmount {return false}
-    if self.bogoTrigger != other.bogoTrigger {return false}
-    if self.bogoReward != other.bogoReward {return false}
-    if self.loyaltyTrigger != other.loyaltyTrigger {return false}
-    if self.loyaltyReward != other.loyaltyReward {return false}
-    if unknownFields != other.unknownFields {return false}
-    return true
-  }
-}
diff --git a/languages/swift/Species.pb.swift b/languages/swift/Species.pb.swift
deleted file mode 100644
index 3a48546..0000000
--- a/languages/swift/Species.pb.swift
+++ /dev/null
@@ -1,73 +0,0 @@
-// DO NOT EDIT.
-//
-// Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: structs/Species.proto
-//
-// For information on using the generated types, please see the documenation:
-//   https://github.com/apple/swift-protobuf/
-
-import Foundation
-import SwiftProtobuf
-
-// If the compiler emits an error on this type, it is because this file
-// was generated by a version of the `protoc` Swift plug-in that is
-// incompatible with the version of SwiftProtobuf to which you are linking.
-// Please ensure that your are building against the same version of the API
-// that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
-  typealias Version = _2
-}
-
-public enum Species: SwiftProtobuf.Enum {
-  public typealias RawValue = Int
-  case unspecified // = 0
-  case sativa // = 1
-  case hybridSativa // = 2
-  case hybrid // = 3
-  case hybridIndica // = 4
-  case indica // = 5
-  case UNRECOGNIZED(Int)
-
-  public init() {
-    self = .unspecified
-  }
-
-  public init?(rawValue: Int) {
-    switch rawValue {
-    case 0: self = .unspecified
-    case 1: self = .sativa
-    case 2: self = .hybridSativa
-    case 3: self = .hybrid
-    case 4: self = .hybridIndica
-    case 5: self = .indica
-    default: self = .UNRECOGNIZED(rawValue)
-    }
-  }
-
-  public var rawValue: Int {
-    switch self {
-    case .unspecified: return 0
-    case .sativa: return 1
-    case .hybridSativa: return 2
-    case .hybrid: return 3
-    case .hybridIndica: return 4
-    case .indica: return 5
-    case .UNRECOGNIZED(let i): return i
-    }
-  }
-
-}
-
-// MARK: - Code below here is support for the SwiftProtobuf runtime.
-
-extension Species: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "UNSPECIFIED"),
-    1: .same(proto: "SATIVA"),
-    2: .same(proto: "HYBRID_SATIVA"),
-    3: .same(proto: "HYBRID"),
-    4: .same(proto: "HYBRID_INDICA"),
-    5: .same(proto: "INDICA"),
-  ]
-}
diff --git a/releases/cpp-1.0.5.tar.gz b/releases/cpp-1.0.5.tar.gz
new file mode 100644
index 0000000..f8a15bc
Binary files /dev/null and b/releases/cpp-1.0.5.tar.gz differ
diff --git a/releases/csharp-1.0.5.tar.gz b/releases/csharp-1.0.5.tar.gz
new file mode 100644
index 0000000..1dad4b2
Binary files /dev/null and b/releases/csharp-1.0.5.tar.gz differ
diff --git a/releases/dart-1.0.5.tar.gz b/releases/dart-1.0.5.tar.gz
new file mode 100644
index 0000000..ae472cb
Binary files /dev/null and b/releases/dart-1.0.5.tar.gz differ
diff --git a/releases/go-1.0.5.tar.gz b/releases/go-1.0.5.tar.gz
new file mode 100644
index 0000000..0171521
Binary files /dev/null and b/releases/go-1.0.5.tar.gz differ
diff --git a/releases/java-1.0.5.tar.gz b/releases/java-1.0.5.tar.gz
new file mode 100644
index 0000000..c0beb54
Binary files /dev/null and b/releases/java-1.0.5.tar.gz differ
diff --git a/releases/js-1.0.5.tar.gz b/releases/js-1.0.5.tar.gz
new file mode 100644
index 0000000..23a8e3a
Binary files /dev/null and b/releases/js-1.0.5.tar.gz differ
diff --git a/releases/objc-1.0.5.tar.gz b/releases/objc-1.0.5.tar.gz
new file mode 100644
index 0000000..756c050
Binary files /dev/null and b/releases/objc-1.0.5.tar.gz differ
diff --git a/releases/php-1.0.5.tar.gz b/releases/php-1.0.5.tar.gz
new file mode 100644
index 0000000..7a59d7a
Binary files /dev/null and b/releases/php-1.0.5.tar.gz differ
diff --git a/releases/python-1.0.5.tar.gz b/releases/python-1.0.5.tar.gz
new file mode 100644
index 0000000..d39170c
Binary files /dev/null and b/releases/python-1.0.5.tar.gz differ
diff --git a/releases/ruby-1.0.5.tar.gz b/releases/ruby-1.0.5.tar.gz
new file mode 100644
index 0000000..ba88c72
Binary files /dev/null and b/releases/ruby-1.0.5.tar.gz differ
diff --git a/releases/swift-1.0.5.tar.gz b/releases/swift-1.0.5.tar.gz
new file mode 100644
index 0000000..ea8a1f2
Binary files /dev/null and b/releases/swift-1.0.5.tar.gz differ
diff --git a/sources/base/Compression.proto b/sources/base/Compression.proto
index 5fe970e..7f6745e 100644
--- a/sources/base/Compression.proto
+++ b/sources/base/Compression.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package base;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.base";
diff --git a/sources/base/Language.proto b/sources/base/Language.proto
index c80ce59..7f01429 100644
--- a/sources/base/Language.proto
+++ b/sources/base/Language.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package base;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.base";
diff --git a/sources/base/ProductKey.proto b/sources/base/ProductKey.proto
index 0dad253..1e251a5 100644
--- a/sources/base/ProductKey.proto
+++ b/sources/base/ProductKey.proto
@@ -1,13 +1,18 @@
 
 syntax = "proto3";
 
+package base;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.base";
 option java_multiple_files = true;
 option java_outer_classname = "BaseProductKey";
 
+import "base/ProductType.proto";
+
 
 message ProductKey {
   string id = 1;
+  base.ProductType type = 2;
 }
diff --git a/sources/base/ProductKind.proto b/sources/base/ProductKind.proto
index 76ce299..e10a4cb 100644
--- a/sources/base/ProductKind.proto
+++ b/sources/base/ProductKind.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package base;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.base";
diff --git a/sources/base/ProductType.proto b/sources/base/ProductType.proto
index e2c455f..704ed16 100644
--- a/sources/base/ProductType.proto
+++ b/sources/base/ProductType.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package base;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.base";
@@ -12,5 +14,5 @@ import "base/ProductKind.proto";
 
 // -- Product Type: Top-level -- //
 message ProductType {
-  ProductKind kind = 1;
+  base.ProductKind kind = 1;
 }
diff --git a/sources/content/Brand.proto b/sources/content/Brand.proto
index eba0750..c5e0308 100644
--- a/sources/content/Brand.proto
+++ b/sources/content/Brand.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package content;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.content";
@@ -14,10 +16,10 @@ import "media/MediaItem.proto";
 
 message Brand {
   // -- Basic Properties
-  Name name = 1;
-  Brand parent = 2;
-  Content summary = 3;
+  content.Name name = 1;
+  content.Brand parent = 2;
+  content.Content summary = 3;
 
   // -- Media
-  repeated MediaItem media = 20;
+  repeated media.MediaItem media = 20;
 }
diff --git a/sources/content/Content.proto b/sources/content/Content.proto
index b8611c6..3932827 100644
--- a/sources/content/Content.proto
+++ b/sources/content/Content.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package content;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.content";
@@ -26,6 +28,6 @@ message Content {
   Encoding encoding = 2;
   bytes content = 3;
 
-  Language language = 4;
-  Compression compression = 5;
+  base.Language language = 4;
+  base.Compression compression = 5;
 }
diff --git a/sources/content/MaterialsData.proto b/sources/content/MaterialsData.proto
index 6a16ab4..193f38a 100644
--- a/sources/content/MaterialsData.proto
+++ b/sources/content/MaterialsData.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package content;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.content";
@@ -14,7 +16,7 @@ import "structs/Genetics.proto";
 
 message MaterialsData {
   repeated string ingredients = 1;
-  Grow grow = 2;
-  Species species = 3;
-  Genetics genetics = 4;
+  structs.Grow grow = 2;
+  structs.Species species = 3;
+  structs.Genetics genetics = 4;
 }
diff --git a/sources/content/Name.proto b/sources/content/Name.proto
index f9c8bfa..96d42a7 100644
--- a/sources/content/Name.proto
+++ b/sources/content/Name.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package content;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.content";
diff --git a/sources/content/ProductContent.proto b/sources/content/ProductContent.proto
index dcfaa7e..2a4ce46 100644
--- a/sources/content/ProductContent.proto
+++ b/sources/content/ProductContent.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package content;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.content";
@@ -15,15 +17,19 @@ import "media/MediaItem.proto";
 
 message ProductContent {
   // -- Basic Properties
-  Name name = 1;  // product name
-  Content summary = 2; // narrative summary
-  Brand brand = 3;  // product's brand
+  content.Name name = 1;  // product name
+  content.Content summary = 2; // narrative summary
+  content.Brand brand = 3;  // product's brand
 
   // -- Media
-  repeated MediaItem media = 20;  // images, videos, etc
+  repeated media.MediaItem media = 20;  // images, videos, etc
 
   // -- Extended Attributes
-  Content usage = 30;  // usage advice
-  Content dosage = 31;  // dosage advice
-  Content advice = 32;  // internal advice
+  content.Content usage = 30;  // usage advice
+  content.Content dosage = 31;  // dosage advice
+  content.Content advice = 32;  // internal advice
+
+  // -- Timestamps
+  int64 modified = 40;  // timestamp for last-modified
+  int64 created = 41;  // timestamp for creation
 }
diff --git a/sources/geo/Address.proto b/sources/geo/Address.proto
index d7aacd2..cc9b683 100644
--- a/sources/geo/Address.proto
+++ b/sources/geo/Address.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package geo;
+
 option optimize_for = SPEED;
 option java_package = "io.bloombox.schema.geo";
 option java_multiple_files = true;
diff --git a/sources/media/MediaItem.proto b/sources/media/MediaItem.proto
index 8d578e1..6495b3d 100644
--- a/sources/media/MediaItem.proto
+++ b/sources/media/MediaItem.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package media;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.media";
@@ -12,7 +14,7 @@ import "media/MediaType.proto";
 
 
 message MediaItem {
-  MediaKey key = 1;
-  MediaType type = 2;
+  media.MediaKey key = 1;
+  media.MediaType type = 2;
   string name = 3;
 }
diff --git a/sources/media/MediaKey.proto b/sources/media/MediaKey.proto
index 92e719f..a21db77 100644
--- a/sources/media/MediaKey.proto
+++ b/sources/media/MediaKey.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package media;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.media";
diff --git a/sources/media/MediaType.proto b/sources/media/MediaType.proto
index bbecdd9..f4ed0b3 100644
--- a/sources/media/MediaType.proto
+++ b/sources/media/MediaType.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package media;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.media";
diff --git a/sources/products/Flower.proto b/sources/products/Flower.proto
index 1c3319c..b7885b1 100644
--- a/sources/products/Flower.proto
+++ b/sources/products/Flower.proto
@@ -11,18 +11,19 @@ import "base/ProductKey.proto";
 import "content/MaterialsData.proto";
 import "content/ProductContent.proto";
 import "structs/FlagsDescriptor.proto";
+import "structs/labtesting/RichTesting.proto";
 import "structs/pricing/PricingDescriptor.proto";
 
 
 message Flower {
-  // -- Object Key
-  ProductKey key = 1;
+  base.ProductKey key = 1;
 
   // -- Basic Product & Materials Data
-  ProductContent product_data = 20;
-  MaterialsData material_data = 21;
+  content.ProductContent product = 20;
+  content.MaterialsData material = 21;
 
-  // -- Flags and Pricing
-  FlagsDescriptor flags = 22;
-  ProductPricing pricing = 23;
+  // -- Flags, Pricing and Testing
+  repeated structs.ProductFlag flags = 22;
+  structs.pricing.ProductPricing pricing = 23;
+  structs.labtesting.RichTesting testing = 24;
 }
diff --git a/sources/structs/FlagsDescriptor.proto b/sources/structs/FlagsDescriptor.proto
index 7f44b50..a0ae54b 100644
--- a/sources/structs/FlagsDescriptor.proto
+++ b/sources/structs/FlagsDescriptor.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package structs;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.product.struct";
@@ -8,7 +10,7 @@ option java_multiple_files = true;
 option java_outer_classname = "BaseStructs";
 
 
-enum ProductFlag {
+enum FlagType {
   VISIBLE = 0;
   PREMIUM = 1;
   FEATURED = 2;
@@ -16,19 +18,7 @@ enum ProductFlag {
   INHOUSE = 4;
 }
 
-message ProductFlagValue {
-  ProductFlag type = 1;
+message ProductFlag {
+  FlagType type = 1;
   bool value = 2;
 }
-
-message ProductFlagset {
-  repeated ProductFlagValue flags = 1;
-}
-
-message FlagsDescriptor {
-  bool visible = 1;
-  bool premium = 2;
-  bool featured = 3;
-  bool lastchance = 4;
-  bool inhouse = 5;
-}
diff --git a/sources/structs/Genetics.proto b/sources/structs/Genetics.proto
index 9451ebf..2392579 100644
--- a/sources/structs/Genetics.proto
+++ b/sources/structs/Genetics.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package structs;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.product.struct";
@@ -11,6 +13,6 @@ import "content/Name.proto";
 
 
 message Genetics {
-  Name male = 1;
-  Name female = 2;
+  content.Name male = 1;
+  content.Name female = 2;
 }
diff --git a/sources/structs/Grow.proto b/sources/structs/Grow.proto
index dc9d149..bc784fd 100644
--- a/sources/structs/Grow.proto
+++ b/sources/structs/Grow.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package structs;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.product.struct";
diff --git a/sources/structs/Species.proto b/sources/structs/Species.proto
index 23687b1..fb74463 100644
--- a/sources/structs/Species.proto
+++ b/sources/structs/Species.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package structs;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.product.struct";
diff --git a/sources/structs/labtesting/BasicTesting.proto b/sources/structs/labtesting/BasicTesting.proto
new file mode 100644
index 0000000..703f96f
--- /dev/null
+++ b/sources/structs/labtesting/BasicTesting.proto
@@ -0,0 +1,30 @@
+
+syntax = "proto3";
+
+package structs.labtesting;
+
+option optimize_for = SPEED;
+option cc_enable_arenas = true;
+option java_package = "io.bloombox.schema.product.struct.testing";
+option java_multiple_files = true;
+option java_outer_classname = "BasicTestingSpec";
+
+import "structs/labtesting/TestValue.proto";
+import "structs/labtesting/SubjectiveTesting.proto";
+
+
+// -- Testing: Basic Protocol
+message BasicTesting {
+  bool available = 1;
+  repeated structs.labtesting.TestMedia media = 2;
+  int64 last_updated = 3;
+
+  // --- Cannabinoids
+  structs.labtesting.TestValue thc = 10;
+  structs.labtesting.TestValue cbd = 11;
+  structs.labtesting.TestValue cbn = 12;
+  structs.labtesting.TestValue cbg = 13;
+
+  // --- Testing Extensions
+  structs.labtesting.SubjectiveTesting subjective_testing = 30;
+}
diff --git a/sources/structs/labtesting/RichTesting.proto b/sources/structs/labtesting/RichTesting.proto
new file mode 100644
index 0000000..77c5f82
--- /dev/null
+++ b/sources/structs/labtesting/RichTesting.proto
@@ -0,0 +1,61 @@
+
+syntax = "proto3";
+
+package structs.labtesting;
+
+option optimize_for = SPEED;
+option cc_enable_arenas = true;
+option java_package = "io.bloombox.schema.product.struct.testing";
+option java_multiple_files = true;
+option java_outer_classname = "RichTestingSpec";
+
+import "structs/labtesting/TestValue.proto";
+import "structs/labtesting/BasicTesting.proto";
+import "structs/labtesting/SubjectiveTesting.proto";
+
+
+// -- Testing: Basic Protocol
+enum AromaFlavor {
+  PINE = 0;
+  LEMON = 1;
+  PEPPER = 2;
+  LAVENDER = 3;
+  HOPS = 4;
+}
+
+enum Terpene {
+  LIMONENE = 0;
+  PINENE = 1;
+}
+
+message TerpeneTestValue {
+  Terpene terpene = 1;
+  TestValue measurement = 2;
+}
+
+message RichTesting {
+  bool available = 1;
+  repeated TestMedia media = 2;
+  int64 last_updated = 3;
+
+  // --- Testing Extensions
+  structs.labtesting.BasicTesting basic = 30;
+  TerpeneTesting terpenes = 31;
+  PesticideTesting pesticides = 32;
+  MoistureTesting moisture = 33;
+  repeated AromaFlavor aroma = 34;
+  structs.labtesting.SubjectiveTesting subjective_testing = 35;
+}
+
+message TerpeneTesting {
+  bool available = 1;
+  repeated TerpeneTestValue terpenes = 10;
+}
+
+message PesticideTesting {
+  // @TODO: how do we express this?
+}
+
+message MoistureTesting {
+  // @TODO: how do we express this?
+}
diff --git a/sources/structs/labtesting/SubjectiveTesting.proto b/sources/structs/labtesting/SubjectiveTesting.proto
new file mode 100644
index 0000000..6127a87
--- /dev/null
+++ b/sources/structs/labtesting/SubjectiveTesting.proto
@@ -0,0 +1,37 @@
+
+syntax = "proto3";
+
+package structs.labtesting;
+
+option optimize_for = SPEED;
+option cc_enable_arenas = true;
+option java_package = "io.bloombox.schema.product.struct.testing";
+option java_multiple_files = true;
+option java_outer_classname = "SubjectiveTestingSpec";
+
+import "content/Content.proto";
+
+
+// -- Testing: Subjective
+enum Feeling {
+  GROUNDING = 0;
+  SLEEP = 1;
+  CALMING = 2;
+  STIMULATING = 3;
+  FUNNY = 4;
+  FOCUS = 5;
+  PASSION = 6;
+}
+
+enum PotencyEstimate {
+  LIGHT = 0;
+  MEDIUM = 1;
+  HEAVY = 2;
+  TOP = 3;
+}
+
+message SubjectiveTesting {
+  content.Content description = 1;
+  PotencyEstimate potency = 2;
+  repeated Feeling feeling_tags = 3;
+}
diff --git a/sources/structs/labtesting/TestValue.proto b/sources/structs/labtesting/TestValue.proto
new file mode 100644
index 0000000..af93cf7
--- /dev/null
+++ b/sources/structs/labtesting/TestValue.proto
@@ -0,0 +1,40 @@
+
+syntax = "proto3";
+
+package structs.labtesting;
+
+option optimize_for = SPEED;
+option cc_enable_arenas = true;
+option java_package = "io.bloombox.schema.product.struct.testing";
+option java_multiple_files = true;
+option java_outer_classname = "BaseTestingSpec";
+
+import "media/MediaItem.proto";
+
+
+// -- Testing: Base (Shared) Protocol
+enum TestValueType {
+  MILLIGRAMS = 0;
+  PERCENTAGE = 1;
+  PRESENCE = 3;
+}
+
+message TestValue {
+  TestValueType type = 1;
+
+  oneof value {
+    double measurement = 10;
+    bool present = 20;
+  }
+}
+
+enum TestMediaType {
+  CERTIFICATE = 0;
+  RESULTS = 1;
+  PRODUCT_IMAGE = 2;
+}
+
+message TestMedia {
+  TestMediaType type = 1;
+  media.MediaItem media_item = 2;
+}
diff --git a/sources/structs/pricing/PricingDescriptor.proto b/sources/structs/pricing/PricingDescriptor.proto
index a5f8bf2..abdc81d 100644
--- a/sources/structs/pricing/PricingDescriptor.proto
+++ b/sources/structs/pricing/PricingDescriptor.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package structs.pricing;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.product.struct";
@@ -39,7 +41,7 @@ message PricingTierAvailability {
 message UnitPricingDescriptor {
   float price_value = 1;
   PricingTierAvailability status = 2;
-  repeated SaleDescriptor discounts = 3;
+  repeated structs.pricing.SaleDescriptor discounts = 3;
 }
 
 message WeightedPricingDescriptor {
@@ -64,6 +66,6 @@ message PricingDescriptor {
 
 // -- Pricing: Product-level Object
 message ProductPricing {
-  repeated SaleDescriptor discounts = 1;
+  repeated structs.pricing.SaleDescriptor discounts = 1;
   repeated PricingDescriptor manifest = 2;
 }
diff --git a/sources/structs/pricing/SaleDescriptor.proto b/sources/structs/pricing/SaleDescriptor.proto
index 3a7edbc..9193aae 100644
--- a/sources/structs/pricing/SaleDescriptor.proto
+++ b/sources/structs/pricing/SaleDescriptor.proto
@@ -1,6 +1,8 @@
 
 syntax = "proto3";
 
+package structs.pricing;
+
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
 option java_package = "io.bloombox.schema.product.struct";
@@ -9,7 +11,7 @@ option java_outer_classname = "ProductDiscount";
 
 
 enum SaleType {
-  PERCENTAGE = 0;
+  PERCENTAGE_OFF = 0;
   BOGO = 1;
   LOYALTY = 2;
 }