First cut at new layout
diff --git a/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs b/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs
new file mode 100644
index 0000000..5f414fc
--- /dev/null
+++ b/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs
@@ -0,0 +1,43 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.
+// http://code.google.com/p/protobuf/
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file just contains partial classes for each of the
+// autogenerated classes, so that they implement
+// IDescriptorProto
+namespace Google.ProtocolBuffers.DescriptorProtos {
+
+  // TODO(jonskeet): Find a better way of fixing this. It's needed in order to
+  // cope with unknown fields during initialization.
+  public partial class DescriptorProtoFile {
+    private static readonly bool initialized = false;
+
+    internal static bool Bootstrapping {
+      get { return !initialized; }
+    }
+
+    static DescriptorProtoFile() {
+      initialized = true;
+    }
+  }
+
+  public partial class DescriptorProto : IDescriptorProto<MessageOptions> { }
+  public partial class EnumDescriptorProto : IDescriptorProto<EnumOptions> { }
+  public partial class EnumValueDescriptorProto : IDescriptorProto<EnumValueOptions> { }
+  public partial class FieldDescriptorProto : IDescriptorProto<FieldOptions> { }
+  public partial class FileDescriptorProto : IDescriptorProto<FileOptions> { }
+  public partial class MethodDescriptorProto : IDescriptorProto<MethodOptions> { }
+  public partial class ServiceDescriptorProto : IDescriptorProto<ServiceOptions> { }
+}