First cut at new layout
diff --git a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
new file mode 100644
index 0000000..14d6bb6
--- /dev/null
+++ b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
@@ -0,0 +1,49 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+
+using pb = global::Google.ProtocolBuffers;
+using pbc = global::Google.ProtocolBuffers.Collections;
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using scg = global::System.Collections.Generic;
+namespace Google.ProtocolBuffers.DescriptorProtos {
+
+ public static partial class CSharpOptions {
+
+ #region Descriptor
+ public static pbd::FileDescriptor Descriptor {
+ get { return descriptor; }
+ }
+ private static readonly pbd::FileDescriptor descriptor = pbd::FileDescriptor.InternalBuildGeneratedFileFrom(
+ global::System.Convert.FromBase64String(
+ "CiRnb29nbGUvcHJvdG9idWYvY3NoYXJwX29wdGlvbnMucHJvdG8SD2dvb2ds" +
+ "ZS5wcm90b2J1ZhogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG86" +
+ "NwoPQ1NoYXJwTmFtZXNwYWNlEhwuZ29vZ2xlLnByb3RvYnVmLkZpbGVPcHRp" +
+ "b25zGKCcASABKAk6PwoXQ1NoYXJwVW1icmVsbGFDbGFzc25hbWUSHC5nb29n" +
+ "bGUucHJvdG9idWYuRmlsZU9wdGlvbnMYoZwBIAEoCTo7ChNDU2hhcnBNdWx0" +
+ "aXBsZUZpbGVzEhwuZ29vZ2xlLnByb3RvYnVmLkZpbGVPcHRpb25zGKKcASAB" +
+ "KAg6OQoRQ1NoYXJwTmVzdENsYXNzZXMSHC5nb29nbGUucHJvdG9idWYuRmls" +
+ "ZU9wdGlvbnMYo5wBIAEoCDo7ChNDU2hhcnBQdWJsaWNDbGFzc2VzEhwuZ29v" +
+ "Z2xlLnByb3RvYnVmLkZpbGVPcHRpb25zGKScASABKAhCPILiCSdHb29nbGUu" +
+ "UHJvdG9jb2xCdWZmZXJzLkRlc2NyaXB0b3JQcm90b3OK4gkNQ1NoYXJwT3B0" +
+ "aW9ucw=="),
+ new pbd::FileDescriptor[] {
+ global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor,
+ });
+ #endregion
+
+ #region Extensions
+ public static readonly pb::GeneratedExtensionBase<string> CSharpNamespace =
+ pb::GeneratedSingleExtension<string>.CreateInstance(Descriptor.Extensions[0]);
+ public static readonly pb::GeneratedExtensionBase<string> CSharpUmbrellaClassname =
+ pb::GeneratedSingleExtension<string>.CreateInstance(Descriptor.Extensions[1]);
+ public static readonly pb::GeneratedExtensionBase<bool> CSharpMultipleFiles =
+ pb::GeneratedSingleExtension<bool>.CreateInstance(Descriptor.Extensions[2]);
+ public static readonly pb::GeneratedExtensionBase<bool> CSharpNestClasses =
+ pb::GeneratedSingleExtension<bool>.CreateInstance(Descriptor.Extensions[3]);
+ public static readonly pb::GeneratedExtensionBase<bool> CSharpPublicClasses =
+ pb::GeneratedSingleExtension<bool>.CreateInstance(Descriptor.Extensions[4]);
+ #endregion
+
+ #region Static variables
+ #endregion
+ }
+}