diff --git a/src/GCCGenerator/Access.cs b/src/GCCGenerator/Access.cs
deleted file mode 100644
index 96098ea2..00000000
--- a/src/GCCGenerator/Access.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-public enum Access {
-	@private,
-	@protected,
-	@public
-}
-
-
diff --git a/src/GCCGenerator/Class.cs b/src/GCCGenerator/Class.cs
deleted file mode 100644
index 04b9ca57..00000000
--- a/src/GCCGenerator/Class.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Class.cs: Represents a C++ class
-//
-// Author:
-//   Alexander Corrado (alexander.corrado@gmail.com)
-//   Andreia Gaita (shana@spoiledcat.net)
-//   Zoltan Varga <vargaz@gmail.com>
-//
-// Copyright (C) 2011 Novell Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Cxxi;
-
-public class Class : Namespace {
-
-	public Class (Node n)
-		: base (n)
-	{
-		BaseClasses = new List<Class> ();
-		Fields = new List<Field> ();
-		Properties = new List<Property> ();
-		Methods = new List<Method> ();
-		NestedClasses = new List<Class> ();
-		NestedEnums = new List<Enumeration> ();
-	}
-
-	public List<Class> BaseClasses {
-		get; set;
-	}
-
-	public List<Class> NestedClasses {
-		get; set;
-	}
-
-	public List<Enumeration> NestedEnums {
-		get; set;
-	}
-
-	public List<Field> Fields {
-		get; set;
-	}
-
-	public List<Property> Properties {
-		get; set;
-	}
-
-	public List<Method> Methods {
-		get;
-		set;
-	}
-
-	public CppType MangleType {
-		get;
-		set;
-	}
-
-	public bool Disable {
-		get; set;
-	}
-
-}
diff --git a/src/GCCGenerator/Enumeration.cs b/src/GCCGenerator/Enumeration.cs
deleted file mode 100644
index df51d26b..00000000
--- a/src/GCCGenerator/Enumeration.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-public class Enumeration : Namespace {
-
-	public struct Item {
-		public string Name;
-		public int Value;
-	}
-
-	public Enumeration (Node n)
-		: base (n)
-	{
-		this.Items = new List<Item> ();
-	}
-
-	public List<Item> Items {
-		get; set;
-	}
-}
-
diff --git a/src/GCCGenerator/Field.cs b/src/GCCGenerator/Field.cs
deleted file mode 100644
index 46f6ac3c..00000000
--- a/src/GCCGenerator/Field.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Field.cs: Represents a field of a C++ class
-//
-// Author:
-//   Alexander Corrado (alexander.corrado@gmail.com)
-//   Andreia Gaita (shana@spoiledcat.net)
-//   Zoltan Varga <vargaz@gmail.com>
-//
-// Copyright (C) 2011 Novell Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using Mono.Cxxi;
-
-public class Field {
-
-	public Field (string name, CppType type, Access access) {
-		Name = name;
-		Type = type;
-		Access = access;
-	}
-
-	public string Name {
-		get; set;
-	}
-
-	public CppType Type {
-		get; set;
-	}
-
-	public Access Access {
-		get; set;
-	}
-}
diff --git a/src/GCCGenerator/Filter.cs b/src/GCCGenerator/Filter.cs
deleted file mode 100644
index 89d04f0e..00000000
--- a/src/GCCGenerator/Filter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Linq;
-using System.Xml.Linq;
-using System.Collections.Generic;
-
-public enum FilterMode {
-	Include,
-	Exclude,
-	External
-}
-
-public enum ImplementationType {
-	@class,
-	@struct
-}
-
-public struct Filter {
-
-	public string TypeName { get; set; }
-	public FilterMode Mode { get; set; }
-	public ImplementationType ImplType { get; set; }
-
-	public static Dictionary<string, Filter> Load (XDocument doc, out FilterMode @default)
-	{
-		string value;
-		@default = (value = (string)doc.Root.Attribute ("default")) != null ? (FilterMode)Enum.Parse (typeof (FilterMode), value) : FilterMode.Include;
-
-		var rules = from rule in doc.Root.Elements ()
-		            let mode = (FilterMode)Enum.Parse (typeof (FilterMode), rule.Name.LocalName)
-		            let impl = (value = (string)rule.Attribute ("implementation")) != null ? (ImplementationType)Enum.Parse (typeof (ImplementationType), value) : ImplementationType.@class
-		            select new Filter { TypeName = rule.Value, Mode = mode, ImplType = impl };
-
-
-		return rules.ToDictionary<Filter,string> (r => r.TypeName);
-	}
-}
\ No newline at end of file
diff --git a/src/GCCGenerator/Generator.cs b/src/GCCGenerator/Generator.cs
deleted file mode 100644
index 32800a06..00000000
--- a/src/GCCGenerator/Generator.cs
+++ /dev/null
@@ -1,622 +0,0 @@
-//
-// Generator.cs: C++ Interop Code Generator
-//
-//
-
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Xml;
-using System.Xml.Linq;
-using System.Linq;
-using System.Reflection;
-
-using Templates;
-using NDesk.Options;
-using Mono.Cxxi;
-
-public class Generator {
-
-	// Command line arguments
-	public string InputFileName { get; set; }
-	public string OutputDir { get; set; }
-	public string FilterFile { get; set; }
-
-	// In the future we might support more than one of these at once...
-	public Lib Lib { get; set; }
-
-	// Classes to generate code for
-	public Dictionary<Node, Namespace> NodeToNamespace { get; set; }
-
-	private FilterMode default_filter_mode;
-	public FilterMode DefaultFilterMode { get { return default_filter_mode; } set { default_filter_mode = value; } }
-	public Dictionary<string, Filter> Filters { get; set; }
-
-	// Code templates
-	public LibsBase LibsTemplate { get; set; }
-	public ClassBase ClassTemplate { get; set; }
-	public EnumBase EnumTemplate { get; set; }
-
-	public static int Main (String[] args) {
-		var generator = new Generator ();
-		generator.Run (args);
-		return 0;
-	}
-
-	void Run (String[] args) {
-		Lib = new Lib ();
-		NodeToNamespace = new Dictionary<Node, Namespace> ();
-
-		if (ParseArguments (args) != 0) {
-			Environment.Exit (1);
-		}
-
-		Node root = LoadXml (InputFileName);
-
-		if (FilterFile != null)
-			Filters = Filter.Load (XDocument.Load (FilterFile), out default_filter_mode);
-
-		CreateTypes (root);
-
-		CreateMembers ();
-
-		GenerateCode ();
-	}
-
-	int ParseArguments (String[] args) {
-		bool help = false;
-
-		var p = new OptionSet {
-				{ "h|?|help", "Show this help message", v => help = v != null },
-				{ "o=|out=", "Set the output directory", v => OutputDir = v },
-				{ "ns=|namespace=", "Set the namespace of the generated code", v => Lib.BaseNamespace = v },
-				{ "lib=", "The base name of the C++ library, i.e. 'qt' for libqt.so", v =>Lib.BaseName = v },
-				{ "filters=", "A file containing filter directives for filtering classes", v => FilterFile = v },
-				{ "inline=", "Inline methods in lib are: notpresent (default), present, surrogatelib (present in %lib%-inline)", v => Lib.InlinePolicy = (InlineMethods)Enum.Parse (typeof (InlineMethods), v, true) }
-			};
-
-		try {
-			args = p.Parse (args).ToArray ();
-		} catch (OptionException) {
-			Console.WriteLine ("Try `generator --help' for more information.");
-			return 1;
-		}
-
-		if (help) {
-			p.WriteOptionDescriptions (Console.Error);
-			return 1;
-		}
-
-		if (args.Length != 1) {
-			Console.WriteLine ("Usage: generator <options> <input xml file>");
-			return 1;
-		}
-
-		// Code templates
-		LibsTemplate = new CSharpLibs ();
-		ClassTemplate = new CSharpClass ();
-		EnumTemplate = new CSharpEnum ();
-
-		InputFileName = args [0];
-
-		if (Lib.BaseName == null) {
-			Console.WriteLine ("The --lib= option is required.");
-			return 1;
-		}
-
-		if (Lib.BaseNamespace == null) {
-			Lib.BaseNamespace = Path.GetFileNameWithoutExtension (Lib.BaseName);
-		}
-
-		if (OutputDir == null)
-			OutputDir = "output";
-
-		return 0;
-	}
-
-	Node LoadXml (string file) {
-		XmlReader reader = XmlReader.Create (file, new XmlReaderSettings ());
-
-		Node[] parents = new Node [1024];
-
-		Node root = null;
-
-		while (reader.Read()) {
-			if (reader.IsStartElement ()) {
-				string type = reader.Name;
-
-				var attributes = new Dictionary<string, string> ();
-				while (reader.MoveToNextAttribute ()) {
-					attributes [reader.Name] = reader.Value;
-				}
-
-				Node n = new Node {
-						Id = "",
-						Type = type,
-						Attributes = attributes,
-						Children = new List<Node> ()
-				};
-
-				if (attributes.ContainsKey ("id")) {
-					n.Id = attributes ["id"];
-					Node.IdToNode [n.Id] = n;
-				}
-
-				if (attributes.ContainsKey ("name"))
-					n.Name = attributes ["name"];
-
-				if (parents [reader.Depth - 1] != null) {
-					//Console.WriteLine (parents [reader.Depth - 1].type + " -> " + e.type);
-					parents [reader.Depth - 1].Children.Add (n);
-				}
-				parents [reader.Depth] = n;
-
-				if (n.Type == "GCC_XML" && root == null)
-					root = n;
-			}
-		}
-
-		return root;
-	}
-
-	void CreateTypes (Node root) {
-
-		foreach (Node n in root.Children) {
-			if (n.IsTrue ("incomplete") || !n.HasValue ("name") || n.Attributes ["name"] == "::")
-				continue;
-
-			Namespace ns;
-			switch (n.Type) {
-
-			case "Class":
-			case "Struct":
-				ns = new Class (n);
-				break;
-
-			case "Enumeration":
-				ns = new Enumeration (n);
-				break;
-
-			case "Namespace":
-				ns = new Namespace (n);
-				break;
-
-			default:
-				continue;
-
-			}
-
-			NodeToNamespace [n] = ns;
-			Lib.Namespaces.Add (ns);
-		}
-
-		for (var i = 0; i < Lib.Namespaces.Count; i++) {
-			Namespace ns = Lib.Namespaces [i];
-			SetParentNamespace (ns);
-
-			var filter = GetFilterOrDefault (ns);
-			if (filter.Mode == FilterMode.Exclude)
-				NodeToNamespace.Remove (ns.Node);
-
-			if (filter.Mode != FilterMode.Include) {
-				Lib.Namespaces.RemoveAt (i);
-				i--;
-				continue;
-			}
-
-			var klass = ns as Class;
-			if (klass == null)
-				continue;
-
-			// Compute bases
-			foreach (Node bn in klass.Node.Children.Where (o => o.Type == "Base")) {
-				Class baseClass = NodeToNamespace [bn.NodeForAttr ("type")] as Class;
-				Debug.Assert (baseClass != null);
-				klass.BaseClasses.Add (baseClass);
-			}
-		}
-	}
-
-	void SetParentNamespace (Namespace ns)
-	{
-		Namespace parent = null;
-		if (ns.Node.HasValue ("context") && NodeToNamespace.TryGetValue (Node.IdToNode [ns.Node.Attributes ["context"]], out parent))
-		{
-			SetParentNamespace (parent);
-			ns.ParentNamespace = parent;
-		}
-	}
-
-	void CreateMembers () {
-
-		foreach (var ns in Lib.Namespaces) {
-
-			var parentClass = ns.ParentNamespace as Class;
-
-			var @enum = ns as Enumeration;
-			if (@enum != null) {
-				if (parentClass != null)
-					parentClass.NestedEnums.Add (@enum);
-
-				foreach (var enumValue in @enum.Node.Children.Where (o => o.Type == "EnumValue")) {
-					int val;
-					var item = new Enumeration.Item { Name = enumValue.Attributes ["name"] };
-
-					if (enumValue.HasValue ("init") && int.TryParse (enumValue.Attributes ["init"], out val))
-						item.Value = val;
-
-					@enum.Items.Add (item);
-				}
-
-				continue;
-			}
-
-			var klass = ns as Class;
-			if (klass == null || !klass.Node.HasValue ("members"))
-				continue;
-
-			klass.MangleType = GetType (klass.Node);
-
-			if (parentClass != null)
-				parentClass.NestedClasses.Add (klass);
-
-			int fieldCount = 0;
-			foreach (Node n in klass.Node ["members"].Split (new[] {' '}, StringSplitOptions.RemoveEmptyEntries).Select (id => Node.IdToNode [id])) {
-				bool ctor = false;
-				bool dtor = false;
-				bool skip = false;
-
-				switch (n.Type) {
-				case "Field":
-					var fieldType = GetType (GetTypeNode (n));
-					if (fieldType.ElementType == CppTypes.Unknown && fieldType.ElementTypeName == null)
-						fieldType = new CppType (CppTypes.Void, CppModifiers.Pointer);
-
-					string fieldName;
-					if (n.Name != "")
-						fieldName = n.Name;
-					else
-						fieldName = "field" + fieldCount++;
-
-					klass.Fields.Add (new Field (fieldName, fieldType, (Access)Enum.Parse (typeof (Access), n ["access"])));
-					break;
-
-				case "Constructor":
-					ctor = true;
-					break;
-				case "Destructor":
-					dtor = true;
-					break;
-				case "Method":
-					break;
-				default:
-					continue;
-				}
-
-				if ((!dtor && n.HasValue ("overrides") && CheckPrimaryBases (klass, b => b.Node.CheckValueList ("members", n.Attributes ["overrides"]))) || // excl. virtual methods from primary base (except dtor)
-				    (!n.IsTrue ("extern") && !n.IsTrue ("inline")))
-					continue;
-
-				if (n.IsTrue ("inline") && Lib.InlinePolicy == InlineMethods.NotPresent)
-					skip = true;
-
-				string name = dtor ? "Destruct" : n.Name;
-
-				var method = new Method (n) {
-						Name = name,
-						Access = (Access)Enum.Parse (typeof (Access), n.Attributes ["access"]),
-						IsVirtual = n.IsTrue ("virtual"),
-						IsStatic = n.IsTrue ("static"),
-						IsConst = n.IsTrue ("const"),
-						IsInline = n.IsTrue ("inline"),
-						IsArtificial = n.IsTrue ("artificial"),
-						IsConstructor = ctor,
-						IsDestructor = dtor
-				};
-
-				if (method.Access == Access.@private)
-					skip = true;
-
-				if (dtor || method.IsArtificial)
-					method.GenWrapperMethod = false;
-
-				CppType retType;
-				if (n.HasValue ("returns"))
-					retType = GetType (n.NodeForAttr ("returns"));
-				else
-					retType = CppTypes.Void;
-				if (retType.ElementType == CppTypes.Unknown) {
-					retType = CppTypes.Void;
-					skip = true;
-				}
-				if (CppTypeToManaged (retType) == null) {
-					//Console.WriteLine ("\t\tS: " + retType);
-					retType = CppTypes.Void;
-					skip = true;
-				}
-
-				method.ReturnType = retType;
-
-				int c = 0;
-				var argTypes = new List<CppType> ();
-				foreach (Node arg in n.Children.Where (o => o.Type == "Argument")) {
-					string argname;
-					if (arg.Name == null || arg.Name == "")
-						argname = "arg" + c;
-					else
-						argname = arg.Name;
-
-					var argtype = GetType (GetTypeNode (arg));
-					if (argtype.ElementType == CppTypes.Unknown) {
-						//Console.WriteLine ("Skipping method " + klass.Name + "::" + member.Name + " () because it has an argument with unknown type '" + TypeNodeToString (arg) + "'.");
-						argtype = new CppType (CppTypes.Void, CppModifiers.Pointer);
-						skip = true;
-					}
-
-					if (CppTypeToManaged (argtype) == null) {
-						//Console.WriteLine ("\t\tS: " + argtype);
-						argtype = new CppType (CppTypes.Void, CppModifiers.Pointer);
-						skip = true;
-					}
-
-					method.Parameters.Add (new Parameter (argname, argtype));
-					argTypes.Add (argtype);
-
-					c++;
-				}
-				if (skip && !method.IsVirtual)
-					continue;
-				else if (skip && method.IsVirtual)
-					method.GenWrapperMethod = false;
-
-				// FIXME: More complete type name check
-				if (ctor && argTypes.Count == 1 && argTypes [0].ElementType == CppTypes.Class && argTypes [0].ElementTypeName == klass.Name && argTypes [0].Modifiers.Count == 2 && argTypes [0].Modifiers.Contains (CppModifiers.Const) && argTypes [0].Modifiers.Contains (CppModifiers.Reference))
-					method.IsCopyCtor = true;
-				
-				Console.WriteLine ("\t" + klass.Name + "." + method.Name);
-
-				klass.Methods.Add (method);
-			}
-
-			foreach (var method in klass.Methods) {
-				if (AddAsProperty (klass, method))
-					method.GenWrapperMethod = false;
-			}
-
-			Field f2 = klass.Fields.FirstOrDefault (f => f.Type.ElementType == CppTypes.Unknown);
-			if (f2 != null) {
-				Console.WriteLine ("Skipping " + klass.Name + " because field " + f2.Name + " has unknown type.");
-				klass.Disable = true;
-			}
-		}
-	}
-
-	//
-	// Property support
-	//
-    bool AddAsProperty (Class klass, Method method) {
-		// if it's const, returns a value, has no parameters, and there is no other method with the same name
-		//  in this class assume it's a property getter (for now?)
-		if (method.IsConst && !method.ReturnType.Equals (CppTypes.Void) && !method.Parameters.Any () &&
-			klass.Methods.Count (o => o.Name == method.Name) == 1) {
-			Property property;
-
-			property = klass.Properties.Where (o => o.Name == method.FormattedName).FirstOrDefault ();
-			if (property != null) {
-				property.GetMethod = method;
-			} else {
-				property = new Property (method.FormattedName, method.ReturnType) { GetMethod = method };
-				klass.Properties.Add (property);
-			}
-
-			return true;
-		}
-
-		// if it's name starts with "set", does not return a value, and has one arg (besides this ptr)
-		// and there is no other method with the same name...
-		if (method.Name.ToLower ().StartsWith ("set") && method.ReturnType.Equals (CppTypes.Void) &&
-			method.Parameters.Count == 1 && klass.Methods.Count (o => o.Name == method.Name) == 1) {
-			string getterName = method.Name.Substring (3).TrimStart ('_').ToLower ();
-
-			string pname = method.FormattedName.Substring (3);
-			Property property = null;
-
-			// ...AND there is a corresponding getter method that returns the right type, then assume it's a property setter
-			bool doIt = false;
-			property = klass.Properties.Where (o => o.Name == pname).FirstOrDefault ();
-			if (property != null) {
-				doIt = property.GetMethod != null && property.GetMethod.ReturnType.Equals (method.Parameters[0].Type);
-			} else {
-				Method getter = klass.Methods.Where (o => o.Name == getterName).FirstOrDefault ();
-				doIt = getter != null && getter.ReturnType.Equals (method.Parameters[0].Type);
-			}
-			if (doIt) {
-				if (property != null) {
-					property.SetMethod = method;
-				} else {
-					property = new Property (pname, method.Parameters [0].Type) { SetMethod = method };
-					klass.Properties.Add (property);
-				}
-
-				// set the method's arg name to "value" so that the prop setter works right
-				var valueParam = method.Parameters[0];
-				valueParam.Name = "value";
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	// Checks klass's primary base, primary base's primary base, and so on up the hierarchy
-	public bool CheckPrimaryBases (Class klass, Func<Class, bool> predicate)
-	{
-		if (klass.BaseClasses.Count == 0)
-			return false;
-		var primaryBase = klass.BaseClasses [0];
-		return predicate (primaryBase) || CheckPrimaryBases (primaryBase, predicate);
-	}
-
-	// Return a CppType for the type node N, return CppTypes.Unknown for unknown types
-	CppType GetType (Node n) {
-		return GetType (n, new CppType ());
-	}
-
-	CppType GetType (Node n, CppType modifiers) {
-		var fundamental = CppTypes.Unknown;
-
-		switch (n.Type) {
-		case "Typedef":
-			return GetType (GetTypeNode (n), modifiers);
-		case "ArrayType":
-			CppModifiers mod = null;
-			if (n.Attributes ["max"] != null && n.Attributes ["min"] != null)
-				mod = new CppModifiers.ArrayModifier (int.Parse (n.Attributes ["max"].TrimEnd ('u')) - int.Parse (n.Attributes ["min"].TrimEnd ('u')) + 1);
-			else
-				mod = CppModifiers.Array;
-			return GetType (GetTypeNode (n), modifiers.Modify (mod));
-		case "PointerType":
-			return GetType (GetTypeNode (n), modifiers.Modify (CppModifiers.Pointer));
-		case "ReferenceType":
-			return GetType (GetTypeNode (n), modifiers.Modify (CppModifiers.Reference));
-		case "FundamentalType":
-			return modifiers.CopyTypeFrom (new CppType (n.Name));
-		case "CvQualifiedType":
-			if (n.IsTrue ("const"))
-				return GetType (GetTypeNode (n), modifiers.Modify (CppModifiers.Const));
-			else
-				throw new NotImplementedException ();
-		case "Class":
-			fundamental = CppTypes.Class;
-			break;
-		case "Struct":
-			fundamental = CppTypes.Struct;
-			break;
-		case "Enumeration":
-			fundamental = CppTypes.Enum;
-			break;
-		default:
-			return CppTypes.Unknown;
-		}
-
-		if (!NodeToNamespace.ContainsKey (n)) {
-			// FIXME: Do something better
-			return CppTypes.Unknown;
-		}
-
-		return modifiers.CopyTypeFrom (new CppType (fundamental, string.Join ("::", NodeToNamespace [n].FullyQualifiedName)));
-	}
-
-	Node GetTypeNode (Node n) {
-		return Node.IdToNode [n.Attributes ["type"]];
-	}
-
-	// Return the System.Type name corresponding to T, or null
-	//  Returned as a string, because other wrappers do not have System.Types yet
-	public string CppTypeToManaged (CppType t) {
-
-		Type mtype = t.ToManagedType ();
-		if (mtype != null && mtype != typeof (ICppObject)) {
-			return mtype.FullName;
-		}
-
-		switch (t.ElementType) {
-
-		case CppTypes.Class:
-		case CppTypes.Struct:
-		case CppTypes.Enum:
-
-			var filter = GetFilterOrDefault (t);
-			var qname = filter.TypeName.Replace ("::", ".");
-
-			if (filter.ImplType == ImplementationType.@struct && !IsByVal (t))
-				return qname + "&";
-			else
-				return qname;
-
-		}
-
-		return null;
-	}
-
-	void GenerateCode () {
-		Directory.CreateDirectory (OutputDir);
-
-		// Generate Libs file
-		using (TextWriter w = File.CreateText (Path.Combine (OutputDir, "Libs.cs"))) {
-			LibsTemplate.Generator = this;
-			LibsTemplate.Libs = new[] { Lib };
-			w.Write (LibsTemplate.TransformText ());
-		}
-
-
-		// Generate user types
-		foreach (Namespace ns in Lib.Namespaces) {
-			if (ns.ParentNamespace is Class)
-				continue;
-
-			var klass = ns as Class;
-			if (klass != null) {
-				if (klass.Disable)
-					continue;
-
-				using (TextWriter w = File.CreateText (Path.Combine (OutputDir, klass.Name + ".cs"))) {
-					ClassTemplate.Generator = this;
-					ClassTemplate.Class = klass;
-					ClassTemplate.Nested = false;
-					w.Write (ClassTemplate.TransformText ());
-				}
-
-				continue;
-			}
-
-			var @enum = ns as Enumeration;
-			if (@enum != null) {
-
-				using (TextWriter w = File.CreateText (Path.Combine (OutputDir, @enum.Name + ".cs"))) {
-					EnumTemplate.Generator = this;
-					EnumTemplate.Enum = @enum;
-					EnumTemplate.Nested = false;
-					w.Write (EnumTemplate.TransformText ());
-				}
-
-				continue;
-			}
-
-		}
-	}
-
-	static public bool IsByVal (CppType t)
-	{
-		return ((t.ElementType == CppTypes.Class || t.ElementType == CppTypes.Struct) &&
-		        !t.Modifiers.Contains (CppModifiers.Pointer) &&
-		        !t.Modifiers.Contains (CppModifiers.Reference) &&
-		        !t.Modifiers.Contains (CppModifiers.Array));
-	}
-
-	Filter GetFilterOrDefault (Namespace ns)
-	{
-		return GetFilterOrDefault (string.Join ("::", ns.FullyQualifiedName));
-	}
-
-	public Filter GetFilterOrDefault (CppType cpptype)
-	{
-		var fqn = cpptype.ElementTypeName;
-		if (cpptype.Namespaces != null)
-			fqn = string.Join ("::", cpptype.Namespaces) + "::" + fqn;
-
-		var newtype = new CppType (fqn, cpptype.Modifiers.Where (m => m == CppModifiers.Template));
-		return GetFilterOrDefault (newtype.ToString ().Replace (" ", ""));
-	}
-
-	Filter GetFilterOrDefault (string fqn)
-	{
-		Filter result;
-		if (Filters != null && Filters.TryGetValue (fqn, out result))
-			return result;
-
-		return new Filter { TypeName = fqn, Mode = default_filter_mode };
-	}
-}
diff --git a/src/GCCGenerator/Lib.cs b/src/GCCGenerator/Lib.cs
deleted file mode 100644
index 579074d1..00000000
--- a/src/GCCGenerator/Lib.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Mono.Cxxi;
-
-public class Lib {
-
-	public Lib ()
-	{
-		Namespaces = new List<Namespace> ();
-	}
-
-	public string BaseName {
-		get;
-		set;
-	}
-
-	public InlineMethods InlinePolicy {
-		get;
-		set;
-	}
-
-	public string BaseNamespace {
-		get;
-		set;
-	}
-
-	public IList<Namespace> Namespaces {
-		get;
-		set;
-	}
-}
-
diff --git a/src/GCCGenerator/Makefile.am b/src/GCCGenerator/Makefile.am
deleted file mode 100644
index c446f5d7..00000000
--- a/src/GCCGenerator/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-
-EXTRA_DIST = m4/expansions.m4
-
-if ENABLE_DEBUG
-ASSEMBLY_COMPILER_COMMAND = mcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-BUILD_DIR = $(top_srcdir)/bin/Debug
-
-ASSEMBLY = $(BUILD_DIR)/generator.exe
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-
-MONO_CXXI_DLL_SOURCE=$(BUILD_DIR)/Mono.Cxxi.dll
-MONO_CXXI_DLL=$(BUILD_DIR)/Mono.Cxxi.dll
-GENERATOR_EXE_MDB_SOURCE=$(BUILD_DIR)/generator.exe.mdb
-GENERATOR_EXE_MDB=$(BUILD_DIR)/generator.exe.mdb
-
-endif
-
-if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = mcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
-BUILD_DIR = $(top_srcdir)/bin/Release
-
-ASSEMBLY = $(BUILD_DIR)/generator.exe
-ASSEMBLY_MDB = 
-
-MONO_CXXI_DLL_SOURCE=$(BUILD_DIR)/Mono.Cxxi.dll
-MONO_CXXI_DLL=$(BUILD_DIR)/Mono.Cxxi.dll
-GENERATOR_EXE_MDB= 
-
-endif
-
-COMPILE_TARGET = exe
-
-AL=al2
-SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
-
-PROGRAMFILES = \
-	$(MONO_CXXI_DLL) \
-	$(GENERATOR_EXE_MDB)
-
-BINARIES = \
-	$(GENERATOR)  
-
-
-RESGEN=resgen2
-
-all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) 
-
-FILES =  \
-	Access.cs \
-	Class.cs \
-	Enumeration.cs \
-	Field.cs \
-	Filter.cs \
-	Generator.cs \
-	Lib.cs \
-	Method.cs \
-	Namespace.cs \
-	Node.cs \
-	Options.cs \
-	Parameter.cs \
-	Property.cs \
-	Templates/Base.cs \
-	Templates/BaseMembers.cs \
-	Templates/Context.cs \
-	Templates/CSharp/CSharpClass.cs \
-	Templates/CSharp/CSharpEnum.cs \
-	Templates/CSharp/CSharpLanguage.cs \
-	Templates/CSharp/CSharpLibs.cs
-
-DATA_FILES = 
-
-RESOURCES = 
-
-EXTRAS = \
-	generator.in 
-
-REFERENCES =  \
-	../../bin/Debug/Mono.Cxxi.dll \
-	System \
-	System.Core \
-	System.Xml \
-	System.Xml.Linq
-
-DLL_REFERENCES = 
-
-CLEANFILES = $(PROGRAMFILES) $(BINARIES) 
-
-include $(top_srcdir)/Makefile.include
-
-GENERATOR = $(BUILD_DIR)/generator
-
-$(eval $(call emit-deploy-target,MONO_CXXI_DLL))
-$(eval $(call emit-deploy-wrapper,GENERATOR,generator,x))
-
-
-$(eval $(call emit_resgen_targets))
-$(build_xamlg_list): %.xaml.g.cs: %.xaml
-	xamlg '$<'
-
-$(ASSEMBLY_MDB): $(ASSEMBLY)
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
-	mkdir -p $(shell dirname $(ASSEMBLY))
-	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
diff --git a/src/GCCGenerator/Method.cs b/src/GCCGenerator/Method.cs
deleted file mode 100644
index d183c775..00000000
--- a/src/GCCGenerator/Method.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Method.cs: Represents a C++ method
-//
-// Author:
-//   Alexander Corrado (alexander.corrado@gmail.com)
-//   Andreia Gaita (shana@spoiledcat.net)
-//   Zoltan Varga <vargaz@gmail.com>
-//
-// Copyright (C) 2011 Novell Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Cxxi;
-
-public class Method {
-
-	public Method (Node node) {
-		Node = node;
-	    Parameters = new List<Parameter> ();
-		GenWrapperMethod = true;
-	}
-
-	public Node Node {
-		get; set;
-	}
-
-	public Access Access {
-		get; set;
-	}
-
-	public string Name {
-		get; set;
-	}
-
-	public bool IsVirtual {
-		get; set;
-	}
-
-	public bool IsStatic {
-		get; set;
-	}
-
-	public bool IsConst {
-		get; set;
-	}
-
-	public bool IsInline {
-		get; set;
-	}
-
-	public bool IsArtificial {
-		get; set;
-	}
-
-	public bool IsConstructor {
-		get; set;
-	}
-
-	public bool IsDestructor {
-		get; set;
-	}
-
-	public bool IsCopyCtor {
-		get; set;
-	}
-
-	public bool GenWrapperMethod {
-		get; set;
-	}
-
-	public CppType ReturnType {
-		get; set;
-	}
-
-	public List<Parameter> Parameters {
-		get; set;
-	}
-
-	// The C# method name
-	public string FormattedName {
-		get {
-			return "" + Char.ToUpper (Name [0]) + Name.Substring (1);
-		}
-	}
-}
diff --git a/src/GCCGenerator/Namespace.cs b/src/GCCGenerator/Namespace.cs
deleted file mode 100644
index 2b59f9ed..00000000
--- a/src/GCCGenerator/Namespace.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-public class Namespace {
-
-	public Namespace (string name)
-	{
-		this.Name = name;
-	}
-
-	public Namespace (Node node)
-		: this (node.Name)
-	{
-		this.Node = node;
-	}
-
-	public Node Node {
-		get; set;
-	}
-
-	// Back ref to enclosing namespace (may be null)
-	public Namespace ParentNamespace {
-		get; set;
-	}
-
-	public string Name {
-		get; set;
-	}
-
-	private string [] fullyQualifiedName;
-	public string [] FullyQualifiedName {
-		get {
-			if (fullyQualifiedName == null) {
-
-				if (ParentNamespace == null) {
-					fullyQualifiedName = new string[] { Name };
-				} else {
-					var parentFqn = ParentNamespace.FullyQualifiedName;
-					fullyQualifiedName = new string[parentFqn.Length + 1];
-					Array.Copy (parentFqn, fullyQualifiedName, parentFqn.Length);
-					fullyQualifiedName [parentFqn.Length] = Name;
-				}
-			}
-			return fullyQualifiedName;
-		}
-	}
-
-}
-
diff --git a/src/GCCGenerator/Node.cs b/src/GCCGenerator/Node.cs
deleted file mode 100644
index 27eab7f1..00000000
--- a/src/GCCGenerator/Node.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Node.cs:
-//
-//
-// Author:
-//   Alexander Corrado (alexander.corrado@gmail.com)
-//   Andreia Gaita (shana@spoiledcat.net)
-//   Zoltan Varga <vargaz@gmail.com>
-//
-// Copyright (C) 2011 Novell Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-
-//
-// This class represents an XML node read from the output of gccxml
-//
-public class Node {
-
-	// The XML element type
-	public string Type {
-		get; set;
-	}
-
-	// The value of the 'id' attribute
-	public string Id {
-		get; set;
-	}
-
-	// The value of the 'name' attribute or null
-	public string Name {
-		get; set;
-	}
-
-	// Attributes
-	public Dictionary<string, string> Attributes {
-		get; set;
-	}
-
-	// The children nodes of this node
-	public List<Node> Children {
-		get; set;
-	}
-
-	public string this [string key] {
-		get {
-			return Attributes [key];
-		}
-	}
-
-	// Maps ids to nodes
-	public static Dictionary<string, Node> IdToNode = new Dictionary <string, Node> ();
-
-	// For an attribute which contains an id, return the corresponding Node
-	public Node NodeForAttr (string attr) {
-		return IdToNode [Attributes [attr]];
-	}
-
-	public bool IsTrue (string key) {
-		return Attributes.ContainsKey (key) && Attributes[key] == "1";
-	}
-
-	public bool HasValue (string key) {
-		return Attributes.ContainsKey (key) && Attributes[key] != "";
-	}
-
-	public bool CheckValue (string key, string name) {
-		return Attributes.ContainsKey (key) && Attributes[key].Trim () == name.Trim ();
-	}
-
-	public bool CheckValueList (string key, string name) {
-		return Attributes.ContainsKey (key) && Attributes[key].Split (' ').Contains (name.Trim ());
-	}
-}
diff --git a/src/GCCGenerator/Options.cs b/src/GCCGenerator/Options.cs
deleted file mode 100644
index 1fcdd863..00000000
--- a/src/GCCGenerator/Options.cs
+++ /dev/null
@@ -1,1597 +0,0 @@
-//
-// Options.cs
-//
-// Authors:
-//  Jonathan Pryor <jpryor@novell.com>
-//
-// Copyright (C) 2008 Novell (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-// Compile With:
-//   gmcs -debug+ -d:TEST -r:System.Core Options.cs
-//   gmcs -debug+ -d:LINQ -d:TEST -r:System.Core Options.cs
-
-//
-// A Getopt::Long-inspired option parsing library for C#.
-//
-// NDesk.Options.OptionSet is built upon a key/value table, where the
-// key is a option format string and the value is an Action<string>
-// delegate that is invoked when the format string is matched.
-//
-// Option format strings:
-//  BNF Grammar: ( name [=:]? ) ( '|' name [=:]? )+
-// 
-// Each '|'-delimited name is an alias for the associated action.  If the
-// format string ends in a '=', it has a required value.  If the format
-// string ends in a ':', it has an optional value.  If neither '=' or ':'
-// is present, no value is supported.
-//
-// Options are extracted either from the current option by looking for
-// the option name followed by an '=' or ':', or is taken from the
-// following option IFF:
-//  - The current option does not contain a '=' or a ':'
-//  - The following option is not a registered named option
-//
-// The `name' used in the option format string does NOT include any leading
-// option indicator, such as '-', '--', or '/'.  All three of these are
-// permitted/required on any named option.
-//
-// Option bundling is permitted so long as:
-//   - '-' is used to start the option group
-//   - all of the bundled options do not require values
-//   - all of the bundled options are a single character
-//
-// This allows specifying '-a -b -c' as '-abc'.
-//
-// Option processing is disabled by specifying "--".  All options after "--"
-// are returned by OptionSet.Parse() unchanged and unprocessed.
-//
-// Unprocessed options are returned from OptionSet.Parse().
-//
-// Examples:
-//  int verbose = 0;
-//  OptionSet p = new OptionSet ()
-//    .Add ("v", v => ++verbose)
-//    .Add ("name=|value=", v => Console.WriteLine (v));
-//  p.Parse (new string[]{"-v", "--v", "/v", "-name=A", "/name", "B", "extra"});
-//
-// The above would parse the argument string array, and would invoke the
-// lambda expression three times, setting `verbose' to 3 when complete.  
-// It would also print out "A" and "B" to standard output.
-// The returned array would contain the string "extra".
-//
-// C# 3.0 collection initializers are supported:
-//  var p = new OptionSet () {
-//    { "h|?|help", v => ShowHelp () },
-//  };
-//
-// System.ComponentModel.TypeConverter is also supported, allowing the use of
-// custom data types in the callback type; TypeConverter.ConvertFromString()
-// is used to convert the value option to an instance of the specified
-// type:
-//
-//  var p = new OptionSet () {
-//    { "foo=", (Foo f) => Console.WriteLine (f.ToString ()) },
-//  };
-//
-// Random other tidbits:
-//  - Boolean options (those w/o '=' or ':' in the option format string)
-//    are explicitly enabled if they are followed with '+', and explicitly
-//    disabled if they are followed with '-':
-//      string a = null;
-//      var p = new OptionSet () {
-//        { "a", s => a = s },
-//      };
-//      p.Parse (new string[]{"-a"});   // sets v != null
-//      p.Parse (new string[]{"-a+"});  // sets v != null
-//      p.Parse (new string[]{"-a-"});  // sets v == null
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Text.RegularExpressions;
-
-#if LINQ
-using System.Linq;
-#endif
-
-#if TEST
-using NDesk.Options;
-#endif
-
-namespace NDesk.Options {
-
-	public class OptionValueCollection : IList, IList<string> {
-
-		List<string> values = new List<string> ();
-		OptionContext c;
-
-		internal OptionValueCollection (OptionContext c)
-		{
-			this.c = c;
-		}
-
-		#region ICollection
-		void ICollection.CopyTo (Array array, int index)  {(values as ICollection).CopyTo (array, index);}
-		bool ICollection.IsSynchronized                   {get {return (values as ICollection).IsSynchronized;}}
-		object ICollection.SyncRoot                       {get {return (values as ICollection).SyncRoot;}}
-		#endregion
-
-		#region ICollection<T>
-		public void Add (string item)                       {values.Add (item);}
-		public void Clear ()                                {values.Clear ();}
-		public bool Contains (string item)                  {return values.Contains (item);}
-		public void CopyTo (string[] array, int arrayIndex) {values.CopyTo (array, arrayIndex);}
-		public bool Remove (string item)                    {return values.Remove (item);}
-		public int Count                                    {get {return values.Count;}}
-		public bool IsReadOnly                              {get {return false;}}
-		#endregion
-
-		#region IEnumerable
-		IEnumerator IEnumerable.GetEnumerator () {return values.GetEnumerator ();}
-		#endregion
-
-		#region IEnumerable<T>
-		public IEnumerator<string> GetEnumerator () {return values.GetEnumerator ();}
-		#endregion
-
-		#region IList
-		int IList.Add (object value)                {return (values as IList).Add (value);}
-		bool IList.Contains (object value)          {return (values as IList).Contains (value);}
-		int IList.IndexOf (object value)            {return (values as IList).IndexOf (value);}
-		void IList.Insert (int index, object value) {(values as IList).Insert (index, value);}
-		void IList.Remove (object value)            {(values as IList).Remove (value);}
-		void IList.RemoveAt (int index)             {(values as IList).RemoveAt (index);}
-		bool IList.IsFixedSize                      {get {return false;}}
-		object IList.this [int index]               {get {return this [index];} set {(values as IList)[index] = value;}}
-		#endregion
-
-		#region IList<T>
-		public int IndexOf (string item)            {return values.IndexOf (item);}
-		public void Insert (int index, string item) {values.Insert (index, item);}
-		public void RemoveAt (int index)            {values.RemoveAt (index);}
-
-		private void AssertValid (int index)
-		{
-			if (c.Option == null)
-				throw new InvalidOperationException ("OptionContext.Option is null.");
-			if (index >= c.Option.MaxValueCount)
-				throw new ArgumentOutOfRangeException ("index");
-			if (c.Option.OptionValueType == OptionValueType.Required &&
-					index >= values.Count)
-				throw new OptionException (string.Format (
-							c.OptionSet.MessageLocalizer ("Missing required value for option '{0}'."), c.OptionName), 
-						c.OptionName);
-		}
-
-		public string this [int index] {
-			get {
-				AssertValid (index);
-				return index >= values.Count ? null : values [index];
-			}
-			set {
-				values [index] = value;
-			}
-		}
-		#endregion
-
-		public List<string> ToList ()
-		{
-			return new List<string> (values);
-		}
-
-		public string[] ToArray ()
-		{
-			return values.ToArray ();
-		}
-
-		public override string ToString ()
-		{
-			return string.Join (", ", values.ToArray ());
-		}
-	}
-
-	public class OptionContext {
-		public OptionContext (OptionSet set)
-		{
-			OptionValues = new OptionValueCollection (this);
-			OptionSet    = set;
-		}
-
-		public Option                 Option        { get; set; }
-		public string                 OptionName    { get; set; }
-		public int                    OptionIndex   { get; set; }
-		public OptionSet              OptionSet     { get; private set; }
-		public OptionValueCollection  OptionValues  { get; private set; }
-	}
-
-	public enum OptionValueType {
-		None, 
-		Optional,
-		Required,
-	}
-
-	public abstract class Option {
-		string prototype, description;
-		string[] names;
-		OptionValueType type;
-		int count;
-		string[] separators;
-
-		protected Option (string prototype, string description)
-			: this (prototype, description, 1)
-		{
-		}
-
-		protected Option (string prototype, string description, int maxValueCount)
-		{
-			if (prototype == null)
-				throw new ArgumentNullException ("prototype");
-			if (prototype.Length == 0)
-				throw new ArgumentException ("Cannot be the empty string.", "prototype");
-			if (maxValueCount < 0)
-				throw new ArgumentOutOfRangeException ("maxValueCount");
-
-			this.prototype   = prototype;
-			this.names       = prototype.Split ('|');
-			this.description = description;
-			this.count       = maxValueCount;
-			this.type        = ParsePrototype ();
-
-			if (this.count == 0 && type != OptionValueType.None)
-				throw new ArgumentException (
-						"Cannot provide maxValueCount of 0 for OptionValueType.Required or " +
-							"OptionValueType.Optional.",
-						"maxValueCount");
-			if (this.type == OptionValueType.None && maxValueCount > 1)
-				throw new ArgumentException (
-						string.Format ("Cannot provide maxValueCount of {0} for OptionValueType.None.", maxValueCount),
-						"maxValueCount");
-		}
-
-		public string           Prototype       {get {return prototype;}}
-		public string           Description     {get {return description;}}
-		public OptionValueType  OptionValueType {get {return type;}}
-		public int              MaxValueCount   {get {return count;}}
-
-		public string[] GetNames ()
-		{
-			return (string[]) names.Clone ();
-		}
-
-		public string[] GetValueSeparators ()
-		{
-			if (separators == null)
-				return new string [0];
-			return (string[]) separators.Clone ();
-		}
-
-		protected static T Parse<T> (string value, OptionContext c)
-		{
-			TypeConverter conv = TypeDescriptor.GetConverter (typeof (T));
-			T t = default (T);
-			try {
-				if (value != null)
-					t = (T) conv.ConvertFromString (value);
-			}
-			catch (Exception e) {
-				throw new OptionException (
-						string.Format (
-							c.OptionSet.MessageLocalizer ("Could not convert string `{0}' to type {1} for option `{2}'."),
-							value, typeof (T).Name, c.OptionName),
-						c.OptionName, e);
-			}
-			return t;
-		}
-
-		internal string[] Names           {get {return names;}}
-		internal string[] ValueSeparators {get {return separators;}}
-
-		static readonly char[] NameTerminator = new char[]{'=', ':'};
-
-		private OptionValueType ParsePrototype ()
-		{
-			char type = '\0';
-			List<string> seps = new List<string> ();
-			for (int i = 0; i < names.Length; ++i) {
-				string name = names [i];
-				if (name.Length == 0)
-					throw new ArgumentException ("Empty option names are not supported.", "prototype");
-
-				int end = name.IndexOfAny (NameTerminator);
-				if (end == -1)
-					continue;
-				names [i] = name.Substring (0, end);
-				if (type == '\0' || type == name [end])
-					type = name [end];
-				else 
-					throw new ArgumentException (
-							string.Format ("Conflicting option types: '{0}' vs. '{1}'.", type, name [end]),
-							"prototype");
-				AddSeparators (name, end, seps);
-			}
-
-			if (type == '\0')
-				return OptionValueType.None;
-
-			if (count <= 1 && seps.Count != 0)
-				throw new ArgumentException (
-						string.Format ("Cannot provide key/value separators for Options taking {0} value(s).", count),
-						"prototype");
-			if (count > 1) {
-				if (seps.Count == 0)
-					this.separators = new string[]{":", "="};
-				else if (seps.Count == 1 && seps [0].Length == 0)
-					this.separators = null;
-				else
-					this.separators = seps.ToArray ();
-			}
-
-			return type == '=' ? OptionValueType.Required : OptionValueType.Optional;
-		}
-
-		private void AddSeparators (string name, int end, List<string> seps)
-		{
-			int start = -1;
-			for (int i = end+1; i < name.Length; ++i) {
-				switch (name [i]) {
-					case '{':
-						if (start != -1)
-							throw new ArgumentException (
-									string.Format ("Ill-formed name/value separator found in \"{0}\".", name),
-									"prototype");
-						start = i+1;
-						break;
-					case '}':
-						if (start == -1)
-							throw new ArgumentException (
-									string.Format ("Ill-formed name/value separator found in \"{0}\".", name),
-									"prototype");
-						seps.Add (name.Substring (start, i-start));
-						start = -1;
-						break;
-					default:
-						if (start == -1)
-							seps.Add (name [i].ToString ());
-						break;
-				}
-			}
-			if (start != -1)
-				throw new ArgumentException (
-						string.Format ("Ill-formed name/value separator found in \"{0}\".", name),
-						"prototype");
-		}
-
-		public void Invoke (OptionContext c)
-		{
-			OnParseComplete (c);
-			c.OptionName  = null;
-			c.Option      = null;
-			c.OptionValues.Clear ();
-		}
-
-		protected abstract void OnParseComplete (OptionContext c);
-
-		public override string ToString ()
-		{
-			return Prototype;
-		}
-	}
-
-	[Serializable]
-	public class OptionException : Exception {
-		private string option;
-
-		public OptionException (string message, string optionName)
-			: base (message)
-		{
-			this.option = optionName;
-		}
-
-		public OptionException (string message, string optionName, Exception innerException)
-			: base (message, innerException)
-		{
-			this.option = optionName;
-		}
-
-		protected OptionException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-			this.option = info.GetString ("OptionName");
-		}
-
-		public string OptionName {
-			get {return this.option;}
-		}
-
-		public override void GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			base.GetObjectData (info, context);
-			info.AddValue ("OptionName", option);
-		}
-	}
-
-	public delegate void OptionAction<TKey, TValue> (TKey key, TValue value);
-
-	public class OptionSet : Collection<Option>
-	{
-		public OptionSet ()
-			: this (f => f)
-		{
-		}
-
-		public OptionSet (Converter<string, string> localizer)
-		{
-			this.localizer = localizer;
-		}
-
-		Dictionary<string, Option> options = new Dictionary<string, Option> ();
-		Converter<string, string> localizer;
-
-		public Converter<string, string> MessageLocalizer {
-			get {return localizer;}
-		}
-
-		protected Option GetOptionForName (string option)
-		{
-			if (option == null)
-				throw new ArgumentNullException ("option");
-			Option v;
-			if (options.TryGetValue (option, out v))
-				return v;
-			return null;
-		}
-
-		protected override void ClearItems ()
-		{
-			this.options.Clear ();
-		}
-
-		protected override void InsertItem (int index, Option item)
-		{
-			AddImpl (item);
-			base.InsertItem (index, item);
-		}
-
-		protected override void RemoveItem (int index)
-		{
-			Option p = Items [index];
-			foreach (string name in p.Names) {
-				this.options.Remove (name);
-			}
-			base.RemoveItem (index);
-		}
-
-		protected override void SetItem (int index, Option item)
-		{
-			RemoveItem (index);
-			Add (item);
-			base.SetItem (index, item);
-		}
-
-		private void AddImpl (Option option)
-		{
-			if (option == null)
-				throw new ArgumentNullException ("option");
-			List<string> added = new List<string> ();
-			try {
-				foreach (string name in option.Names) {
-					this.options.Add (name, option);
-				}
-			}
-			catch (Exception) {
-				foreach (string name in added)
-					this.options.Remove (name);
-				throw;
-			}
-		}
-
-		public new OptionSet Add (Option option)
-		{
-			base.Add (option);
-			return this;
-		}
-
-		class ActionOption : Option {
-			Action<OptionValueCollection> action;
-
-			public ActionOption (string prototype, string description, int count, Action<OptionValueCollection> action)
-				: base (prototype, description, count)
-			{
-				if (action == null)
-					throw new ArgumentNullException ("action");
-				this.action = action;
-			}
-
-			protected override void OnParseComplete (OptionContext c)
-			{
-				action (c.OptionValues);
-			}
-		}
-
-		public OptionSet Add (string prototype, Action<string> action)
-		{
-			return Add (prototype, null, action);
-		}
-
-		public OptionSet Add (string prototype, string description, Action<string> action)
-		{
-			if (action == null)
-				throw new ArgumentNullException ("action");
-			Option p = new ActionOption (prototype, description, 1, v => action (v [0]));
-			base.Add (p);
-			return this;
-		}
-
-		public OptionSet Add (string prototype, OptionAction<string, string> action)
-		{
-			return Add (prototype, null, action);
-		}
-
-		public OptionSet Add (string prototype, string description, OptionAction<string, string> action)
-		{
-			if (action == null)
-				throw new ArgumentNullException ("action");
-			Option p = new ActionOption (prototype, description, 2, (v) => action (v [0], v [1]));
-			base.Add (p);
-			return this;
-		}
-
-		class ActionOption<T> : Option {
-			Action<T> action;
-
-			public ActionOption (string prototype, string description, Action<T> action)
-				: base (prototype, description, 1)
-			{
-				if (action == null)
-					throw new ArgumentNullException ("action");
-				this.action = action;
-			}
-
-			protected override void OnParseComplete (OptionContext c)
-			{
-				action (Parse<T> (c.OptionValues [0], c));
-			}
-		}
-
-		class ActionOption<TKey, TValue> : Option {
-			OptionAction<TKey, TValue> action;
-
-			public ActionOption (string prototype, string description, OptionAction<TKey, TValue> action)
-				: base (prototype, description, 2)
-			{
-				if (action == null)
-					throw new ArgumentNullException ("action");
-				this.action = action;
-			}
-
-			protected override void OnParseComplete (OptionContext c)
-			{
-				action (
-						Parse<TKey> (c.OptionValues [0], c),
-						Parse<TValue> (c.OptionValues [1], c));
-			}
-		}
-
-		public OptionSet Add<T> (string prototype, Action<T> action)
-		{
-			return Add (prototype, null, action);
-		}
-
-		public OptionSet Add<T> (string prototype, string description, Action<T> action)
-		{
-			return Add (new ActionOption<T> (prototype, description, action));
-		}
-
-		public OptionSet Add<TKey, TValue> (string prototype, OptionAction<TKey, TValue> action)
-		{
-			return Add (prototype, null, action);
-		}
-
-		public OptionSet Add<TKey, TValue> (string prototype, string description, OptionAction<TKey, TValue> action)
-		{
-			return Add (new ActionOption<TKey, TValue> (prototype, description, action));
-		}
-
-		protected virtual OptionContext CreateOptionContext ()
-		{
-			return new OptionContext (this);
-		}
-
-#if LINQ
-		public List<string> Parse (IEnumerable<string> arguments)
-		{
-			bool process = true;
-			OptionContext c = CreateOptionContext ();
-			c.OptionIndex = -1;
-			var unprocessed = 
-				from argument in arguments
-				where ++c.OptionIndex >= 0 && process 
-					? argument == "--" 
-						? (process = false)
-						: !Parse (argument, c)
-					: true
-				select argument;
-			List<string> r = unprocessed.ToList ();
-			if (c.Option != null)
-				c.Option.Invoke (c);
-			return r;
-		}
-#else
-		public List<string> Parse (IEnumerable<string> arguments)
-		{
-			OptionContext c = CreateOptionContext ();
-			c.OptionIndex = -1;
-			bool process = true;
-			List<string> unprocessed = new List<string> ();
-			foreach (string argument in arguments) {
-				++c.OptionIndex;
-				if (argument == "--") {
-					process = false;
-					continue;
-				}
-				if (!process) {
-					unprocessed.Add (argument);
-					continue;
-				}
-				if (!Parse (argument, c))
-					unprocessed.Add (argument);
-			}
-			if (c.Option != null)
-				c.Option.Invoke (c);
-			return unprocessed;
-		}
-#endif
-
-		private readonly Regex ValueOption = new Regex (
-			@"^(?<flag>--|-|/)(?<name>[^:=]+)((?<sep>[:=])(?<value>.*))?$");
-
-		protected bool GetOptionParts (string argument, out string flag, out string name, out string sep, out string value)
-		{
-			if (argument == null)
-				throw new ArgumentNullException ("argument");
-
-			flag = name = sep = value = null;
-			Match m = ValueOption.Match (argument);
-			if (!m.Success) {
-				return false;
-			}
-			flag  = m.Groups ["flag"].Value;
-			name  = m.Groups ["name"].Value;
-			if (m.Groups ["sep"].Success && m.Groups ["value"].Success) {
-				sep   = m.Groups ["sep"].Value;
-				value = m.Groups ["value"].Value;
-			}
-			return true;
-		}
-
-		protected virtual bool Parse (string argument, OptionContext c)
-		{
-			if (c.Option != null) {
-				ParseValue (argument, c);
-				return true;
-			}
-
-			string f, n, s, v;
-			if (!GetOptionParts (argument, out f, out n, out s, out v))
-				return false;
-
-			Option p;
-			if (this.options.TryGetValue (n, out p)) {
-				c.OptionName = f + n;
-				c.Option     = p;
-				switch (p.OptionValueType) {
-					case OptionValueType.None:
-						c.OptionValues.Add (n);
-						c.Option.Invoke (c);
-						break;
-					case OptionValueType.Optional:
-					case OptionValueType.Required: 
-						ParseValue (v, c);
-						break;
-				}
-				return true;
-			}
-			// no match; is it a bool option?
-			if (ParseBool (argument, n, c))
-				return true;
-			// is it a bundled option?
-			if (ParseBundledValue (f, string.Concat (n + s + v), c))
-				return true;
-
-			return false;
-		}
-
-		private void ParseValue (string option, OptionContext c)
-		{
-			if (option != null)
-				foreach (var o in c.Option.ValueSeparators != null 
-						? option.Split (c.Option.ValueSeparators, StringSplitOptions.None)
-						: new string[]{option}) {
-					c.OptionValues.Add (o);
-				}
-			if (c.OptionValues.Count == c.Option.MaxValueCount || 
-					c.Option.OptionValueType == OptionValueType.Optional)
-				c.Option.Invoke (c);
-			else if (c.OptionValues.Count > c.Option.MaxValueCount) {
-				throw new OptionException (localizer (string.Format (
-								"Error: Found {0} option values when expecting {1}.", 
-								c.OptionValues.Count, c.Option.MaxValueCount)),
-						c.OptionName);
-			}
-		}
-
-		private bool ParseBool (string option, string n, OptionContext c)
-		{
-			Option p;
-			if (n.Length >= 1 && (n [n.Length-1] == '+' || n [n.Length-1] == '-') &&
-					this.options.TryGetValue (n.Substring (0, n.Length-1), out p)) {
-				string v = n [n.Length-1] == '+' ? option : null;
-				c.OptionName  = option;
-				c.Option      = p;
-				c.OptionValues.Add (v);
-				p.Invoke (c);
-				return true;
-			}
-			return false;
-		}
-
-		private bool ParseBundledValue (string f, string n, OptionContext c)
-		{
-			if (f != "-")
-				return false;
-			for (int i = 0; i < n.Length; ++i) {
-				Option p;
-				string opt = f + n [i].ToString ();
-				if (!this.options.TryGetValue (n [i].ToString (), out p)) {
-					if (i == 0)
-						return false;
-					throw new OptionException (string.Format (localizer (
-									"Cannot bundle unregistered option '{0}'."), opt), opt);
-				}
-				switch (p.OptionValueType) {
-					case OptionValueType.None:
-						Invoke (c, opt, n, p);
-						break;
-					case OptionValueType.Optional:
-					case OptionValueType.Required: {
-						string v     = n.Substring (i+1);
-						c.Option     = p;
-						c.OptionName = opt;
-						ParseValue (v.Length != 0 ? v : null, c);
-						return true;
-					}
-					default:
-						throw new InvalidOperationException ("Unknown OptionValueType: " + p.OptionValueType);
-				}
-			}
-			return true;
-		}
-
-		private void Invoke (OptionContext c, string name, string value, Option option)
-		{
-			c.OptionName  = name;
-			c.Option      = option;
-			c.OptionValues.Add (value);
-			option.Invoke (c);
-		}
-
-		private const int OptionWidth = 29;
-
-		public void WriteOptionDescriptions (TextWriter o)
-		{
-			foreach (Option p in this) {
-				List<string> names = new List<string> (p.Names);
-
-				int written = 0;
-				if (names [0].Length == 1) {
-					Write (o, ref written, "  -");
-					Write (o, ref written, names [0]);
-				}
-				else {
-					Write (o, ref written, "      --");
-					Write (o, ref written, names [0]);
-				}
-
-				for (int i = 1; i < names.Count; ++i) {
-					Write (o, ref written, ", ");
-					Write (o, ref written, names [i].Length == 1 ? "-" : "--");
-					Write (o, ref written, names [i]);
-				}
-
-				if (p.OptionValueType == OptionValueType.Optional ||
-						p.OptionValueType == OptionValueType.Required) {
-					if (p.OptionValueType == OptionValueType.Optional) {
-						Write (o, ref written, localizer ("["));
-					}
-					Write (o, ref written, localizer ("=VALUE"));
-					if (p.MaxValueCount > 1)
-						Write (o, ref written, localizer ("1"));
-					string[] seps = p.ValueSeparators;
-					for (int c = 1; c < p.MaxValueCount; ++c) {
-						Write (o, ref written, localizer (
-									seps != null && seps.Length > 0 ? seps [0] : " "));
-						Write (o, ref written, localizer ("VALUE" + (c+1)));
-					}
-					if (p.OptionValueType == OptionValueType.Optional) {
-						Write (o, ref written, localizer ("]"));
-					}
-				}
-
-				if (written < OptionWidth)
-					o.Write (new string (' ', OptionWidth - written));
-				else {
-					o.WriteLine ();
-					o.Write (new string (' ', OptionWidth));
-				}
-
-				o.WriteLine (localizer (p.Description));
-			}
-		}
-
-		static void Write (TextWriter o, ref int n, string s)
-		{
-			n += s.Length;
-			o.Write (s);
-		}
-	}
-}
-
-#if TEST
-namespace Tests.NDesk.Options {
-
-	using System.Linq;
-
-	class FooConverter : TypeConverter {
-		public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
-		{
-			if (sourceType == typeof (string))
-				return true;
-			return base.CanConvertFrom (context, sourceType);
-		}
-
-		public override object ConvertFrom (ITypeDescriptorContext context,
-				CultureInfo culture, object value)
-		{
-			string v = value as string;
-			if (v != null) {
-				switch (v) {
-					case "A": return Foo.A;
-					case "B": return Foo.B;
-				}
-			}
-
-			return base.ConvertFrom (context, culture, value);
-		}
-	}
-
-	[TypeConverter (typeof(FooConverter))]
-	class Foo {
-		public static readonly Foo A = new Foo ("A");
-		public static readonly Foo B = new Foo ("B");
-		string s;
-		Foo (string s) { this.s = s; }
-		public override string ToString () {return s;}
-	}
-
-	class Test {
-		public static void Main (string[] args)
-		{
-			var tests = new Dictionary<string, Action> () {
-				{ "boolean",      () => CheckBoolean () },
-				{ "bundled-val",  () => CheckBundledValue () },
-				{ "bundling",     () => CheckOptionBundling () },
-				{ "c-key/value",  () => CheckCustomKeyValue () },
-				{ "context",      () => CheckOptionContext () },
-				{ "derived-type", () => CheckDerivedType () },
-				{ "descriptions", () => CheckWriteOptionDescriptions () },
-				{ "exceptions",   () => CheckExceptions () },
-				{ "halt",         () => CheckHaltProcessing () },
-				{ "key/value",    () => CheckKeyValue () },
-				{ "localization", () => CheckLocalization () },
-				{ "many",         () => CheckMany () },
-				{ "optional",     () => CheckOptional () },
-				{ "option-parts", () => CheckOptionParts () },
-				{ "required",     () => CheckRequired () },
-			};
-			bool run  = true;
-			bool help = false;
-			var p = new OptionSet () {
-				{ "t|test=", 
-					"Run the specified test.  Valid tests:\n" + new string (' ', 32) +
-						string.Join ("\n" + new string (' ', 32), tests.Keys.OrderBy (s => s).ToArray ()),
-					v => { run = false; Console.WriteLine (v); tests [v] (); } },
-				{ "h|?|help", "Show this message and exit", (v) => help = v != null },
-			};
-			p.Parse (args);
-			if (help) {
-				Console.WriteLine ("usage: Options.exe [OPTION]+\n");
-				Console.WriteLine ("Options unit test program.");
-				Console.WriteLine ("Valid options include:");
-				p.WriteOptionDescriptions (Console.Out);
-			} else if (run) {
-				foreach (Action a in tests.Values)
-					a ();
-			}
-		}
-
-		static IEnumerable<string> _ (params string[] a)
-		{
-			return a;
-		}
-
-		static void CheckBundledValue ()
-		{
-			var defines = new List<string> ();
-			var libs    = new List<string> ();
-			bool debug  = false;
-			var p = new OptionSet () {
-				{ "D|define=",  v => defines.Add (v) },
-				{ "L|library:", v => libs.Add (v) },
-				{ "Debug",      v => debug = v != null },
-				{ "E",          v => { /* ignore */ } },
-			};
-			p.Parse (_("-DNAME", "-D", "NAME2", "-Debug", "-L/foo", "-L", "/bar", "-EDNAME3"));
-			Assert (defines.Count, 3);
-			Assert (defines [0], "NAME");
-			Assert (defines [1], "NAME2");
-			Assert (defines [2], "NAME3");
-			Assert (debug, true);
-			Assert (libs.Count, 2);
-			Assert (libs [0], "/foo");
-			Assert (libs [1], null);
-
-			AssertException (typeof(OptionException), 
-					"Cannot bundle unregistered option '-V'.",
-					p, v => { v.Parse (_("-EVALUENOTSUP")); });
-		}
-
-		static void CheckRequired ()
-		{
-			string a = null;
-			int n = 0;
-			OptionSet p = new OptionSet () {
-				{ "a=", v => a = v },
-				{ "n=", (int v) => n = v },
-			};
-			List<string> extra = p.Parse (_("a", "-a", "s", "-n=42", "n"));
-			Assert (extra.Count, 2);
-			Assert (extra [0], "a");
-			Assert (extra [1], "n");
-			Assert (a, "s");
-			Assert (n, 42);
-
-			extra = p.Parse (_("-a="));
-			Assert (extra.Count, 0);
-			Assert (a, "");
-		}
-
-		static void CheckOptional ()
-		{
-			string a = null;
-			int n = -1;
-			Foo f = null;
-			OptionSet p = new OptionSet () {
-				{ "a:", v => a = v },
-				{ "n:", (int v) => n = v },
-				{ "f:", (Foo v) => f = v },
-			};
-			p.Parse (_("-a=s"));
-			Assert (a, "s");
-			p.Parse (_("-a"));
-			Assert (a, null);
-			p.Parse (_("-a="));
-			Assert (a, "");
-
-			p.Parse (_("-f", "A"));
-			Assert (f, null);
-			p.Parse (_("-f"));
-			Assert (f, null);
-			p.Parse (_("-f=A"));
-			Assert (f, Foo.A);
-			f = null;
-			p.Parse (_("-fA"));
-			Assert (f, Foo.A);
-
-			p.Parse (_("-n42"));
-			Assert (n, 42);
-			p.Parse (_("-n", "42"));
-			Assert (n, 0);
-			p.Parse (_("-n=42"));
-			Assert (n, 42);
-			p.Parse (_("-n"));
-			Assert (n, 0);
-		}
-
-		static void CheckBoolean ()
-		{
-			bool a = false;
-			OptionSet p = new OptionSet () {
-				{ "a", v => a = v != null },
-			};
-			p.Parse (_("-a"));
-			Assert (a, true);
-			p.Parse (_("-a+"));
-			Assert (a, true);
-			p.Parse (_("-a-"));
-			Assert (a, false);
-		}
-
-		static void CheckMany ()
-		{
-			int a = -1, b = -1;
-			string av = null, bv = null;
-			Foo f = null;
-			int help = 0;
-			int verbose = 0;
-			OptionSet p = new OptionSet () {
-				{ "a=", v => { a = 1; av = v; } },
-				{ "b", "desc", v => {b = 2; bv = v;} },
-				{ "f=", (Foo v) => f = v },
-				{ "v", v => { ++verbose; } },
-				{ "h|?|help", (v) => { switch (v) {
-					case "h": help |= 0x1; break; 
-					case "?": help |= 0x2; break;
-					case "help": help |= 0x4; break;
-				} } },
-			};
-			List<string> e = p.Parse (new string[]{"foo", "-v", "-a=42", "/b-",
-				"-a", "64", "bar", "--f", "B", "/h", "-?", "--help", "-v"});
-
-			Assert (e.Count, 2);
-			Assert (e[0], "foo");
-			Assert (e[1], "bar");
-			Assert (a, 1);
-			Assert (av, "64");
-			Assert (b, 2);
-			Assert (bv, null);
-			Assert (verbose, 2);
-			Assert (help, 0x7);
-			Assert (f, Foo.B);
-		}
-
-		static void Assert<T>(T actual, T expected)
-		{
-			if (!object.Equals (actual, expected))
-				throw new InvalidOperationException (
-					string.Format ("Assertion failed: \"{0}\" != \"{1}\"", 
-						actual == null ? "<null>" : actual.ToString (), 
-						expected == null ? "<null>" : expected.ToString ()));
-		}
-
-		class DefaultOption : Option {
-			public DefaultOption (string prototypes, string description)
-				: base (prototypes, description)
-			{
-			}
-
-			public DefaultOption (string prototypes, string description, int c)
-				: base (prototypes, description, c)
-			{
-			}
-
-			protected override void OnParseComplete (OptionContext c)
-			{
-				throw new NotImplementedException ();
-			}
-		}
-
-		static void CheckExceptions ()
-		{
-			string a = null;
-			var p = new OptionSet () {
-				{ "a=", v => a = v },
-				{ "b",  v => { } },
-				{ "c",  v => { } },
-				{ "n=", (int v) => { } },
-				{ "f=", (Foo v) => { } },
-			};
-			// missing argument
-			AssertException (typeof(OptionException), 
-					"Missing required value for option '-a'.", 
-					p, v => { v.Parse (_("-a")); });
-			// another named option while expecting one -- follow Getopt::Long
-			AssertException (null, null,
-					p, v => { v.Parse (_("-a", "-a")); });
-			Assert (a, "-a");
-			// no exception when an unregistered named option follows.
-			AssertException (null, null, 
-					p, v => { v.Parse (_("-a", "-b")); });
-			Assert (a, "-b");
-			AssertException (typeof(ArgumentNullException),
-					"Argument cannot be null.\nParameter name: option",
-					p, v => { v.Add (null); });
-
-			// bad type
-			AssertException (typeof(OptionException),
-					"Could not convert string `value' to type Int32 for option `-n'.",
-					p, v => { v.Parse (_("-n", "value")); });
-			AssertException (typeof(OptionException),
-					"Could not convert string `invalid' to type Foo for option `--f'.",
-					p, v => { v.Parse (_("--f", "invalid")); });
-
-			// try to bundle with an option requiring a value
-			AssertException (typeof(OptionException), 
-					"Cannot bundle unregistered option '-z'.", 
-					p, v => { v.Parse (_("-cz", "extra")); });
-
-			AssertException (typeof(ArgumentNullException), 
-					"Argument cannot be null.\nParameter name: prototype", 
-					p, v => { new DefaultOption (null, null); });
-			AssertException (typeof(ArgumentException), 
-					"Cannot be the empty string.\nParameter name: prototype",
-					p, v => { new DefaultOption ("", null); });
-			AssertException (typeof(ArgumentException),
-					"Empty option names are not supported.\nParameter name: prototype",
-					p, v => { new DefaultOption ("a|b||c=", null); });
-			AssertException (typeof(ArgumentException),
-					"Conflicting option types: '=' vs. ':'.\nParameter name: prototype",
-					p, v => { new DefaultOption ("a=|b:", null); });
-			AssertException (typeof(ArgumentNullException), 
-					"Argument cannot be null.\nParameter name: action",
-					p, v => { v.Add ("foo", (Action<string>) null); });
-			AssertException (typeof(ArgumentException), 
-					"Cannot provide maxValueCount of 2 for OptionValueType.None.\nParameter name: maxValueCount",
-					p, v => { v.Add ("foo", (k, val) => {/* ignore */}); });
-			AssertException (typeof(ArgumentOutOfRangeException),
-					"Argument is out of range.\nParameter name: maxValueCount",
-					p, v => { new DefaultOption ("a", null, -1); });
-			AssertException (typeof(ArgumentException),
-					"Cannot provide maxValueCount of 0 for OptionValueType.Required or " +
-						"OptionValueType.Optional.\nParameter name: maxValueCount",
-					p, v => { new DefaultOption ("a=", null, 0); });
-			AssertException (typeof(ArgumentException),
-					"Ill-formed name/value separator found in \"a={\".\nParameter name: prototype",
-					p, v => { new DefaultOption ("a={", null); });
-			AssertException (typeof(ArgumentException),
-					"Ill-formed name/value separator found in \"a=}\".\nParameter name: prototype",
-					p, v => { new DefaultOption ("a=}", null); });
-			AssertException (typeof(ArgumentException),
-					"Ill-formed name/value separator found in \"a={{}}\".\nParameter name: prototype",
-					p, v => { new DefaultOption ("a={{}}", null); });
-			AssertException (typeof(ArgumentException),
-					"Ill-formed name/value separator found in \"a={}}\".\nParameter name: prototype",
-					p, v => { new DefaultOption ("a={}}", null); });
-			AssertException (typeof(ArgumentException),
-					"Ill-formed name/value separator found in \"a={}{\".\nParameter name: prototype",
-					p, v => { new DefaultOption ("a={}{", null); });
-			AssertException (typeof(ArgumentException),
-					"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
-					p, v => { new DefaultOption ("a==", null); });
-			AssertException (typeof(ArgumentException),
-					"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
-					p, v => { new DefaultOption ("a={}", null); });
-			AssertException (typeof(ArgumentException),
-					"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
-					p, v => { new DefaultOption ("a=+-*/", null); });
-			AssertException (null, null,
-					p, v => { new DefaultOption ("a", null, 0); });
-			AssertException (null, null,
-					p, v => { new DefaultOption ("a", null, 0); });
-			AssertException (null, null, 
-					p, v => {
-						var d = new DefaultOption ("a", null);
-						Assert (d.GetValueSeparators ().Length, 0);
-					});
-			AssertException (null, null,
-					p, v => {
-						var d = new DefaultOption ("a=", null, 1);
-						string[] s = d.GetValueSeparators ();
-						Assert (s.Length, 0);
-					});
-			AssertException (null, null,
-					p, v => {
-						var d = new DefaultOption ("a=", null, 2);
-						string[] s = d.GetValueSeparators ();
-						Assert (s.Length, 2);
-						Assert (s [0], ":");
-						Assert (s [1], "=");
-					});
-			AssertException (null, null,
-					p, v => {
-						var d = new DefaultOption ("a={}", null, 2);
-						string[] s = d.GetValueSeparators ();
-						Assert (s.Length, 0);
-					});
-			AssertException (null, null,
-					p, v => {
-						var d = new DefaultOption ("a={-->}{=>}", null, 2);
-						string[] s = d.GetValueSeparators ();
-						Assert (s.Length, 2);
-						Assert (s [0], "-->");
-						Assert (s [1], "=>");
-					});
-			AssertException (null, null,
-					p, v => {
-						var d = new DefaultOption ("a=+-*/", null, 2);
-						string[] s = d.GetValueSeparators ();
-						Assert (s.Length, 4);
-						Assert (s [0], "+");
-						Assert (s [1], "-");
-						Assert (s [2], "*");
-						Assert (s [3], "/");
-					});
-
-			OptionContext c = new OptionContext (p);
-			AssertException (typeof(InvalidOperationException),
-					"OptionContext.Option is null.",
-					c, v => { string ignore = v.OptionValues [0]; });
-			c.Option = p [0];
-			AssertException (typeof(ArgumentOutOfRangeException),
-					"Argument is out of range.\nParameter name: index",
-					c, v => { string ignore = v.OptionValues [2]; });
-			c.OptionName = "-a";
-			AssertException (typeof(OptionException),
-					"Missing required value for option '-a'.",
-					c, v => { string ignore = v.OptionValues [0]; });
-		}
-
-		static void AssertException<T> (Type exception, string message, T a, Action<T> action)
-		{
-			Type actualType = null;
-			string stack = null;
-			string actualMessage = null;
-			try {
-				action (a);
-			}
-			catch (Exception e) {
-				actualType    = e.GetType ();
-				actualMessage = e.Message;
-				if (!object.Equals (actualType, exception))
-					stack = e.ToString ();
-			}
-			if (!object.Equals (actualType, exception)) {
-				throw new InvalidOperationException (
-					string.Format ("Assertion failed: Expected Exception Type {0}, got {1}.\n" +
-						"Actual Exception: {2}", exception, actualType, stack));
-			}
-			if (!object.Equals (actualMessage, message))
-				throw new InvalidOperationException (
-					string.Format ("Assertion failed:\n\tExpected: {0}\n\t  Actual: {1}",
-						message, actualMessage));
-		}
-
-		static void CheckWriteOptionDescriptions ()
-		{
-			var p = new OptionSet () {
-				{ "p|indicator-style=", "append / indicator to directories",    v => {} },
-				{ "color:",             "controls color info",                  v => {} },
-				{ "rk=",                "required key/value option",            (k, v) => {} },
-				{ "ok:",                "optional key/value option",            (k, v) => {} },
-				{ "h|?|help",           "show help text",                       v => {} },
-				{ "version",            "output version information and exit",  v => {} },
-			};
-
-			StringWriter expected = new StringWriter ();
-			expected.WriteLine ("  -p, --indicator-style=VALUE");
-			expected.WriteLine ("                             append / indicator to directories");
-			expected.WriteLine ("      --color[=VALUE]        controls color info");
-			expected.WriteLine ("      --rk=VALUE1:VALUE2     required key/value option");
-			expected.WriteLine ("      --ok[=VALUE1:VALUE2]   optional key/value option");
-			expected.WriteLine ("  -h, -?, --help             show help text");
-			expected.WriteLine ("      --version              output version information and exit");
-
-			StringWriter actual = new StringWriter ();
-			p.WriteOptionDescriptions (actual);
-
-			Assert (actual.ToString (), expected.ToString ());
-		}
-
-		static void CheckOptionBundling ()
-		{
-			string a, b, c, f;
-			a = b = c = f = null;
-			var p = new OptionSet () {
-				{ "a", v => a = "a" },
-				{ "b", v => b = "b" },
-				{ "c", v => c = "c" },
-				{ "f=", v => f = v },
-			};
-			List<string> extra = p.Parse (_ ("-abcf", "foo", "bar"));
-			Assert (extra.Count, 1);
-			Assert (extra [0], "bar");
-			Assert (a, "a");
-			Assert (b, "b");
-			Assert (c, "c");
-			Assert (f, "foo");
-		}
-
-		static void CheckHaltProcessing ()
-		{
-			var p = new OptionSet () {
-				{ "a", v => {} },
-				{ "b", v => {} },
-			};
-			List<string> e = p.Parse (_ ("-a", "-b", "--", "-a", "-b"));
-			Assert (e.Count, 2);
-			Assert (e [0], "-a");
-			Assert (e [1], "-b");
-		}
-
-		static void CheckKeyValue ()
-		{
-			var a = new Dictionary<string, string> ();
-			var b = new Dictionary<int, char> ();
-			var p = new OptionSet () {
-				{ "a=", (k,v) => a.Add (k, v) },
-				{ "b=", (int k, char v) => b.Add (k, v) },
-				{ "c:", (k, v) => {if (k != null) a.Add (k, v);} },
-				{ "d={=>}{-->}", (k, v) => a.Add (k, v) },
-				{ "e={}", (k, v) => a.Add (k, v) },
-				{ "f=+/", (k, v) => a.Add (k, v) },
-			};
-			p.Parse (_("-a", "A", "B", "-a", "C", "D", "-a=E=F", "-a:G:H", "-aI=J", "-b", "1", "a", "-b", "2", "b"));
-			AssertDictionary (a, 
-					"A", "B", 
-					"C", "D", 
-					"E", "F", 
-					"G", "H", 
-					"I", "J");
-			AssertDictionary (b,
-					"1", "a",
-					"2", "b");
-
-			a.Clear ();
-			p.Parse (_("-c"));
-			Assert (a.Count, 0);
-			p.Parse (_("-c", "a"));
-			Assert (a.Count, 0);
-			p.Parse (_("-ca"));
-			AssertDictionary (a, "a", null);
-			a.Clear ();
-			p.Parse (_("-ca=b"));
-			AssertDictionary (a, "a", "b");
-
-			a.Clear ();
-			p.Parse (_("-dA=>B", "-d", "C-->D", "-d:E", "F", "-d", "G", "H", "-dJ-->K"));
-			AssertDictionary (a,
-					"A", "B",
-					"C", "D", 
-					"E", "F",
-					"G", "H",
-					"J", "K");
-
-			a.Clear ();
-			p.Parse (_("-eA=B", "-eC=D", "-eE", "F", "-e:G", "H"));
-			AssertDictionary (a,
-					"A=B", "-eC=D",
-					"E", "F", 
-					"G", "H");
-
-			a.Clear ();
-			p.Parse (_("-f1/2", "-f=3/4", "-f:5+6", "-f7", "8", "-f9=10", "-f11=12"));
-			AssertDictionary (a,
-					"1", "2",
-					"3", "4",
-					"5", "6", 
-					"7", "8", 
-					"9=10", "-f11=12");
-		}
-
-		static void AssertDictionary<TKey, TValue> (Dictionary<TKey, TValue> dict, params string[] set)
-		{
-			TypeConverter k = TypeDescriptor.GetConverter (typeof (TKey));
-			TypeConverter v = TypeDescriptor.GetConverter (typeof (TValue));
-
-			Assert (dict.Count, set.Length / 2);
-			for (int i = 0; i < set.Length; i += 2) {
-				TKey key = (TKey) k.ConvertFromString (set [i]);
-				Assert (dict.ContainsKey (key), true);
-				if (set [i+1] == null)
-					Assert (dict [key], default (TValue));
-				else
-					Assert (dict [key], (TValue) v.ConvertFromString (set [i+1]));
-			}
-		}
-
-		class CustomOption : Option {
-			Action<OptionValueCollection> action;
-
-			public CustomOption (string p, string d, int c, Action<OptionValueCollection> a)
-				: base (p, d, c)
-			{
-				this.action = a;
-			}
-
-			protected override void OnParseComplete (OptionContext c)
-			{
-				action (c.OptionValues);
-			}
-		}
-
-		static void CheckCustomKeyValue ()
-		{
-			var a = new Dictionary<string, string> ();
-			var b = new Dictionary<string, string[]> ();
-			var p = new OptionSet () {
-				new CustomOption ("a==:", null, 2, v => a.Add (v [0], v [1])),
-				new CustomOption ("b==:", null, 3, v => b.Add (v [0], new string[]{v [1], v [2]})),
-			};
-			p.Parse (_("-a=b=c", "-a=d", "e", "-a:f=g", "-a:h:i", "-a", "j=k", "-a", "l:m"));
-			Assert (a.Count, 6);
-			Assert (a ["b"], "c");
-			Assert (a ["d"], "e");
-			Assert (a ["f"], "g");
-			Assert (a ["h"], "i");
-			Assert (a ["j"], "k");
-			Assert (a ["l"], "m");
-
-			AssertException (typeof(OptionException),
-					"Missing required value for option '-a'.",
-					p, v => {v.Parse (_("-a=b"));});
-
-			p.Parse (_("-b", "a", "b", "c", "-b:d:e:f", "-b=g=h:i", "-b:j=k:l"));
-			Assert (b.Count, 4);
-			Assert (b ["a"][0], "b");
-			Assert (b ["a"][1], "c");
-			Assert (b ["d"][0], "e");
-			Assert (b ["d"][1], "f");
-			Assert (b ["g"][0], "h");
-			Assert (b ["g"][1], "i");
-			Assert (b ["j"][0], "k");
-			Assert (b ["j"][1], "l");
-		}
-
-		static void CheckLocalization ()
-		{
-			var p = new OptionSet (f => "hello!") {
-				{ "n=", (int v) => { } },
-			};
-			AssertException (typeof(OptionException), "hello!",
-					p, v => { v.Parse (_("-n=value")); });
-
-			StringWriter expected = new StringWriter ();
-			expected.WriteLine ("  -nhello!                   hello!");
-
-			StringWriter actual = new StringWriter ();
-			p.WriteOptionDescriptions (actual);
-
-			Assert (actual.ToString (), expected.ToString ());
-		}
-
-		class CiOptionSet : OptionSet {
-			protected override void InsertItem (int index, Option item)
-			{
-				if (item.Prototype.ToLower () != item.Prototype)
-					throw new ArgumentException ("prototypes must be null!");
-				base.InsertItem (index, item);
-			}
-
-			protected override bool Parse (string option, OptionContext c)
-			{
-				if (c.Option != null)
-					return base.Parse (option, c);
-				string f, n, s, v;
-				if (!GetOptionParts (option, out f, out n, out s, out v)) {
-					return base.Parse (option, c);
-				}
-				return base.Parse (f + n.ToLower () + (v != null && s != null ? s + v : ""), c);
-			}
-
-			public new Option GetOptionForName (string n)
-			{
-				return base.GetOptionForName (n);
-			}
-
-			public void CheckOptionParts (string option, bool er, string ef, string en, string es, string ev)
-			{
-				string f, n, s, v;
-				bool r = GetOptionParts (option, out f, out n, out s, out v);
-				Assert (r, er);
-				Assert (f, ef);
-				Assert (n, en);
-				Assert (s, es);
-				Assert (v, ev);
-			}
-		}
-
-		static void CheckDerivedType ()
-		{
-			bool help = false;
-			var p = new CiOptionSet () {
-				{ "h|help", v => help = v != null },
-			};
-			p.Parse (_("-H"));
-			Assert (help, true);
-			help = false;
-			p.Parse (_("-HELP"));
-			Assert (help, true);
-
-			Assert (p.GetOptionForName ("h"), p [0]);
-			Assert (p.GetOptionForName ("help"), p [0]);
-			Assert (p.GetOptionForName ("invalid"), null);
-
-			AssertException (typeof(ArgumentException), "prototypes must be null!",
-					p, v => { v.Add ("N|NUM=", (int n) => {}); });
-			AssertException (typeof(ArgumentNullException),
-					"Argument cannot be null.\nParameter name: option",
-					p, v => { v.GetOptionForName (null); });
-		}
-
-		static void CheckOptionParts ()
-		{
-			var p = new CiOptionSet ();
-			p.CheckOptionParts ("A",        false,  null, null, null, null);
-			p.CheckOptionParts ("A=B",      false,  null, null, null, null);
-			p.CheckOptionParts ("-A=B",     true,   "-",  "A",  "=",  "B");
-			p.CheckOptionParts ("-A:B",     true,   "-",  "A",  ":",  "B");
-			p.CheckOptionParts ("--A=B",    true,   "--", "A",  "=",  "B");
-			p.CheckOptionParts ("--A:B",    true,   "--", "A",  ":",  "B");
-			p.CheckOptionParts ("/A=B",     true,   "/",  "A",  "=",  "B");
-			p.CheckOptionParts ("/A:B",     true,   "/",  "A",  ":",  "B");
-			p.CheckOptionParts ("-A=B=C",   true,   "-",  "A",  "=",  "B=C");
-			p.CheckOptionParts ("-A:B=C",   true,   "-",  "A",  ":",  "B=C");
-			p.CheckOptionParts ("-A:B:C",   true,   "-",  "A",  ":",  "B:C");
-			p.CheckOptionParts ("--A=B=C",  true,   "--", "A",  "=",  "B=C");
-			p.CheckOptionParts ("--A:B=C",  true,   "--", "A",  ":",  "B=C");
-			p.CheckOptionParts ("--A:B:C",  true,   "--", "A",  ":",  "B:C");
-			p.CheckOptionParts ("/A=B=C",   true,   "/",  "A",  "=",  "B=C");
-			p.CheckOptionParts ("/A:B=C",   true,   "/",  "A",  ":",  "B=C");
-			p.CheckOptionParts ("/A:B:C",   true,   "/",  "A",  ":",  "B:C");
-			p.CheckOptionParts ("-AB=C",    true,   "-",  "AB", "=",  "C");
-			p.CheckOptionParts ("-AB:C",    true,   "-",  "AB", ":",  "C");
-		}
-
-		class ContextCheckerOption : Option {
-			string eName, eValue;
-			int index;
-
-			public ContextCheckerOption (string p, string d, string eName, string eValue, int index)
-				: base (p, d)
-			{
-				this.eName  = eName;
-				this.eValue = eValue;
-				this.index  = index;
-			}
-
-			protected override void OnParseComplete (OptionContext c)
-			{
-				Assert (c.OptionValues.Count, 1);
-				Assert (c.OptionValues [0], eValue);
-				Assert (c.OptionName, eName);
-				Assert (c.OptionIndex, index);
-				Assert (c.Option, this);
-				Assert (c.Option.Description, base.Description);
-			}
-		}
-
-		static void CheckOptionContext ()
-		{
-			var p = new OptionSet () {
-				new ContextCheckerOption ("a=", "a desc", "/a",   "a-val", 1),
-				new ContextCheckerOption ("b",  "b desc", "--b+", "--b+",  2),
-				new ContextCheckerOption ("c=", "c desc", "--c",  "C",     3),
-				new ContextCheckerOption ("d",  "d desc", "/d-",  null,    4),
-			};
-			Assert (p.Count, 4);
-			p.Parse (_("/a", "a-val", "--b+", "--c=C", "/d-"));
-		}
-	}
-}
-#endif
-
diff --git a/src/GCCGenerator/Parameter.cs b/src/GCCGenerator/Parameter.cs
deleted file mode 100644
index 8c616a92..00000000
--- a/src/GCCGenerator/Parameter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Author:
-//   Zoltan Varga <vargaz@gmail.com>
-//
-// Copyright (C) 2011 Novell Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using Mono.Cxxi;
-
-public class Parameter
-{
-	public Parameter (String name, CppType type) {
-		Name = name;
-		Type = type;
-	}
-
-	public string Name {
-		get; set;
-	}
-
-	public CppType Type {
-		get; set;
-	}
-}
diff --git a/src/GCCGenerator/Property.cs b/src/GCCGenerator/Property.cs
deleted file mode 100644
index c05ee7e7..00000000
--- a/src/GCCGenerator/Property.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Property.cs: Represents a C++ property
-//
-// Author:
-//   Zoltan Varga <vargaz@gmail.com>
-//
-// Copyright (C) 2011 Novell Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Cxxi;
-
-public class Property {
-
-	public Property (string name, CppType type) {
-		Name = name;
-		Type = type;
-	}
-
-	public string Name {
-		get; set;
-	}
-
-	public CppType Type {
-		get; set;
-	}
-
-	public Method GetMethod {
-		get; set;
-	}
-
-	public Method SetMethod {
-		get; set;
-	}
-}
diff --git a/src/GCCGenerator/Templates/Base.cs b/src/GCCGenerator/Templates/Base.cs
deleted file mode 100644
index 3da00880..00000000
--- a/src/GCCGenerator/Templates/Base.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.1
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Templates {
-    using System;
-    
-    
-    public partial class Base : BaseBase {
-        
-        public virtual string TransformText() {
-            this.GenerationEnvironment = null;
-            
-            #line 2 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/Base.tt"
- /* This is a dummy template that language-specific templates may inherit from */ 
-            
-            #line default
-            #line hidden
-            return this.GenerationEnvironment.ToString();
-        }
-        
-        protected virtual void Initialize() {
-        }
-    }
-    
-    public class BaseBase {
-        
-        private global::System.Text.StringBuilder builder;
-        
-        private global::System.Collections.Generic.IDictionary<string, object> session;
-        
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errors;
-        
-        private string currentIndent = string.Empty;
-        
-        private global::System.Collections.Generic.Stack<int> indents;
-        
-        private ToStringInstanceHelper _toStringHelper = new ToStringInstanceHelper();
-        
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session {
-            get {
-                return this.session;
-            }
-            set {
-                this.session = value;
-            }
-        }
-        
-        public global::System.Text.StringBuilder GenerationEnvironment {
-            get {
-                if ((this.builder == null)) {
-                    this.builder = new global::System.Text.StringBuilder();
-                }
-                return this.builder;
-            }
-            set {
-                this.builder = value;
-            }
-        }
-        
-        protected global::System.CodeDom.Compiler.CompilerErrorCollection Errors {
-            get {
-                if ((this.errors == null)) {
-                    this.errors = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errors;
-            }
-        }
-        
-        public string CurrentIndent {
-            get {
-                return this.currentIndent;
-            }
-        }
-        
-        private global::System.Collections.Generic.Stack<int> Indents {
-            get {
-                if ((this.indents == null)) {
-                    this.indents = new global::System.Collections.Generic.Stack<int>();
-                }
-                return this.indents;
-            }
-        }
-        
-        public ToStringInstanceHelper ToStringHelper {
-            get {
-                return this._toStringHelper;
-            }
-        }
-        
-        public void Error(string message) {
-            this.Errors.Add(new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message));
-        }
-        
-        public void Warning(string message) {
-            global::System.CodeDom.Compiler.CompilerError val = new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message);
-            val.IsWarning = true;
-            this.Errors.Add(val);
-        }
-        
-        public string PopIndent() {
-            if ((this.Indents.Count == 0)) {
-                return string.Empty;
-            }
-            int lastPos = (this.currentIndent.Length - this.Indents.Pop());
-            string last = this.currentIndent.Substring(lastPos);
-            this.currentIndent = this.currentIndent.Substring(0, lastPos);
-            return last;
-        }
-        
-        public void PushIndent(string indent) {
-            this.Indents.Push(indent.Length);
-            this.currentIndent = (this.currentIndent + indent);
-        }
-        
-        public void ClearIndent() {
-            this.currentIndent = string.Empty;
-            this.Indents.Clear();
-        }
-        
-        public void Write(string textToAppend) {
-            this.GenerationEnvironment.Append(textToAppend);
-        }
-        
-        public void Write(string format, params object[] args) {
-            this.GenerationEnvironment.AppendFormat(format, args);
-        }
-        
-        public void WriteLine(string textToAppend) {
-            this.GenerationEnvironment.Append(this.currentIndent);
-            this.GenerationEnvironment.AppendLine(textToAppend);
-        }
-        
-        public void WriteLine(string format, params object[] args) {
-            this.GenerationEnvironment.Append(this.currentIndent);
-            this.GenerationEnvironment.AppendFormat(format, args);
-            this.GenerationEnvironment.AppendLine();
-        }
-        
-        public class ToStringInstanceHelper {
-            
-            private global::System.IFormatProvider formatProvider = global::System.Globalization.CultureInfo.InvariantCulture;
-            
-            public global::System.IFormatProvider FormatProvider {
-                get {
-                    return this.formatProvider;
-                }
-                set {
-                    if ((this.formatProvider == null)) {
-                        throw new global::System.ArgumentNullException("formatProvider");
-                    }
-                    this.formatProvider = value;
-                }
-            }
-            
-            public string ToStringWithCulture(object objectToConvert) {
-                if ((objectToConvert == null)) {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                global::System.Type type = objectToConvert.GetType();
-                global::System.Type iConvertibleType = typeof(global::System.IConvertible);
-                if (iConvertibleType.IsAssignableFrom(type)) {
-                    return ((global::System.IConvertible)(objectToConvert)).ToString(this.formatProvider);
-                }
-                global::System.Reflection.MethodInfo methInfo = type.GetMethod("ToString", new global::System.Type[] {
-                            iConvertibleType});
-                if ((methInfo != null)) {
-                    return ((string)(methInfo.Invoke(objectToConvert, new object[] {
-                                this.formatProvider})));
-                }
-                return objectToConvert.ToString();
-            }
-        }
-    }
-}
diff --git a/src/GCCGenerator/Templates/Base.tt b/src/GCCGenerator/Templates/Base.tt
deleted file mode 100644
index b6a83ca7..00000000
--- a/src/GCCGenerator/Templates/Base.tt
+++ /dev/null
@@ -1,2 +0,0 @@
-<#@ template language="C#" #>
-<# /* This is a dummy template that language-specific templates may inherit from */ #>
diff --git a/src/GCCGenerator/Templates/BaseMembers.cs b/src/GCCGenerator/Templates/BaseMembers.cs
deleted file mode 100644
index 345ea2a1..00000000
--- a/src/GCCGenerator/Templates/BaseMembers.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Templates {
-
-	public interface ITemplate<T> {
-		Generator Generator { get; set; }
-		T Current { get; set; }
-		bool Nested { get; set; }
-		string TransformText ();
-	}
-
-	public partial class LibsBase : Base, ITemplate<ICollection<Lib>> {
-
-		public Generator Generator { get; set; }
-		public ICollection<Lib> Current { get; set; }
-		public bool Nested { get; set; }
-		public ICollection<Lib> Libs { get { return Current; } set { Current = value; } }
-	}
-
-	public partial class ClassBase : Base, ITemplate<Class> {
-
-		public Generator Generator { get; set; }
-		public Class Current { get; set; }
-		public bool Nested { get; set; }
-		public Class Class { get { return Current; } set { Current = value; } }
-	}
-
-	public partial class EnumBase : Base, ITemplate<Enumeration> {
-
-		public Generator Generator { get; set; }
-		public Enumeration Current { get; set; }
-		public bool Nested { get; set; }
-		public Enumeration Enum { get { return Current; } set { Current = value; } }
-	}
-}
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpClass.cs b/src/GCCGenerator/Templates/CSharp/CSharpClass.cs
deleted file mode 100644
index 0d5a5912..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpClass.cs
+++ /dev/null
@@ -1,1265 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.1
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Templates {
-    using System.IO;
-    using System.Linq;
-    using System.Collections.Generic;
-    using Mono.Cxxi;
-    using System;
-    
-    
-    public partial class CSharpClass : ClassBase {
-        
-        
-        #line 326 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-        
-private void WriteMethodHeader (Method method, string layoutClass, bool isNonPrimaryOverride, bool @protected)
-{
-	var returnType = CSharpLanguage.TypeName (Generator.CppTypeToManaged (method.ReturnType), Context.Wrapper | Context.Return);
-
-	if (!isNonPrimaryOverride && method.IsVirtual)
-		WriteLine ("[OverrideNative (\"{0}\")]", method.Name);
-
-	Write (CurrentIndent + (@protected? "protected" : method.Access.ToString ()) + " ");
-	if (method.IsConstructor) {
-		Write (method.FormattedName);
-	} else {
-		if (method.IsStatic)  Write ("static ");
-		if (method.IsVirtual && (!isNonPrimaryOverride || layoutClass != null)) Write ("virtual ");
-		else if (isNonPrimaryOverride) Write ("override ");
-		// ...?
-		Write (returnType);
-		Write (" ");
-		Write (isNonPrimaryOverride && layoutClass != null? layoutClass : method.FormattedName);
-	}
-
-	Write (" (");
-	WriteParameters (method.Parameters, true, false);
-	Write (")\n");
-
-	if (method.IsConstructor && layoutClass != null)
-		WriteLine (layoutClass);
-	else
-		WriteLine ("{");
-
-	PushIndent ("\t");
-	Write (CurrentIndent);
-
-	if (returnType != "void")
-		Write ("return ");
-}
-
-private void WriteParameters (IList<Parameter> parameters, bool writeType, bool writeAttributes)
-{
-	for (var i = 0; i < parameters.Count; i++) {
-		if (i != 0)
-			Write (", ");
-
-		var type = CSharpLanguage.TypeName (Generator.CppTypeToManaged (parameters [i].Type), Context.Parameter);
-
-		if (writeAttributes) {
-			var mangleAs = parameters [i].Type.ToString ();
-			if (mangleAs != "" && mangleAs != type)
-				Write ("[MangleAs (\"{0}\")] ", mangleAs);
-			if (Generator.IsByVal (parameters [i].Type))
-				Write ("[ByVal] ");
-		}
-
-		if (writeType) {
-			Write (type);
-			Write (" ");
-		} else {
-			if (type.StartsWith ("ref "))
-				Write ("ref ");
-		}
-
-		Write (CSharpLanguage.SafeIdentifier (parameters [i].Name));
-	}
-}
-
-private string GetBaseString ()
-{
-	if (Class.BaseClasses.Count == 0)
-		return "ICppObject";
-
-	var str = Class.BaseClasses [0].Name;
-	if (Class.BaseClasses.Count > 1) {
-		str = string.Format ("{0} /*, {1} */", str, string.Join (", ", Class.BaseClasses.Skip (1).Select (bc => bc.Name).ToArray ()));
-	}
-
-	return str;
-}
-
-
-        #line default
-        #line hidden
-        
-        public override string TransformText() {
-            this.GenerationEnvironment = null;
-            
-            #line 6 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-
-	var hasBase = Class.BaseClasses.Count > 0;
-	var wrapper = Class.Name;
-	var iface   = "I" + Class.Name;
-	var layout  = "_" + Class.Name;
-	var layoutClass = (hasBase? "\t: base (impl.TypeInfo)\n\t\t{" : "{") + "\n\t\t\t__cxxi_LayoutClass ();";
-	var overrideInitBases = Generator.CheckPrimaryBases (Class, c => c.BaseClasses.Count > 1);
-	var initBases = ((overrideInitBases || Class.BaseClasses.Count > 1) ? "\t__cxxi_InitBases ();\n\t\t}" : "}");
-	var @namespace = Generator.Lib.BaseNamespace + (Class.ParentNamespace != null? "." + string.Join (".", Class.ParentNamespace.FullyQualifiedName) : "");
-
-if (!Nested) {
-
-            
-            #line default
-            #line hidden
-            
-            #line 18 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("// -------------------------------------------------------------------------\n//  Managed wrapper for ");
-            
-            #line default
-            #line hidden
-            
-            #line 19 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Class.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 19 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n//  Generated from ");
-            
-            #line default
-            #line hidden
-            
-            #line 20 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Path.GetFileName (Generator.InputFileName) ));
-            
-            #line default
-            #line hidden
-            
-            #line 20 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" on ");
-            
-            #line default
-            #line hidden
-            
-            #line 20 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( DateTime.Now ));
-            
-            #line default
-            #line hidden
-            
-            #line 20 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nusing System;\nusing Mono.Cxxi;\n\nnamespace ");
-            
-            #line default
-            #line hidden
-            
-            #line 28 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( @namespace ));
-            
-            #line default
-            #line hidden
-            
-            #line 28 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" {\n");
-            
-            #line default
-            #line hidden
-            
-            #line 29 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } /* if !Nested */ 
-            
-            #line default
-            #line hidden
-            
-            #line 30 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\tpublic partial class ");
-            
-            #line default
-            #line hidden
-            
-            #line 30 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 30 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" : ");
-            
-            #line default
-            #line hidden
-            
-            #line 30 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( GetBaseString () ));
-            
-            #line default
-            #line hidden
-            
-            #line 30 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" {\n\n\t\tprivate static readonly ");
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( iface ));
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" impl = Libs.");
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Generator.Lib.BaseName ));
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(".GetClass<");
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( iface + "," + layout + "," + wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("> (\"");
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Class.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 32 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\");\n");
-            
-            #line default
-            #line hidden
-            
-            #line 33 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- if (!hasBase) { 
-            
-            #line default
-            #line hidden
-            
-            #line 34 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\tpublic CppInstancePtr Native { get; protected set; }\n");
-            
-            #line default
-            #line hidden
-            
-            #line 35 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 36 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            
-            #line 37 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Interface */ 
-            
-            #line default
-            #line hidden
-            
-            #line 38 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t[MangleAs (\"");
-            
-            #line default
-            #line hidden
-            
-            #line 38 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Class.MangleType.ToString () ));
-            
-            #line default
-            #line hidden
-            
-            #line 38 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\")]\n\t\tpublic partial interface ");
-            
-            #line default
-            #line hidden
-            
-            #line 39 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( iface ));
-            
-            #line default
-            #line hidden
-            
-            #line 39 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" : ICppClassOverridable<");
-            
-            #line default
-            #line hidden
-            
-            #line 39 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 39 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("> {\n");
-            
-            #line default
-            #line hidden
-            
-            #line 40 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t\t");
-	foreach (var method in Class.Methods) {
-		Write (CurrentIndent);
-
-		if (method.IsVirtual)     Write ("[Virtual] ");
-		if (method.IsStatic)      Write ("[Static] ");
-		if (method.IsArtificial)  Write ("[Artificial] ");
-		if (method.IsInline)      Write ("[Inline] ");
-		if (method.IsConst)       Write ("[Const] ");
-		if (method.IsConstructor) Write ("[Constructor] ");
-		if (method.IsDestructor)  Write ("[Destructor] ");
-		if (method.IsCopyCtor)    Write ("[CopyConstructor] ");
-
-		if (Generator.IsByVal (method.ReturnType)) {
-			Write ("[return: ByVal] ");
-		}
-		if (method.IsConstructor)
-			Write ("CppInstancePtr");
-		else
-			Write (CSharpLanguage.TypeName (Generator.CppTypeToManaged (method.ReturnType), Context.Interface | Context.Return));
-		Write (" ");
-		Write (CSharpLanguage.SafeIdentifier (method.Name));
-
-		Write (" (");
-		if (!method.IsStatic) {
-			Write ("CppInstancePtr @this");
-			if (method.Parameters.Count != 0)
-				Write (", ");
-		}
-
-		WriteParameters (method.Parameters, true, !method.IsVirtual);
-		Write (");\n");
-	}
-	foreach (var field in Class.Fields.Where (f => f.Access != Access.@private)) {
-		WriteLine ("CppField<{0}> {1} {{ get; }}", CSharpLanguage.TypeName (Generator.CppTypeToManaged (field.Type), Context.Interface | Context.Generic), CSharpLanguage.SafeIdentifier (field.Name));
-	}
-	PopIndent (); 
-            
-            #line default
-            #line hidden
-            
-            #line 77 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 78 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Native layout */ 
-            
-            #line default
-            #line hidden
-            
-            #line 79 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\tpublic unsafe struct ");
-            
-            #line default
-            #line hidden
-            
-            #line 79 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( layout ));
-            
-            #line default
-            #line hidden
-            
-            #line 79 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" {\n");
-            
-            #line default
-            #line hidden
-            
-            #line 80 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t\t");
-			foreach (var field in Class.Fields) {
-				// handle byval fields
-				var fieldType = CSharpLanguage.TypeName (Generator.CppTypeToManaged (field.Type), Context.Generic);
-				if (Generator.GetFilterOrDefault (field.Type).ImplType == ImplementationType.@class && Generator.IsByVal (field.Type))
-					fieldType = fieldType + "._" + fieldType;
-
-				// handle fixed-length arrays
-				var array = field.Type.Modifiers.OfType<CppModifiers.ArrayModifier> ().SingleOrDefault (); //FIXME: Handle more than one?
-				if (array != null && array.Size.HasValue) {
-					fieldType = fieldType.TrimEnd ('[',']');
-					WriteLine ("public fixed {0} {1} [{2}];", fieldType, CSharpLanguage.SafeIdentifier (field.Name), array.Size.Value);
-				} else {
-					WriteLine ("public {0} {1};", fieldType, CSharpLanguage.SafeIdentifier (field.Name));
-				}
-			}
- PopIndent (); 
-            
-            #line default
-            #line hidden
-            
-            #line 97 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t}\n\n");
-            
-            #line default
-            #line hidden
-            
-            #line 99 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Native fields */ 
-            
-            #line default
-            #line hidden
-            
-            #line 100 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t");
-	foreach (var field in Class.Fields.Where (f => f.Access != Access.@private)) {
-		var fieldName = CSharpLanguage.SafeIdentifier (field.Name);
-		WriteLine ("{0} {1} {2} {{", field.Access, CSharpLanguage.TypeName (Generator.CppTypeToManaged (field.Type), Context.Wrapper | Context.Return), fieldName); 
-            
-            #line default
-            #line hidden
-            
-            #line 104 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t\tget {\n\t\t\t\treturn impl.");
-            
-            #line default
-            #line hidden
-            
-            #line 105 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( fieldName ));
-            
-            #line default
-            #line hidden
-            
-            #line 105 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" [Native];\n\t\t\t}\n\t\t\tset {\n\t\t\t\timpl.");
-            
-            #line default
-            #line hidden
-            
-            #line 108 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( fieldName ));
-            
-            #line default
-            #line hidden
-            
-            #line 108 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" [Native] = value;\n\t\t\t}\n\t\t}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 111 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } PopIndent(); 
-            
-            #line default
-            #line hidden
-            
-            #line 112 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            
-            #line 113 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Nested classes */ 
-            
-            #line default
-            #line hidden
-            
-            #line 114 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- foreach (var klass in Class.NestedClasses) {
-	var nestedTempl = new CSharpClass {
-		Generator = this.Generator,
-		Class = klass,
-		Nested = true
-	};
-	Write (nestedTempl.TransformText ());
-} 
-            
-            #line default
-            #line hidden
-            
-            #line 122 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            
-            #line 123 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Nested enums */ 
-            
-            #line default
-            #line hidden
-            
-            #line 124 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- foreach (var @enum in Class.NestedEnums) {
-	Generator.EnumTemplate.Generator = Generator;
-	Generator.EnumTemplate.Enum = @enum;
-	Generator.EnumTemplate.Nested = true;
-	Write (Generator.EnumTemplate.TransformText ());
-} 
-            
-            #line default
-            #line hidden
-            
-            #line 130 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            
-            #line 131 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Subclass constructor */ 
-            
-            #line default
-            #line hidden
-            
-            #line 132 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\tpublic ");
-            
-            #line default
-            #line hidden
-            
-            #line 132 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 132 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" (CppTypeInfo subClass)\n\t\t");
-            
-            #line default
-            #line hidden
-            
-            #line 133 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( layoutClass ));
-            
-            #line default
-            #line hidden
-            
-            #line 133 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n\t\t\tsubClass.AddBase (impl.TypeInfo);\n\t\t}\n\n");
-            
-            #line default
-            #line hidden
-            
-            #line 137 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Native constructor */ 
-            
-            #line default
-            #line hidden
-            
-            #line 138 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\tpublic ");
-            
-            #line default
-            #line hidden
-            
-            #line 138 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 138 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" (CppInstancePtr native)\n\t\t");
-            
-            #line default
-            #line hidden
-            
-            #line 139 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( layoutClass ));
-            
-            #line default
-            #line hidden
-            
-            #line 139 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n\t\t\tNative = native;\n\t\t");
-            
-            #line default
-            #line hidden
-            
-            #line 141 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( initBases ));
-            
-            #line default
-            #line hidden
-            
-            #line 141 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n\n");
-            
-            #line default
-            #line hidden
-            
-            #line 143 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Wrapper methods */ 
-            
-            #line default
-            #line hidden
-            
-            #line 144 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t");
-		foreach (var method in Class.Methods.Where (m => m.GenWrapperMethod)) {
-			var methodName = CSharpLanguage.SafeIdentifier (method.Name);
-			WriteMethodHeader (method, layoutClass, false, false);
-
-			if (method.IsConstructor)
-				Write ("Native = ");
-
-			Write ("impl.{0} (", methodName);
-			if (!method.IsStatic) {
-				if (method.IsConstructor)
-					Write ("impl.Alloc (this)");
-				else
-					Write ("Native");
-				if (method.Parameters.Count != 0)
-					Write (", ");
-			}
-
-			WriteParameters (method.Parameters, false, false);
-			Write (");\n");
-			PopIndent ();
-
-			if (method.IsConstructor)
-				WriteLine (initBases);
-			else
-				WriteLine ("}");
-	}
-	PopIndent (); 
-            
-            #line default
-            #line hidden
-            
-            #line 172 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            
-            #line 173 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Wrapper properties */ 
-            
-            #line default
-            #line hidden
-            
-            #line 174 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t");
-		foreach (var prop in Class.Properties) {
-			var propName = CSharpLanguage.SafeIdentifier (prop.Name);
-			var type = CSharpLanguage.TypeName (Generator.CppTypeToManaged (prop.Type), Context.Wrapper | Context.Return);
-
-			Write (CurrentIndent + "public ");
-
-			if ((prop.GetMethod == null || prop.GetMethod.IsVirtual) &&
-			    (prop.SetMethod == null || prop.SetMethod.IsVirtual))
-				Write ("virtual ");
-
-			Write (type);
-			Write (" ");
-			Write (propName);
-			Write (" {\n");
-
-			PushIndent ("\t");
-			Write (CurrentIndent);
-
-			if (prop.GetMethod != null) {
-				if (prop.GetMethod.IsVirtual)
-					Write ("[OverrideNative (\"{0}\")] ", prop.GetMethod.Name);
-
-				Write ("get {\n");
-				PushIndent ("\t");
-				WriteLine ("return impl.{0} (Native);", prop.GetMethod.Name);
-				PopIndent ();
-				WriteLine ("}");
-			}
-			if (prop.SetMethod != null) {
-				if (prop.SetMethod.IsVirtual)
-					Write ("[OverrideNative (\"{0}\")] ", prop.SetMethod.Name);
-
-				WriteLine ("set {");
-				PushIndent ("\t");
-				WriteLine ("impl.{0} (Native, value);", prop.SetMethod.Name);
-				PopIndent ();
-				WriteLine ("}");
-			}
-
-			PopIndent ();
-			WriteLine ("}\n");
-		}
-		PopIndent (); 
-            
-            #line default
-            #line hidden
-            
-            #line 218 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n\t\tpartial void BeforeDestruct ();\n\t\tpartial void AfterDestruct ();\n\n\t\tpublic ");
-            
-            #line default
-            #line hidden
-            
-            #line 222 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( hasBase? "override" : "virtual" ));
-            
-            #line default
-            #line hidden
-            
-            #line 222 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" void Dispose ()\n\t\t{\n\t\t\tBeforeDestruct ();\n");
-            
-            #line default
-            #line hidden
-            
-            #line 225 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- if (Class.Methods.Any (m => m.IsDestructor && !m.IsArtificial)) { 
-            
-            #line default
-            #line hidden
-            
-            #line 226 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t\timpl.Destruct (Native);\n");
-            
-            #line default
-            #line hidden
-            
-            #line 227 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 228 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t\tNative.Dispose ();\n\t\t\tAfterDestruct ();\n\t\t}\n\n\t\tprivate void __cxxi_LayoutClass ()\n\t\t{\n");
-            
-            #line default
-            #line hidden
-            
-            #line 234 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- foreach (var npBase in Class.BaseClasses.Skip (1)) { 
-            
-            #line default
-            #line hidden
-            
-            #line 235 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t\tnew ");
-            
-            #line default
-            #line hidden
-            
-            #line 235 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 235 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" (impl.TypeInfo);\n");
-            
-            #line default
-            #line hidden
-            
-            #line 236 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 237 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t\timpl.TypeInfo.CompleteType ();\n\t\t}\n\n");
-            
-            #line default
-            #line hidden
-            
-            #line 240 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Make this wrapper castable to non-primary bases */
-foreach (var npBase in Class.BaseClasses.Skip (1)) { 
-            
-            #line default
-            #line hidden
-            
-            #line 242 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n#region Non-primary base class implementation for ");
-            
-            #line default
-            #line hidden
-            
-            #line 243 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 243 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n\t\tprivate class ");
-            
-            #line default
-            #line hidden
-            
-            #line 244 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper + "__" + npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 244 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" : ");
-            
-            #line default
-            #line hidden
-            
-            #line 244 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 244 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" {\n\t\t\tpublic ");
-            
-            #line default
-            #line hidden
-            
-            #line 245 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 245 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" instance;\n\t\t\tpublic ");
-            
-            #line default
-            #line hidden
-            
-            #line 246 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper + "__" + npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 246 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" (");
-            
-            #line default
-            #line hidden
-            
-            #line 246 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 246 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" instance)\n\t\t\t\t: base (");
-            
-            #line default
-            #line hidden
-            
-            #line 247 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 247 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(".impl.TypeInfo.Cast (instance, typeof (");
-            
-            #line default
-            #line hidden
-            
-            #line 247 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 247 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(")))\n\t\t\t{\n\t\t\t\t");
-            
-            #line default
-            #line hidden
-            
-            #line 249 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 249 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(".impl.TypeInfo.InitNonPrimaryBase (this, instance, typeof (");
-            
-            #line default
-            #line hidden
-            
-            #line 249 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 249 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("));\n\t\t\t\tthis.instance = instance;\n\t\t\t}\n\n");
-            
-            #line default
-            #line hidden
-            
-            #line 253 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t\t");
-		foreach (var method in npBase.Methods.Where (m => m.IsVirtual)) {
-
-			if (!method.GenWrapperMethod || Class.Methods.Any (m => m.Node.CheckValue ("overrides", method.Node.Id)))
-				continue;
-
-			/* this is the managed override that has to call the subclass's method */
-			WriteMethodHeader (method, null, true, false);
-
-			Write ("instance.{0} (", npBase.Name + "__" + method.FormattedName);
-
-			WriteParameters (method.Parameters, false, false);
-			PopIndent ();
-			Write (");\n{0}}}\n\n", CurrentIndent);
-
-			/* this is the method that calls the base implementation that the subclass will use */
-			WriteMethodHeader (method, npBase.Name + "__" + method.FormattedName, true, false);
-
-			Write ("base.{0} (", method.FormattedName);
-
-			WriteParameters (method.Parameters, false, false);
-			PopIndent ();
-			Write (");\n{0}}}\n\n", CurrentIndent);
-		}
-		PopIndent (); 
-            
-            #line default
-            #line hidden
-            
-            #line 278 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t}\n\t\tprivate ");
-            
-            #line default
-            #line hidden
-            
-            #line 279 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 279 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("__");
-            
-            #line default
-            #line hidden
-            
-            #line 279 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 279 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" __cxxi_");
-            
-            #line default
-            #line hidden
-            
-            #line 279 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 279 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(";\n\t\tpublic ");
-            
-            #line default
-            #line hidden
-            
-            #line 280 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 280 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" ");
-            
-            #line default
-            #line hidden
-            
-            #line 280 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 280 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" { get { return __cxxi_");
-            
-            #line default
-            #line hidden
-            
-            #line 280 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 280 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("; } }\n\t\tpublic static implicit operator ");
-            
-            #line default
-            #line hidden
-            
-            #line 281 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 281 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("(");
-            
-            #line default
-            #line hidden
-            
-            #line 281 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 281 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" subClass)\n\t\t{\n\t\t\treturn subClass.");
-            
-            #line default
-            #line hidden
-            
-            #line 283 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 283 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(";\n\t\t}\n\t\tpublic static explicit operator ");
-            
-            #line default
-            #line hidden
-            
-            #line 285 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper ));
-            
-            #line default
-            #line hidden
-            
-            #line 285 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("(");
-            
-            #line default
-            #line hidden
-            
-            #line 285 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 285 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" baseClass)\n\t\t{\n\t\t\tif (baseClass == null) return null;\n\t\t\tvar obj = baseClass as ");
-            
-            #line default
-            #line hidden
-            
-            #line 288 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper + "__" + npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 288 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(";\n\t\t\tif (obj == null) throw new InvalidCastException ();\n\t\t\treturn obj.instance;\n\t\t}\n\n");
-            
-            #line default
-            #line hidden
-            
-            #line 293 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- /* Add virtual methods of non-primary bases to this class proper so they can be overridden */ 
-            
-            #line default
-            #line hidden
-            
-            #line 294 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- PushIndent ("\t\t");
-		foreach (var method in npBase.Methods.Where (m => m.IsVirtual)) {
-
-			if (!method.GenWrapperMethod || Class.Methods.Any (m => m.Node.CheckValue ("overrides", method.Node.Id)))
-				continue;
-
-			WriteMethodHeader (method, npBase.Name + "__" + method.FormattedName, true, true);
-
-			Write ("{0}.{1} (", "__cxxi_" + npBase.Name, npBase.Name + "__" + method.FormattedName);
-
-			WriteParameters (method.Parameters, false, false);
-			PopIndent ();
-			Write (");\n{0}}}\n\n", CurrentIndent);
-		}
-		PopIndent ();
-WriteLine ("#endregion");
-}
-
-if (overrideInitBases || Class.BaseClasses.Count > 1) { 
-            
-            #line default
-            #line hidden
-            
-            #line 313 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\tprotected ");
-            
-            #line default
-            #line hidden
-            
-            #line 313 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( overrideInitBases  ? "override" : "virtual" ));
-            
-            #line default
-            #line hidden
-            
-            #line 313 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" void __cxxi_InitBases ()\n\t\t{\n\t\t\t");
-            
-            #line default
-            #line hidden
-            
-            #line 315 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( overrideInitBases? "base.__cxxi_InitBases ();" : "" ));
-            
-            #line default
-            #line hidden
-            
-            #line 315 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            
-            #line 316 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- 		foreach (var npBase in Class.BaseClasses.Skip (1)) { 
-            
-            #line default
-            #line hidden
-            
-            #line 317 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t\t__cxxi_");
-            
-            #line default
-            #line hidden
-            
-            #line 317 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 317 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" = new ");
-            
-            #line default
-            #line hidden
-            
-            #line 317 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( wrapper + "__" + npBase.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 317 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write(" (this);\n");
-            
-            #line default
-            #line hidden
-            
-            #line 318 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- 		} 
-            
-            #line default
-            #line hidden
-            
-            #line 319 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t\t}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 320 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 321 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\t}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 322 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- if (!Nested) { 
-            
-            #line default
-            #line hidden
-            
-            #line 323 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 324 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 325 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpClass.tt"
-            this.Write("\n");
-            
-            #line default
-            #line hidden
-            return this.GenerationEnvironment.ToString();
-        }
-        
-        protected override void Initialize() {
-            base.Initialize();
-        }
-    }
-}
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpClass.tt b/src/GCCGenerator/Templates/CSharp/CSharpClass.tt
deleted file mode 100644
index c06eb32e..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpClass.tt
+++ /dev/null
@@ -1,404 +0,0 @@
-<#@ template language="C#" inherits="ClassBase" #>
-<#@ import namespace="System.IO" #>
-<#@ import namespace="System.Linq" #>
-<#@ import namespace="System.Collections.Generic" #>
-<#@ import namespace="Mono.Cxxi" #>
-<#
-	var hasBase = Class.BaseClasses.Count > 0;
-	var wrapper = Class.Name;
-	var iface   = "I" + Class.Name;
-	var layout  = "_" + Class.Name;
-	var layoutClass = (hasBase? "\t: base (impl.TypeInfo)\n\t\t{" : "{") + "\n\t\t\t__cxxi_LayoutClass ();";
-	var overrideInitBases = Generator.CheckPrimaryBases (Class, c => c.BaseClasses.Count > 1);
-	var initBases = ((overrideInitBases || Class.BaseClasses.Count > 1) ? "\t__cxxi_InitBases ();\n\t\t}" : "}");
-	var @namespace = Generator.Lib.BaseNamespace + (Class.ParentNamespace != null? "." + string.Join (".", Class.ParentNamespace.FullyQualifiedName) : "");
-
-if (!Nested) {
-#>
-// -------------------------------------------------------------------------
-//  Managed wrapper for <#= Class.Name #>
-//  Generated from <#= Path.GetFileName (Generator.InputFileName) #> on <#= DateTime.Now #>
-//
-//  This file was auto generated. Do not edit.
-// -------------------------------------------------------------------------
-
-using System;
-using Mono.Cxxi;
-
-namespace <#= @namespace #> {
-<# } /* if !Nested */ #>
-	public partial class <#= wrapper #> : <#= GetBaseString () #> {
-
-		private static readonly <#= iface #> impl = Libs.<#= Generator.Lib.BaseName #>.GetClass<<#= iface + "," + layout + "," + wrapper #>> ("<#= Class.Name #>");
-<# if (!hasBase) { #>
-		public CppInstancePtr Native { get; protected set; }
-<# } #>
-
-<# /* Interface */ #>
-		[MangleAs ("<#= Class.MangleType.ToString () #>")]
-		public partial interface <#= iface #> : ICppClassOverridable<<#= wrapper #>> {
-<# PushIndent ("\t\t\t");
-	foreach (var method in Class.Methods) {
-		Write (CurrentIndent);
-
-		if (method.IsVirtual)     Write ("[Virtual] ");
-		if (method.IsStatic)      Write ("[Static] ");
-		if (method.IsArtificial)  Write ("[Artificial] ");
-		if (method.IsInline)      Write ("[Inline] ");
-		if (method.IsConst)       Write ("[Const] ");
-		if (method.IsConstructor) Write ("[Constructor] ");
-		if (method.IsDestructor)  Write ("[Destructor] ");
-		if (method.IsCopyCtor)    Write ("[CopyConstructor] ");
-
-		if (Generator.IsByVal (method.ReturnType)) {
-			Write ("[return: ByVal] ");
-		}
-		if (method.IsConstructor)
-			Write ("CppInstancePtr");
-		else
-			Write (CSharpLanguage.TypeName (Generator.CppTypeToManaged (method.ReturnType), Context.Interface | Context.Return));
-		Write (" ");
-		Write (CSharpLanguage.SafeIdentifier (method.Name));
-
-		Write (" (");
-		if (!method.IsStatic) {
-			Write ("CppInstancePtr @this");
-			if (method.Parameters.Count != 0)
-				Write (", ");
-		}
-
-		WriteParameters (method.Parameters, true, !method.IsVirtual);
-		Write (");\n");
-	}
-	foreach (var field in Class.Fields.Where (f => f.Access != Access.@private)) {
-		WriteLine ("CppField<{0}> {1} {{ get; }}", CSharpLanguage.TypeName (Generator.CppTypeToManaged (field.Type), Context.Interface | Context.Generic), CSharpLanguage.SafeIdentifier (field.Name));
-	}
-	PopIndent (); #>
-		}
-<# /* Native layout */ #>
-		public unsafe struct <#= layout #> {
-<# PushIndent ("\t\t\t");
-			foreach (var field in Class.Fields) {
-				// handle byval fields
-				var fieldType = CSharpLanguage.TypeName (Generator.CppTypeToManaged (field.Type), Context.Generic);
-				if (Generator.GetFilterOrDefault (field.Type).ImplType == ImplementationType.@class && Generator.IsByVal (field.Type))
-					fieldType = fieldType + "._" + fieldType;
-
-				// handle fixed-length arrays
-				var array = field.Type.Modifiers.OfType<CppModifiers.ArrayModifier> ().SingleOrDefault (); //FIXME: Handle more than one?
-				if (array != null && array.Size.HasValue) {
-					fieldType = fieldType.TrimEnd ('[',']');
-					WriteLine ("public fixed {0} {1} [{2}];", fieldType, CSharpLanguage.SafeIdentifier (field.Name), array.Size.Value);
-				} else {
-					WriteLine ("public {0} {1};", fieldType, CSharpLanguage.SafeIdentifier (field.Name));
-				}
-			}
- PopIndent (); #>
-		}
-
-<# /* Native fields */ #>
-<# PushIndent ("\t\t");
-	foreach (var field in Class.Fields.Where (f => f.Access != Access.@private)) {
-		var fieldName = CSharpLanguage.SafeIdentifier (field.Name);
-		WriteLine ("{0} {1} {2} {{", field.Access, CSharpLanguage.TypeName (Generator.CppTypeToManaged (field.Type), Context.Wrapper | Context.Return), fieldName); #>
-			get {
-				return impl.<#= fieldName #> [Native];
-			}
-			set {
-				impl.<#= fieldName #> [Native] = value;
-			}
-		}
-<# } PopIndent(); #>
-
-<# /* Nested classes */ #>
-<# foreach (var klass in Class.NestedClasses) {
-	var nestedTempl = new CSharpClass {
-		Generator = this.Generator,
-		Class = klass,
-		Nested = true
-	};
-	Write (nestedTempl.TransformText ());
-} #>
-
-<# /* Nested enums */ #>
-<# foreach (var @enum in Class.NestedEnums) {
-	Generator.EnumTemplate.Generator = Generator;
-	Generator.EnumTemplate.Enum = @enum;
-	Generator.EnumTemplate.Nested = true;
-	Write (Generator.EnumTemplate.TransformText ());
-} #>
-
-<# /* Subclass constructor */ #>
-		public <#= wrapper #> (CppTypeInfo subClass)
-		<#= layoutClass #>
-			subClass.AddBase (impl.TypeInfo);
-		}
-
-<# /* Native constructor */ #>
-		public <#= wrapper #> (CppInstancePtr native)
-		<#= layoutClass #>
-			Native = native;
-		<#= initBases #>
-
-<# /* Wrapper methods */ #>
-<# PushIndent ("\t\t");
-		foreach (var method in Class.Methods.Where (m => m.GenWrapperMethod)) {
-			var methodName = CSharpLanguage.SafeIdentifier (method.Name);
-			WriteMethodHeader (method, layoutClass, false, false);
-
-			if (method.IsConstructor)
-				Write ("Native = ");
-
-			Write ("impl.{0} (", methodName);
-			if (!method.IsStatic) {
-				if (method.IsConstructor)
-					Write ("impl.Alloc (this)");
-				else
-					Write ("Native");
-				if (method.Parameters.Count != 0)
-					Write (", ");
-			}
-
-			WriteParameters (method.Parameters, false, false);
-			Write (");\n");
-			PopIndent ();
-
-			if (method.IsConstructor)
-				WriteLine (initBases);
-			else
-				WriteLine ("}");
-	}
-	PopIndent (); #>
-
-<# /* Wrapper properties */ #>
-<# PushIndent ("\t\t");
-		foreach (var prop in Class.Properties) {
-			var propName = CSharpLanguage.SafeIdentifier (prop.Name);
-			var type = CSharpLanguage.TypeName (Generator.CppTypeToManaged (prop.Type), Context.Wrapper | Context.Return);
-
-			Write (CurrentIndent + "public ");
-
-			if ((prop.GetMethod == null || prop.GetMethod.IsVirtual) &&
-			    (prop.SetMethod == null || prop.SetMethod.IsVirtual))
-				Write ("virtual ");
-
-			Write (type);
-			Write (" ");
-			Write (propName);
-			Write (" {\n");
-
-			PushIndent ("\t");
-			Write (CurrentIndent);
-
-			if (prop.GetMethod != null) {
-				if (prop.GetMethod.IsVirtual)
-					Write ("[OverrideNative (\"{0}\")] ", prop.GetMethod.Name);
-
-				Write ("get {\n");
-				PushIndent ("\t");
-				WriteLine ("return impl.{0} (Native);", prop.GetMethod.Name);
-				PopIndent ();
-				WriteLine ("}");
-			}
-			if (prop.SetMethod != null) {
-				if (prop.SetMethod.IsVirtual)
-					Write ("[OverrideNative (\"{0}\")] ", prop.SetMethod.Name);
-
-				WriteLine ("set {");
-				PushIndent ("\t");
-				WriteLine ("impl.{0} (Native, value);", prop.SetMethod.Name);
-				PopIndent ();
-				WriteLine ("}");
-			}
-
-			PopIndent ();
-			WriteLine ("}\n");
-		}
-		PopIndent (); #>
-
-		partial void BeforeDestruct ();
-		partial void AfterDestruct ();
-
-		public <#= hasBase? "override" : "virtual" #> void Dispose ()
-		{
-			BeforeDestruct ();
-<# if (Class.Methods.Any (m => m.IsDestructor && !m.IsArtificial)) { #>
-			impl.Destruct (Native);
-<# } #>
-			Native.Dispose ();
-			AfterDestruct ();
-		}
-
-		private void __cxxi_LayoutClass ()
-		{
-<# foreach (var npBase in Class.BaseClasses.Skip (1)) { #>
-			new <#= npBase.Name #> (impl.TypeInfo);
-<# } #>
-			impl.TypeInfo.CompleteType ();
-		}
-
-<# /* Make this wrapper castable to non-primary bases */
-foreach (var npBase in Class.BaseClasses.Skip (1)) { #>
-
-#region Non-primary base class implementation for <#= npBase.Name #>
-		private class <#= wrapper + "__" + npBase.Name #> : <#= npBase.Name #> {
-			public <#= wrapper #> instance;
-			public <#= wrapper + "__" + npBase.Name #> (<#= wrapper #> instance)
-				: base (<#= wrapper #>.impl.TypeInfo.Cast (instance, typeof (<#= npBase.Name #>)))
-			{
-				<#= wrapper #>.impl.TypeInfo.InitNonPrimaryBase (this, instance, typeof (<#= npBase.Name #>));
-				this.instance = instance;
-			}
-
-<# PushIndent ("\t\t\t");
-		foreach (var method in npBase.Methods.Where (m => m.IsVirtual)) {
-
-			if (!method.GenWrapperMethod || Class.Methods.Any (m => m.Node.CheckValue ("overrides", method.Node.Id)))
-				continue;
-
-			/* this is the managed override that has to call the subclass's method */
-			WriteMethodHeader (method, null, true, false);
-
-			Write ("instance.{0} (", npBase.Name + "__" + method.FormattedName);
-
-			WriteParameters (method.Parameters, false, false);
-			PopIndent ();
-			Write (");\n{0}}}\n\n", CurrentIndent);
-
-			/* this is the method that calls the base implementation that the subclass will use */
-			WriteMethodHeader (method, npBase.Name + "__" + method.FormattedName, true, false);
-
-			Write ("base.{0} (", method.FormattedName);
-
-			WriteParameters (method.Parameters, false, false);
-			PopIndent ();
-			Write (");\n{0}}}\n\n", CurrentIndent);
-		}
-		PopIndent (); #>
-		}
-		private <#= wrapper #>__<#= npBase.Name #> __cxxi_<#= npBase.Name #>;
-		public <#= npBase.Name #> <#= npBase.Name #> { get { return __cxxi_<#= npBase.Name #>; } }
-		public static implicit operator <#= npBase.Name #>(<#= wrapper #> subClass)
-		{
-			return subClass.<#= npBase.Name #>;
-		}
-		public static explicit operator <#= wrapper #>(<#= npBase.Name #> baseClass)
-		{
-			if (baseClass == null) return null;
-			var obj = baseClass as <#= wrapper + "__" + npBase.Name #>;
-			if (obj == null) throw new InvalidCastException ();
-			return obj.instance;
-		}
-
-<# /* Add virtual methods of non-primary bases to this class proper so they can be overridden */ #>
-<# PushIndent ("\t\t");
-		foreach (var method in npBase.Methods.Where (m => m.IsVirtual)) {
-
-			if (!method.GenWrapperMethod || Class.Methods.Any (m => m.Node.CheckValue ("overrides", method.Node.Id)))
-				continue;
-
-			WriteMethodHeader (method, npBase.Name + "__" + method.FormattedName, true, true);
-
-			Write ("{0}.{1} (", "__cxxi_" + npBase.Name, npBase.Name + "__" + method.FormattedName);
-
-			WriteParameters (method.Parameters, false, false);
-			PopIndent ();
-			Write (");\n{0}}}\n\n", CurrentIndent);
-		}
-		PopIndent ();
-WriteLine ("#endregion");
-}
-
-if (overrideInitBases || Class.BaseClasses.Count > 1) { #>
-		protected <#= overrideInitBases  ? "override" : "virtual" #> void __cxxi_InitBases ()
-		{
-			<#= overrideInitBases? "base.__cxxi_InitBases ();" : "" #>
-<# 		foreach (var npBase in Class.BaseClasses.Skip (1)) { #>
-			__cxxi_<#= npBase.Name #> = new <#= wrapper + "__" + npBase.Name #> (this);
-<# 		} #>
-		}
-<# } #>
-	}
-<# if (!Nested) { #>
-}
-<# } #>
-
-<#+
-private void WriteMethodHeader (Method method, string layoutClass, bool isNonPrimaryOverride, bool @protected)
-{
-	var returnType = CSharpLanguage.TypeName (Generator.CppTypeToManaged (method.ReturnType), Context.Wrapper | Context.Return);
-
-	if (!isNonPrimaryOverride && method.IsVirtual)
-		WriteLine ("[OverrideNative (\"{0}\")]", method.Name);
-
-	Write (CurrentIndent + (@protected? "protected" : method.Access.ToString ()) + " ");
-	if (method.IsConstructor) {
-		Write (method.FormattedName);
-	} else {
-		if (method.IsStatic)  Write ("static ");
-		if (method.IsVirtual && (!isNonPrimaryOverride || layoutClass != null)) Write ("virtual ");
-		else if (isNonPrimaryOverride) Write ("override ");
-		// ...?
-		Write (returnType);
-		Write (" ");
-		Write (isNonPrimaryOverride && layoutClass != null? layoutClass : method.FormattedName);
-	}
-
-	Write (" (");
-	WriteParameters (method.Parameters, true, false);
-	Write (")\n");
-
-	if (method.IsConstructor && layoutClass != null)
-		WriteLine (layoutClass);
-	else
-		WriteLine ("{");
-
-	PushIndent ("\t");
-	Write (CurrentIndent);
-
-	if (returnType != "void")
-		Write ("return ");
-}
-
-private void WriteParameters (IList<Parameter> parameters, bool writeType, bool writeAttributes)
-{
-	for (var i = 0; i < parameters.Count; i++) {
-		if (i != 0)
-			Write (", ");
-
-		var type = CSharpLanguage.TypeName (Generator.CppTypeToManaged (parameters [i].Type), Context.Parameter);
-
-		if (writeAttributes) {
-			var mangleAs = parameters [i].Type.ToString ();
-			if (mangleAs != "" && mangleAs != type)
-				Write ("[MangleAs (\"{0}\")] ", mangleAs);
-			if (Generator.IsByVal (parameters [i].Type))
-				Write ("[ByVal] ");
-		}
-
-		if (writeType) {
-			Write (type);
-			Write (" ");
-		} else {
-			if (type.StartsWith ("ref "))
-				Write ("ref ");
-		}
-
-		Write (CSharpLanguage.SafeIdentifier (parameters [i].Name));
-	}
-}
-
-private string GetBaseString ()
-{
-	if (Class.BaseClasses.Count == 0)
-		return "ICppObject";
-
-	var str = Class.BaseClasses [0].Name;
-	if (Class.BaseClasses.Count > 1) {
-		str = string.Format ("{0} /*, {1} */", str, string.Join (", ", Class.BaseClasses.Skip (1).Select (bc => bc.Name).ToArray ()));
-	}
-
-	return str;
-}
-
-#>
\ No newline at end of file
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpEnum.cs b/src/GCCGenerator/Templates/CSharp/CSharpEnum.cs
deleted file mode 100644
index 106e73e2..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpEnum.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.1
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Templates {
-    using System.IO;
-    using System.Linq;
-    using System.Collections.Generic;
-    using Mono.Cxxi;
-    using System;
-    
-    
-    public partial class CSharpEnum : EnumBase {
-        
-        public override string TransformText() {
-            this.GenerationEnvironment = null;
-            
-            #line 6 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-
-	var @namespace = Generator.Lib.BaseNamespace + (Enum.ParentNamespace != null? "." + string.Join (".", Enum.ParentNamespace.FullyQualifiedName) : "");
-
-if (!Nested) {
-
-            
-            #line default
-            #line hidden
-            
-            #line 11 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("\n// -------------------------------------------------------------------------\n//  Managed enum for ");
-            
-            #line default
-            #line hidden
-            
-            #line 13 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Enum.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 13 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("\n//  Generated from ");
-            
-            #line default
-            #line hidden
-            
-            #line 14 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Path.GetFileName (Generator.InputFileName) ));
-            
-            #line default
-            #line hidden
-            
-            #line 14 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(" on ");
-            
-            #line default
-            #line hidden
-            
-            #line 14 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( DateTime.Now ));
-            
-            #line default
-            #line hidden
-            
-            #line 14 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nnamespace ");
-            
-            #line default
-            #line hidden
-            
-            #line 19 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( @namespace ));
-            
-            #line default
-            #line hidden
-            
-            #line 19 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(" {\n");
-            
-            #line default
-            #line hidden
-            
-            #line 20 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
- } /* if !Nested */ 
-            
-            #line default
-            #line hidden
-            
-            #line 21 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("\tpublic enum ");
-            
-            #line default
-            #line hidden
-            
-            #line 21 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Enum.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 21 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(" {\n");
-            
-            #line default
-            #line hidden
-            
-            #line 22 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
- foreach (var item in Enum.Items) { 
-            
-            #line default
-            #line hidden
-            
-            #line 23 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("\t\t");
-            
-            #line default
-            #line hidden
-            
-            #line 23 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( item.Name ));
-            
-            #line default
-            #line hidden
-            
-            #line 23 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(" = ");
-            
-            #line default
-            #line hidden
-            
-            #line 23 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( item.Value ));
-            
-            #line default
-            #line hidden
-            
-            #line 23 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write(",\n");
-            
-            #line default
-            #line hidden
-            
-            #line 24 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 25 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("\t}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 26 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
- if (!Nested) { 
-            
-            #line default
-            #line hidden
-            
-            #line 27 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
-            this.Write("}\n");
-            
-            #line default
-            #line hidden
-            
-            #line 28 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpEnum.tt"
- } 
-            
-            #line default
-            #line hidden
-            return this.GenerationEnvironment.ToString();
-        }
-        
-        protected override void Initialize() {
-            base.Initialize();
-        }
-    }
-}
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpEnum.tt b/src/GCCGenerator/Templates/CSharp/CSharpEnum.tt
deleted file mode 100644
index 41fba0ec..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpEnum.tt
+++ /dev/null
@@ -1,28 +0,0 @@
-<#@ template language="C#" inherits="EnumBase" #>
-<#@ import namespace="System.IO" #>
-<#@ import namespace="System.Linq" #>
-<#@ import namespace="System.Collections.Generic" #>
-<#@ import namespace="Mono.Cxxi" #>
-<#
-	var @namespace = Generator.Lib.BaseNamespace + (Enum.ParentNamespace != null? "." + string.Join (".", Enum.ParentNamespace.FullyQualifiedName) : "");
-
-if (!Nested) {
-#>
-
-// -------------------------------------------------------------------------
-//  Managed enum for <#= Enum.Name #>
-//  Generated from <#= Path.GetFileName (Generator.InputFileName) #> on <#= DateTime.Now #>
-//
-//  This file was auto generated. Do not edit.
-// -------------------------------------------------------------------------
-
-namespace <#= @namespace #> {
-<# } /* if !Nested */ #>
-	public enum <#= Enum.Name #> {
-<# foreach (var item in Enum.Items) { #>
-		<#= item.Name #> = <#= item.Value #>,
-<# } #>
-	}
-<# if (!Nested) { #>
-}
-<# } #>
\ No newline at end of file
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpLanguage.cs b/src/GCCGenerator/Templates/CSharp/CSharpLanguage.cs
deleted file mode 100644
index 7e1b994f..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpLanguage.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Mono.Cxxi;
-
-namespace Templates {
-	public static class CSharpLanguage {
-
-		// from https://github.com/mono/mono/blob/master/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
-		private static string[] keywords = new string[] {
-			"abstract","event","new","struct","as","explicit","null","switch","base","extern",
-			"this","false","operator","throw","break","finally","out","true",
-			"fixed","override","try","case","params","typeof","catch","for",
-			"private","foreach","protected","checked","goto","public",
-			"unchecked","class","if","readonly","unsafe","const","implicit","ref",
-			"continue","in","return","using","virtual","default",
-			"interface","sealed","volatile","delegate","internal","do","is",
-			"sizeof","while","lock","stackalloc","else","static","enum",
-			"namespace",
-			"object","bool","byte","float","uint","char","ulong","ushort",
-			"decimal","int","sbyte","short","double","long","string","void",
-			"partial", "yield", "where"
-		};
-
-		public static string SafeIdentifier (string proposedName)
-		{
-			proposedName = new string (((IEnumerable<char>)proposedName).Select (c => char.IsLetterOrDigit (c)? c : '_').ToArray ());
-			return keywords.Contains (proposedName)? "@" + proposedName : proposedName;
-		}
-
-		public static string TypeName (string str, Context context)
-		{
-			switch (str) {
-			case "System.Void":    return "void";
-			case "System.Boolean": return "bool";
-			case "System.Byte":    return "byte";
-			case "System.SByte":   return "sbyte";
-			case "System.Char":    return "char";
-			case "System.Int16":   return "short";
-			case "System.UInt16":  return "ushort";
-			case "System.Decimal": return "decimal";
-			case "System.Single":  return "float";
-			case "System.Double":  return "double";
-			case "System.Int32":   return "int";
-			case "System.UInt32":  return "uint";
-			case "System.Int64":   return "long";
-			case "System.UInt64":  return "ulong";
-			case "System.Object":  return "object";
-			case "System.String":  return "string";
-			}
-
-			if (str.EndsWith ("&")) {
-				if (context.Is (Context.Parameter))
-					return "ref " + TypeName (str.TrimEnd ('&'), context);
-				if (context.Is (Context.Return))
-					return (context.Is (Context.Interface)? "[return: ByRef] " : "") + TypeName (str.TrimEnd ('&'), context);
-				if (context.Is (Context.Generic))
-					return "IntPtr";
-			}
-
-			// we are using System by default
-			var lastDot = str.LastIndexOf ('.');
-			if (str.StartsWith ("System") && lastDot == "System".Length)
-				return str.Substring (lastDot + 1);
-		
-			return str;
-		}
-
-
-	}
-}
-
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpLibs.cs b/src/GCCGenerator/Templates/CSharp/CSharpLibs.cs
deleted file mode 100644
index 70ac7549..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpLibs.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.1
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Templates {
-    using System;
-    
-    
-    public partial class CSharpLibs : LibsBase {
-        
-        public override string TransformText() {
-            this.GenerationEnvironment = null;
-            
-            #line 2 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write("// -------------------------------------------------------------------------\n//  C++ library declarations\n//  Generated on ");
-            
-            #line default
-            #line hidden
-            
-            #line 4 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( DateTime.Now ));
-            
-            #line default
-            #line hidden
-            
-            #line 4 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write("\n//\n//  This file was auto generated. Do not edit.\n// -------------------------------------------------------------------------\n\nusing System;\nusing Mono.Cxxi;\n\nnamespace ");
-            
-            #line default
-            #line hidden
-            
-            #line 12 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( Generator.Lib.BaseNamespace ));
-            
-            #line default
-            #line hidden
-            
-            #line 12 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(" {\n\n\tpublic static partial class Libs {\n");
-            
-            #line default
-            #line hidden
-            
-            #line 15 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
- foreach (var lib in Libs) { 
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write("\t\tpublic static readonly CppLibrary ");
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( CSharpLanguage.SafeIdentifier (lib.BaseName) ));
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(" = new CppLibrary (\"");
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( lib.BaseName ));
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write("\", InlineMethods.");
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture( lib.InlinePolicy ));
-            
-            #line default
-            #line hidden
-            
-            #line 16 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write(");\n");
-            
-            #line default
-            #line hidden
-            
-            #line 17 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
- } 
-            
-            #line default
-            #line hidden
-            
-            #line 18 "/Users/alex/OpenSource/cppinterop/src/generator/Templates/CSharp/CSharpLibs.tt"
-            this.Write("\t}\n}\n");
-            
-            #line default
-            #line hidden
-            return this.GenerationEnvironment.ToString();
-        }
-        
-        protected override void Initialize() {
-            base.Initialize();
-        }
-    }
-}
diff --git a/src/GCCGenerator/Templates/CSharp/CSharpLibs.tt b/src/GCCGenerator/Templates/CSharp/CSharpLibs.tt
deleted file mode 100644
index 3a065c9f..00000000
--- a/src/GCCGenerator/Templates/CSharp/CSharpLibs.tt
+++ /dev/null
@@ -1,19 +0,0 @@
-<#@ template language="C#" inherits="LibsBase" #>
-// -------------------------------------------------------------------------
-//  C++ library declarations
-//  Generated on <#= DateTime.Now #>
-//
-//  This file was auto generated. Do not edit.
-// -------------------------------------------------------------------------
-
-using System;
-using Mono.Cxxi;
-
-namespace <#= Generator.Lib.BaseNamespace #> {
-
-	public static partial class Libs {
-<# foreach (var lib in Libs) { #>
-		public static readonly CppLibrary <#= CSharpLanguage.SafeIdentifier (lib.BaseName) #> = new CppLibrary ("<#= lib.BaseName #>", InlineMethods.<#= lib.InlinePolicy #>);
-<# } #>
-	}
-}
diff --git a/src/GCCGenerator/Templates/Context.cs b/src/GCCGenerator/Templates/Context.cs
deleted file mode 100644
index 2b83b8d2..00000000
--- a/src/GCCGenerator/Templates/Context.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace Templates {
-	[Flags]
-	public enum Context {
-		Generic   = 0,
-		Parameter = 1 << 0,
-		Return    = 1 << 1,
-		Interface = 1 << 2,
-		Wrapper   = 1 << 3
-	}
-	public static class ContextExtensions {
-		public static bool Is (this Context bits, Context bit)
-		{
-			return (bits & bit) == bit;
-		}
-	}
-}
-
diff --git a/src/GCCGenerator/generator.csproj b/src/GCCGenerator/generator.csproj
deleted file mode 100644
index e2750685..00000000
--- a/src/GCCGenerator/generator.csproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AssemblyName>generator</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <PublishUrl>http://localhost/generator/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <RootNamespace>Templates</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Options.cs" />
-    <Compile Include="Class.cs" />
-    <Compile Include="Field.cs" />
-    <Compile Include="Generator.cs" />
-    <Compile Include="Method.cs" />
-    <Compile Include="Node.cs" />
-    <Compile Include="Parameter.cs" />
-    <Compile Include="Property.cs" />
-    <Compile Include="Templates\Base.cs">
-      <DependentUpon>Base.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Templates\BaseMembers.cs" />
-    <Compile Include="Templates\CSharp\CSharpClass.cs">
-      <DependentUpon>CSharpClass.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Templates\CSharp\CSharpLibs.cs">
-      <DependentUpon>CSharpLibs.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Access.cs" />
-    <Compile Include="Templates\CSharp\CSharpLanguage.cs" />
-    <Compile Include="Templates\Context.cs" />
-    <Compile Include="Filter.cs" />
-    <Compile Include="Enumeration.cs" />
-    <Compile Include="Lib.cs" />
-    <Compile Include="Templates\CSharp\CSharpEnum.cs">
-      <DependentUpon>CSharpEnum.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Namespace.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System">
-    </Reference>
-    <Reference Include="System.Xml">
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
-          <BuildFilesVar Sync="true" Name="FILES" />
-          <DeployFilesVar />
-          <ResourcesVar Sync="true" Name="RESOURCES" />
-          <OthersVar />
-          <GacRefVar Sync="true" Name="REFERENCES" />
-          <AsmRefVar Sync="true" Name="REFERENCES" />
-          <ProjectRefVar Sync="true" Name="REFERENCES" />
-        </MonoDevelop.Autotools.MakefileInfo>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-  <ItemGroup>
-    <ProjectReference Include="..\Mono.Cxxi\Mono.Cxxi.csproj">
-      <Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
-      <Name>Mono.Cxxi</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Templates\CSharp\CSharpClass.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>CSharpClass.cs</LastGenOutput>
-    </None>
-    <None Include="Templates\CSharp\CSharpLibs.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>CSharpLibs.cs</LastGenOutput>
-    </None>
-    <None Include="Templates\Base.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Base.cs</LastGenOutput>
-    </None>
-    <None Include="Templates\CSharp\CSharpEnum.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>CSharpEnum.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Templates\" />
-    <Folder Include="Templates\CSharp\" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/GCCGenerator/generator.in b/src/GCCGenerator/generator.in
deleted file mode 100644
index e5dc307e..00000000
--- a/src/GCCGenerator/generator.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec mono "@expanded_libdir@/@PACKAGE@/generator.exe" "$@"
diff --git a/src/GCCGenerator/generator.sln b/src/GCCGenerator/generator.sln
deleted file mode 100644
index c410904d..00000000
--- a/src/GCCGenerator/generator.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator.csproj", "{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = generator.csproj
-	EndGlobalSection
-EndGlobal