diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin
new file mode 100644
index 0000000000..16857215d6
--- /dev/null
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.addin
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj
new file mode 100644
index 0000000000..c2b33eaddb
--- /dev/null
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/ClassWizard.csproj
@@ -0,0 +1,69 @@
+
+
+ {8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}
+ Debug
+ AnyCPU
+ Library
+ ClassWizard
+ ClassWizard
+
+
+ bin\Debug\
+ True
+ Full
+ True
+ DEBUG;TRACE
+
+
+ bin\Release\
+ False
+ None
+ False
+ TRACE
+
+
+
+
+
+
+
+
+
+
+
+ Always
+
+
+
+
+ Configuration\GlobalAssemblyInfo.cs
+
+
+
+
+
+
+
+
+
+ {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}
+ ICSharpCode.TextEditor
+
+
+ {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}
+ NRefactory
+
+
+ {2748AD25-9C63-4E12-877B-4DCE96FBED54}
+ ICSharpCode.SharpDevelop
+
+
+ {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+ ICSharpCode.Core
+
+
+ {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}
+ ICSharpCode.SharpDevelop.Dom
+
+
+
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Configuration/AssemblyInfo.cs
new file mode 100644
index 0000000000..518aa5f7fc
--- /dev/null
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Configuration/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+//
+//
+//
+//
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+[assembly: AssemblyTitle("ClassWizard")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Resources/AddClassForm.xfrm b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Resources/AddClassForm.xfrm
new file mode 100644
index 0000000000..e31e83879d
--- /dev/null
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Resources/AddClassForm.xfrm
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Resources/ClassesList.xfrm b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Resources/ClassesList.xfrm
new file mode 100644
index 0000000000..35961fd0f5
--- /dev/null
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Resources/ClassesList.xfrm
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddClassForm.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddClassForm.cs
new file mode 100644
index 0000000000..6915c103f2
--- /dev/null
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddClassForm.cs
@@ -0,0 +1,189 @@
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 12/22/2006
+ * Time: 3:34 PM
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.IO;
+using System.Windows.Forms;
+
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Gui.XmlForms;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
+using ICSharpCode.SharpDevelop.Dom;
+using ICSharpCode.NRefactory.Ast;
+using ICSharpCode.SharpDevelop.Dom.Refactoring;
+using ICSharpCode.SharpDevelop.Refactoring;
+
+namespace ClassWizard
+{
+ public class AddClassForm : BaseSharpDevelopForm
+ {
+ public AddClassForm()
+ {
+ SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ClassWizard.Resources.AddClassForm.xfrm"));
+ Get