Remove old add-ins

The add-ins removed in this commit have been moved to https://github.com/monodevelop

79 files changed, 0 insertions, 12319 deletions

diff --git a/extras/ValaBinding/AUTHORS b/extras/ValaBinding/AUTHORS
deleted file mode 100644
index bb8ffddcba..0000000000
--- a/extras/ValaBinding/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-Jerome Haltom <wasabi@larvalstage.net>
diff --git a/extras/ValaBinding/AssemblyInfo.cs b/extras/ValaBinding/AssemblyInfo.cs
deleted file mode 100644
index 32180f7659..0000000000
--- a/extras/ValaBinding/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Autogenerated from ValaBinding.addin.xml
-
-using System.Reflection;
-
-[assembly: AssemblyProduct ("MonoDevelop")]
-[assembly: AssemblyTitle ("Vala Language Binding")]
-[assembly: AssemblyDescription ("Vala Language binding")]
-[assembly: AssemblyVersion ("2.6")]
-[assembly: AssemblyCopyright ("MIT/X11")]
diff --git a/extras/ValaBinding/COPYING b/extras/ValaBinding/COPYING
deleted file mode 100644
index 7b89c47e75..0000000000
--- a/extras/ValaBinding/COPYING
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2008 Levi Bard
-
-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.
diff --git a/extras/ValaBinding/ChangeLog b/extras/ValaBinding/ChangeLog
deleted file mode 100644
index 5fc82de1b8..0000000000
--- a/extras/ValaBinding/ChangeLog
+++ /dev/null
@@ -1,628 +0,0 @@
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs:
-	* Gui/ValaTextEditorExtension.cs: Track API changes.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaBinding.addin.xml:
-	* Parser/ValaDocumentParser.cs: Track ProjectDomService/Parser
-	  API.
-
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in: Bump MD version.
-
-2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in: Bump MD version.
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/ValaTextEditorExtension.cs: Remove unneeded filename
-	  checks, now it's handled by the addin tree.
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaBinding.addin.xml: Restrict editor extensions by file
-	  type.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in:
-	* AssemblyInfo.cs:
-	* ValaBinding.addin.xml: Bumped MD version.
-
-2010-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* templates/ValaTestFixture.xpt.xml:
-	* templates/ConsoleValaProject.xpt.xml:
-	* templates/EmptyValaSourceFile.xft.xml:
-	* templates/SharedLibraryValaProject.xpt.xml: Fixed 'Bug
-	  589786 - new vala files don't include the standard header'.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.csproj: Flush.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/Afrodite.cs:
-	* gtk-gui/gui.stetic:
-	* Gui/DataProvider.cs:
-	* ValaBinding.addin.xml:
-	* Project/ValaProject.cs:
-	* Compiler/ValaCompiler.cs:
-	* Gui/EditPackagesDialog.cs:
-	* Gui/OutputOptionsPanel.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* Gui/GeneralOptionsPanel.cs:
-	* Parser/ProjectInformation.cs:
-	* Gui/ValaTextEditorExtension.cs:
-	* Navigation/LanguageItemNodeBuilder.cs:
-	* ProjectPad/ProjectPackageNodeBuilder.cs:
-	* Navigation/LanguageItemCommandHandler.cs:
-	* Navigation/ProjectNodeBuilderExtension.cs:
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-03-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* configure.in: Change autofoo to check for afrodite.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Project/ValaProject.cs: Track ProjectFile Link API.
-
-2010-03-01  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/DataProvider.cs:
-	* Parser/ProjectInformation.cs:
-	* Gui/ValaTextEditorExtension.cs: Populate completion list
-	  asynchronously again.
-
-2010-03-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.sln: The invariant policy can't be used anymore
-	  as base policy set.
-
-2010-02-23  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: Support gcc note, translated error
-	  levels.
-
-2010-02-18  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Add sibling types.
-
-2010-02-18  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ValaDocumentParser.cs: Avoid occasional parser
-	  exceptions.
-
-2010-02-18  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs: Add project packages to parse list.
-
-2010-02-18  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Makefile.am: 
-	* Parser/Afrodite.cs: 
-	* ValaBinding.csproj: 
-	* Parser/Function.cs: 
-	* Parser/CodeNode.cs: 
-	* Gui/DataProvider.cs: 
-	* Parser/ValaDocumentParser.cs: 
-	* Parser/ProjectInformation.cs: 
-	* Gui/ValaTextEditorExtension.cs: 
-	* Navigation/LanguageItemEventArgs.cs: 
-	* Navigation/LanguageItemNodeBuilder.cs: 
-	* Navigation/LanguageItemCommandHandler.cs: 
-	* Navigation/ProjectNodeBuilderExtension.cs: Rework code completion based on libafrodite.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/DataProvider.cs: Track api changes.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.addin.xml: Load the project service extension
-	  only for the vala project.
-
-	* ValaBinding.sln:
-	* ValaBinding.csproj: Flush.
-
-2010-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.sln:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs:
-	* gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs:
-	  Flush.
-
-2010-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/DataProvider.cs: Track api changes.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ValaProject.cs:
-	* Gui/EditPackagesDialog.cs:
-	* Project/ValaProjectServiceExtension.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Project/ValaProject.cs: Track API.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in:
-	* AssemblyInfo.cs:
-	* ValaBinding.addin.xml: Bump MD version.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in:
-	* AssemblyInfo.cs:
-	* ValaBinding.addin.xml: Bump MD version.
-
-2009-09-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/DataProvider.cs:
-	* Parser/ValaDocumentParser.cs:
-	* Parser/ProjectInformation.cs: Track completion window API.
-
-2009-09-11  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Allow vala files to be edited 
-	  without a vsc-shell installation. Reported by Andy Selvig.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in:
-	* ValaBinding.csproj:
-	* gtk-gui/gui.stetic: We now depend on gtk# 2.12.8, Mono 2.4,
-	  and Mono.Addins 0.4.
-
-2009-07-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ValaProjectBinding.cs: Track api changes.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ValaProject.cs: Track api changes.
-
-2009-06-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.sln:
-	* ValaBinding.addin.xml:
-	* gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs: Remove
-	  obsolete extension.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.sln:
-	* ValaBinding.csproj: Flush.
-
-2009-04-28  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/CodeNode.cs:
-	* Parser/ProjectInformation.cs: Make document type extraction
-	  more robust.
-
-2009-04-28  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Force reparse on file update.
-
-2009-04-23  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/ValaTextEditorExtension.cs: 
-	* Parser/ValaDocumentParser.cs: 
-	* Parser/ProjectInformation.cs: Improve completion robustness.
-
-2009-04-23  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Keep parser from blocking project load.
-
-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaLanguageBinding.cs: Track comment tag API.
-
-2009-04-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ValaProject.cs: Track api changes done in
-	  IExecutionHandler.
-
-2009-04-16  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ValaDocumentParser.cs: Allow non-project files 
-	  to be parsed.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in:
-	* AssemblyInfo.cs:
-	* ValaBinding.addin.xml: Bump MD version.
-
-2009-04-14  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/*: Improvements to dom interaction.
-	
-2009-04-13  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/*: 
-	* Navigation/*: Make more parser communication asynchronous, 
-	  drop reliance on parser restarts.
-
-2009-04-13  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Parser adjustments.
-
-2009-04-10  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Handle it more gracefully 
-	  when vsc-shell is not installed.
-
-2009-04-09  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs: Auto-add C compiler options 
-	  when there are no package dependencies.
-
-2009-04-09  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* *: Populate quick finder.
-
-2009-04-08  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Increase parser robustness.
-
-2009-04-08  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/DataProvider.cs: Increase responsiveness on
-	  parameter completion.
-
-2009-04-08  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/ValaTextEditorExtension.cs: Increase responsiveness on 
-	  parameter completion.
-
-2009-04-07  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: Update for Vala 0.7.0.
-
-2009-03-25  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/*: 
-	* Navigation/LanguageItemCommandHandler.cs: Use file 
-	  positions from VSC.
-
-2009-03-20  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/ValaTextEditorExtension.cs: Tweak completion
-	  aggressiveness.
-
-2009-03-13  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/ValaTextEditorExtension.cs: Make completion more 
-	  aggressive.
-
-2009-03-13  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Reduce parser latency on 
-	  bad match.
-
-2009-03-13  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Fix intermittent exception.
-
-2009-03-10  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* *: Implement basic Makefile generation.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ValaProject.cs: Changed the way execution handlers
-	  work. We are not using platform ids anymore. Instead, we use
-	  command strings when looking for execution handlers.
-	  IExecutionHandlerFactory has been removed and now everything
-	  is handled by IExecutionHandler, which has a new CanExecute
-	  method. This model is more simple and more generic.
-
-2009-02-27  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* *: Change to vsc-based completion.
-
-2009-02-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaLanguageBinding.cs: Ordinal compare.
-
-	* Project/ValaProjectBinding.cs: Only create projects for vala
-	  files. Fixes nasty crash on xml files.
-
-2009-02-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaBinding.csproj: Remove bad property value.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.sln: Flush.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.csproj: Flush.
-
-2009-02-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaBinding.sln: Set policies. Remove unused name attribute.
-
-2009-02-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.csproj: Updated references.
-
-2009/02/06  Lluis Sanchez Gual  <lluis@novell.com>
-
- * ValaBinding.mds:
- * ValaBinding.sln:
- * ValaBinding.mdp:
- * ValaBinding.csproj: Migrated to MSBuild file format.
-
-2009/02/03  Lluis Sanchez Gual  <lluis@novell.com>
-
- * configure.in:
- * AssemblyInfo.cs:
- * ValaBinding.addin.xml: Bump MD version.
-
-2009/02/03  Lluis Sanchez Gual  <lluis@novell.com>
-
- * ValaBinding.mds:
- * gtk-gui/generated.cs:
- * gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs:
- * gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs:
- * gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs:
- * gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs:
- * gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs:
- * gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs:
- * gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs: Flush.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ValaBinding.mdp: Flush project format changes.
-
-2009-01-12  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/EditPackagesDialog.cs: Move package list population into idle handler.
-
-2009-01-12  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ProjectPackage.cs:
-	* Project/ProjectPackageCollection.cs: Use relative path 
-	for project package references.
-
-2009-01-05  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* ValaBinding.sln:
-	* ValaBinding.csproj: Add MSBuild project files.
-
-2009-01-05  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* gtk-gui/gui.stetic: Tooltip cleanup.
-
-2009-01-05  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/CodeGenerationPanel.cs: 
-	* Compiler/ValaCompiler.cs: 
-	* Project/ValaCompilationParameters.cs: Add support for valac --thread flag.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ValaBinding.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/ValaTextEditorExtension.cs: Track api changes.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* ValaBinding.mdp: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-21  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: Display errors originating from gcc.
-
-2008-11-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ValaProject.cs: Allow executing Vala projects.
-
-2008-11-18  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: valac no longer supports -D.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure.in:
-	* ValaBinding.addin.xml: Bump MD version.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* configure.in: Fix tarball name.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/DataProvider.cs:
-	* Gui/ValaTextEditorExtension.cs: Track APIs.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/DataProvider.cs: Track CompletionData API.
-
-2008-10-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/DataProvider.cs: Track API.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/ValaProject.cs: Track API.
-
-2008-09-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/DataProvider.cs: Track API.
-
-2008-09-23  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/DataProvider.cs: Track changes in completion API.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ValaBinding.mdp: Updated projects.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ValaLanguageBinding.cs: Fix build.
-
-2008-09-11  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs: More compiler flags tweaking
-	for project packages.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  ProjectPad/ProjectPackageNodeBuilder.cs,
-	  ProjectPad/ProjectReferencesExtension.cs,
-	  ProjectPad/ProjectNodeExtension.cs,
-	  Navigation/StructureNodeBuilder.cs,
-	  Navigation/TypedefNodeBuilder.cs, Navigation/MacroNodeBuilder.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/ClassNodeBuilder.cs, Navigation/MemberNodeBuilder.cs,
-	  Navigation/EnumeratorNodeBuilder.cs,
-	  Navigation/LanguageItemCommandHandler.cs,
-	  Navigation/GlobalsNodeBuilder.cs,
-	  Navigation/VariableNodeBuilder.cs,
-	  Navigation/FunctionNodeBuilder.cs,
-	  Navigation/EnumerationNodeBuilder.cs,
-	  Navigation/UnionNodeBuilder.cs, Navigation/NamespaceNodeBuilder.cs,
-	  Navigation/MacroDefinitionsNodeBuilder.cs: Moved the extensible
-	  tree view to its own directory.
-
-2008-09-03  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs: Add output directory to library path 
-	for project packages.
-
-2008-09-03  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: Only generate .deps file 
-	for shared library targets.
-
-2008-08-28  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: Generate .deps file on library compilation.
-
-2008-08-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ProjectPad/ProjectResourcesExtension.cs, ValaBinding.addin.xml,
-	  ValaBinding.mdp, gtk-gui/objects.xml, Makefile.am: Resources folder
-	  has been removed.
-
-2008-08-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ValaBinding.mdp: Fix reference to Mono.TextEditor. The incorrect
-	  add-in version number causes problems in the makefile
-	  synchronization.
-
-2008-08-12  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs: Fix error parsing for recent valac.
-
-2008-08-12  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/ValaCompiler.cs, Project/ProjectPackage.cs, 
-	Project/ValaProject.cs, Gui/EditPackagesDialog.cs:
-	Improve dependency and project package handling.
-	* templates/ValaTestFixture.xpt.xml, ValaBinding.addin.xml, 
-	Makefile.am: Add text fixture project template.
-	* templates/ConsoleValaProject.xpt.xml: Cleanup.
-
-2008-08-11  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs, Compiler/ValaCompiler.cs, 
-	Project/ProjectPackageCollection.cs, templates/ConsoleValaProject.xpt.xml, 
-	templates/EmptyValaProject.xpt.xml, 
-	templates/SharedLibraryValaProject.xpt.xml: Add glib-2.0 package
-	to new projects by default. Track changes in valac.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/ProjectPackage.cs, Project/ValaCompilationParameters.cs,
-	  Project/ValaProject.cs, Project/ValaProjectConfiguration.cs: Moved
-	  serialization engine to MonoDevelop.Core. Use new syntax for
-	  specifying attribute scope.
-
-2008-06-26  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs: Actually turn on debug mode.
-
-2008-06-18  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ProjectPackage.cs: Search more thoroughly for corresponding
-	  .pc files.
-
-2008-06-18  Jerome Haltom <wasabi@larvalstage.net>
-
-	* Gui/EditPackagesDialog.cs: Attempt to detect vapidir.
-
-2008-06-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ValaBinding.mdp, Makefile.am: More makefile fixes.
-
-2008-06-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* configure.in, Makefile.am: Fix makefile so that it does not directly
-	  depend on MD core and it can always be built standalone.
-	* ValaBinding.mdp: Enable makefile synchronization.
-
-2008-06-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ValaBinding.mdp: Fix gtk-sharp dependency versions.
-
-2008-06-09  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs, Navigation/ProjectNodeBuilderExtension.cs: 
-	  Add tags from packages to class pad and code completion.
-
-2008-06-09  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/*: Update parse data on file removal.
-
-2008-06-09  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/ValaProject.cs: Fix define syntax in generated .pc files.
-
-2008-06-09  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* *: Add package support.
-
-2008-06-04  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-
-	* *: Add classpad support
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/ValaProject.cs: Track api changes.
-
-2008-03-11  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-
-	* *: Ported from CBinding
diff --git a/extras/ValaBinding/Compiler/ICompiler.cs b/extras/ValaBinding/Compiler/ICompiler.cs
deleted file mode 100644
index bd36bf6921..0000000000
--- a/extras/ValaBinding/Compiler/ICompiler.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// ICompiler.cs: interface that must be implemented by any class that wants
-// to provide a compiler for the ValaBinding addin.
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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 Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.ValaBinding
-{
-	[TypeExtensionPoint ("/ValaBinding/Compilers")]
-	public interface ICompiler
-	{
-		string Name {
-			get;
-		}
-		
-		string CompilerCommand {
-			get;
-		}
-		
-		string GetCompilerFlags (ValaProjectConfiguration configuration);
-		
-		string GetDefineFlags (ValaProjectConfiguration configuration);
-		
-		BuildResult Compile (
-			ProjectFileCollection projectFiles,
-			ProjectPackageCollection packages,
-			ValaProjectConfiguration configuration,
-			IProgressMonitor monitor);
-		
-		void Clean (ProjectFileCollection projectFiles, ValaProjectConfiguration configuration, IProgressMonitor monitor);
-	}
-}
diff --git a/extras/ValaBinding/Compiler/ValaCompiler.cs b/extras/ValaBinding/Compiler/ValaCompiler.cs
deleted file mode 100644
index f4d397e281..0000000000
--- a/extras/ValaBinding/Compiler/ValaCompiler.cs
+++ /dev/null
@@ -1,644 +0,0 @@
-//
-// ValaCompiler.cs: abstract class that provides some basic implementation for ICompiler
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Text;
-using System.CodeDom.Compiler;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
- 
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.ProgressMonitoring;
-
-namespace MonoDevelop.ValaBinding
-{
-	[Extension ("/ValaBinding/Compilers")]
-	public class ValaCompiler : ICompiler
-	{
-		protected string compilerCommand;
-				
-		bool compilerFound;
-		bool appsChecked;
-		
-		public ValaCompiler ()
-		{
-			compilerCommand = "valac";
-		}
-		
-		public string Name {
-			get{ return "valac"; }
-		}
-			
-		public string CompilerCommand {
-			get { return compilerCommand; }
-		}
-		
-		/// <summary>
-		/// Generates compiler args for depended packages
-		/// </summary>
-		/// <param name="packages">
-		/// The collection of packages for this project 
-		/// <see cref="ProjectPackageCollection"/>
-		/// </param>
-		/// <returns>
-		/// The string needed by the compiler to reference the necessary packages
-		/// <see cref="System.String"/>
-		/// </returns>
-		public static string GeneratePkgCompilerArgs (ProjectPackageCollection packages)
-		{
-			if (packages == null || packages.Count < 1)
-				return string.Empty;
-			
-			StringBuilder libs = new StringBuilder ();
-			
-			foreach (ProjectPackage p in packages) {
-				if (p.IsProject) {
-					libs.AppendFormat (" \"{0}\" ", p.File);
-				} else {
-					libs.AppendFormat (" --pkg \"{0}\" ", p.Name);
-				}
-			}
-			
-			return libs.ToString ();
-		}
-
-		/// <summary>
-		/// Compile the project
-		/// </summary>
-		/// <param name="projectFiles">
-		/// Collection of project files
-		/// <see cref="ProjectFileCollection"/>
-		/// </param>
-		/// <param name="packages">
-		/// Collection of depended packages
-		/// <see cref="ProjectPackageCollection"/>
-		/// </param>
-		/// <param name="configuration">
-		/// Project configuration
-		/// <see cref="ValaProjectConfiguration"/>
-		/// </param>
-		/// <param name="monitor">
-		/// Progress monitor to be used
-		/// <see cref="IProgressMonitor"/>
-		/// </param>
-		/// <returns>
-		/// Result of the compilation
-		/// <see cref="ICompilerResult"/>
-		/// </returns>
-		public BuildResult Compile (
-			ProjectFileCollection projectFiles,
-			ProjectPackageCollection packages,
-			ValaProjectConfiguration configuration,
-			IProgressMonitor monitor)
-		{
-			
-			if (!appsChecked) {
-				appsChecked = true;
-				compilerFound = CheckApp (compilerCommand);
-			}/// Check for compiler
-				
-			
-			if (!compilerFound) {
-				BuildResult cres = new BuildResult ();
-				cres.AddError ("Compiler not found: " + compilerCommand);
-				return cres;
-			}/// No compiler!
-			
-			CompilerResults cr = new CompilerResults (new TempFileCollection ());
-			bool success = true;
-			
-			/// Build compiler params string
-			string compilerArgs = GetCompilerFlags (configuration) + " " + GeneratePkgCompilerArgs (packages);
-			
-			/// Build executable name
-			string outputName = Path.Combine (configuration.OutputDirectory,
-											  configuration.CompiledOutputName);
-			
-			monitor.BeginTask (GettextCatalog.GetString ("Compiling source"), 1);
-			
-			success = DoCompilation (projectFiles, compilerArgs, outputName, monitor, cr);
-
-			GenerateDepfile (configuration, packages);
-
-			if (success)
-				monitor.Step (1);
-			monitor.EndTask ();
-			
-			return new BuildResult (cr, "");
-		}
-		
-		string ICompiler.GetCompilerFlags (ValaProjectConfiguration configuration)
-		{
-			return ValaCompiler.GetCompilerFlags (configuration);
-		}
-		
-		/// <summary>
-		/// Generates compiler args for the current settings
-		/// </summary>
-		/// <param name="configuration">
-		/// Project configuration
-		/// <see cref="ValaProjectConfiguration"/>
-		/// </param>
-		/// <returns>
-		/// A compiler-interpretable string
-		/// <see cref="System.String"/>
-		/// </returns>
-		public static string GetCompilerFlags (ValaProjectConfiguration configuration)
-		{
-			List<string> args = new List<string> ();
-			
-			
-			ValaCompilationParameters cp =
-				(ValaCompilationParameters)configuration.CompilationParameters;
-
-			args.Add (string.Format ("-d '{0}'", configuration.OutputDirectory));
-			
-			if (configuration.DebugMode)
-				args.Add ("-g");
-
-			switch (configuration.CompileTarget) {
-			case ValaBinding.CompileTarget.Bin:
-				if (cp.EnableMultithreading) {
-					args.Add ("--thread");
-				}
-				break;
-			case ValaBinding.CompileTarget.SharedLibrary:
-				args.Add (string.Format ("--Xcc=\"-shared\" --Xcc=\"-fPIC\" --Xcc=\"-I'{0}'\" -H \"{1}.h\" --library \"{1}\"", configuration.OutputDirectory, configuration.Output));
-				break;
-			}
-
-// Valac will get these sooner or later			
-//			switch (cp.WarningLevel)
-//			{
-//			case WarningLevel.None:
-//				args.Append ("-w ");
-//				break;
-//			case WarningLevel.Normal:
-//				// nothing
-//				break;
-//			case WarningLevel.All:
-//				args.Append ("-Wall ");
-//				break;
-//			}
-//			
-//			if (cp.WarningsAsErrors)
-//				args.Append ("-Werror ");
-//			
-			if (0 < cp.OptimizationLevel) { 
-				args.Add ("--Xcc=\"-O" + cp.OptimizationLevel + "\"");
-			}
-			
-			if (cp.ExtraCompilerArguments != null && cp.ExtraCompilerArguments.Length > 0) {
-				args.Add (ExpandBacktickedParameters (cp.ExtraCompilerArguments.Replace (Environment.NewLine, " ")));
-			}
-			
-			if (cp.DefineSymbols != null && cp.DefineSymbols.Length > 0) {
-				args.Add (ProcessDefineSymbols (cp.DefineSymbols));
-			}
-			
-			if (configuration.Includes != null)
-				foreach (string inc in configuration.Includes)
-					args.Add ("--vapidir \"" + inc + "\"");
-
-			if (configuration.Libs != null)
-				foreach (string lib in configuration.Libs)
-					args.Add ("--pkg \"" + lib + "\"");
-			
-			return string.Join (" ", args.ToArray ());
-		}
-		
-		/// <summary>
-		/// Generates compilers flags for selected defines
-		/// </summary>
-		/// <param name="configuration">
-		/// Project configuration
-		/// <see cref="ValaProjectConfiguration"/>
-		/// </param>
-		/// <returns>
-		/// A compiler-interpretable string
-		/// <see cref="System.String"/>
-		/// </returns>
-		public string GetDefineFlags (ValaProjectConfiguration configuration)
-		{
-			string defines = ((ValaCompilationParameters)configuration.CompilationParameters).DefineSymbols;
-			return ProcessDefineSymbols (defines);
-		}
-		
-		/// <summary>
-		/// Determines whether a file needs to be compiled
-		/// </summary>
-		/// <param name="file">
-		/// The file in question
-		/// <see cref="ProjectFile"/>
-		/// </param>
-		/// <returns>
-		/// true if the file needs to be compiled
-		/// <see cref="System.Boolean"/>
-		/// </returns>
-		private bool NeedsCompiling (ProjectFile file)
-		{
-			return true;
-		}
-		
-		/// <summary>
-		/// Executes a build command
-		/// </summary>
-		/// <param name="command">
-		/// The executable to be launched
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="args">
-		/// The arguments to command
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="baseDirectory">
-		/// The directory in which the command will be executed
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="monitor">
-		/// The progress monitor to be used
-		/// <see cref="IProgressMonitor"/>
-		/// </param>
-		/// <param name="errorOutput">
-		/// Error output will be stored here
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The exit code of the command
-		/// <see cref="System.Int32"/>
-		/// </returns>
-		int ExecuteCommand (string command, string args, string baseDirectory, IProgressMonitor monitor, out string errorOutput)
-		{
-			errorOutput = string.Empty;
-			int exitCode = -1;
-			
-			StringWriter swError = new StringWriter ();
-			LogTextWriter chainedError = new LogTextWriter ();
-			chainedError.ChainWriter (monitor.Log);
-			chainedError.ChainWriter (swError);
-			
-			monitor.Log.WriteLine ("{0} {1}", command, args);
-			
-			AggregatedOperationMonitor operationMonitor = new AggregatedOperationMonitor (monitor);
-			
-			try {
-				ProcessWrapper p = Runtime.ProcessService.StartProcess (command, args, baseDirectory, monitor.Log, chainedError, null);
-				operationMonitor.AddOperation (p); //handles cancellation
-				
-				p.WaitForOutput ();
-				errorOutput = swError.ToString ();
-				exitCode = p.ExitCode;
-				p.Dispose ();
-				
-				if (monitor.IsCancelRequested) {
-					monitor.Log.WriteLine (GettextCatalog.GetString ("Build cancelled"));
-					monitor.ReportError (GettextCatalog.GetString ("Build cancelled"), null);
-					if (exitCode == 0)
-						exitCode = -1;
-				}
-			} finally {
-				chainedError.Close ();
-				swError.Close ();
-				operationMonitor.Dispose ();
-			}
-			
-			return exitCode;
-		}
-		
-		/// <summary>
-		/// Transforms a whitespace-delimited string of 
-		/// symbols into a set of compiler flags
-		/// </summary>
-		/// <param name="symbols">
-		/// A whitespace-delimited string of symbols, 
-		/// e.g., "DEBUG MONODEVELOP"
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.String"/>
-		/// </returns>
-		private static string ProcessDefineSymbols (string symbols)
-		{
-			return ((null == symbols) || (0 == symbols.Length))?
-				string.Empty:
-				"-D " + Regex.Replace (symbols, " +", " -D ");
-		}
-		
-		/// <summary>
-		/// Compiles the project
-		/// </summary>
-		private bool DoCompilation (ProjectFileCollection projectFiles, string args,
-									string outputName,
-									IProgressMonitor monitor,
-									CompilerResults cr)
-		{
-			StringBuilder filelist = new StringBuilder ();
-			foreach (ProjectFile f in projectFiles) { 
-				if (f.Subtype != Subtype.Directory && f.BuildAction == BuildAction.Compile) {
-					filelist.AppendFormat ("\"{0}\" ", f.FilePath);
-				}
-			}/// Build file list
-
-			string compiler_args = string.Format ("{0} {1} -o \"{2}\"",
-				args, filelist.ToString (), Path.GetFileName (outputName));
-			
-			string errorOutput = string.Empty;
-			int exitCode = ExecuteCommand (compilerCommand, compiler_args, Path.GetDirectoryName (outputName), monitor, out errorOutput);
-			
-			ParseCompilerOutput (errorOutput, cr, projectFiles);
-			return exitCode == 0;
-		}
-		
-		/// <summary>
-		/// Cleans up intermediate files
-		/// </summary>
-		/// <param name="projectFiles">
-		/// The project's files
-		/// <see cref="ProjectFileCollection"/>
-		/// </param>
-		/// <param name="configuration">
-		/// Project configuration
-		/// <see cref="ValaProjectConfiguration"/>
-		/// </param>
-		/// <param name="monitor">
-		/// The progress monitor to be used
-		/// <see cref="IProgressMonitor"/>
-		/// </param>
-		public void Clean (ProjectFileCollection projectFiles, ValaProjectConfiguration configuration, IProgressMonitor monitor)
-		{
-			/// Clean up intermediate files
-			/// These should only be generated for libraries, but we'll check for them in all cases
-			foreach (ProjectFile file in projectFiles) {
-				if (file.BuildAction == BuildAction.Compile) {
-					string cFile = Path.Combine (configuration.OutputDirectory, Path.GetFileNameWithoutExtension (file.Name) + ".c");
-					if (File.Exists (cFile)){ File.Delete (cFile); }
-						
-					string hFile = Path.Combine (configuration.OutputDirectory, Path.GetFileNameWithoutExtension (file.Name) + ".h");
-					if (File.Exists (hFile)){ File.Delete (hFile); }
-				}
-			}
-			
-			string vapiFile = Path.Combine (configuration.OutputDirectory, configuration.Output + ".vapi");
-			if (File.Exists (vapiFile)){ File.Delete (vapiFile); }
-		}
-		
-		/// <summary>
-		/// Determines whether the target needs to be updated
-		/// </summary>
-		/// <param name="projectFiles">
-		/// The project's files
-		/// <see cref="ProjectFileCollection"/>
-		/// </param>
-		/// <param name="target">
-		/// The target
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// true if target needs to be updated
-		/// <see cref="System.Boolean"/>
-		/// </returns>
-		private bool NeedsUpdate (ProjectFileCollection projectFiles,
-								  string target)
-		{
-			return true;
-		}
-		
-		/// <summary>
-		/// Parses a compiler output string into CompilerResults
-		/// </summary>
-		/// <param name="errorString">
-		/// The string output by the compiler
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="cr">
-		/// The CompilerResults into which to parse errorString
-		/// <see cref="CompilerResults"/>
-		/// </param>
-		protected void ParseCompilerOutput (string errorString, CompilerResults cr, ProjectFileCollection projectFiles)
-		{
-			TextReader reader = new StringReader (errorString);
-			string next;
-				
-			while ((next = reader.ReadLine ()) != null) {
-				CompilerError error = CreateErrorFromErrorString (next, projectFiles);
-				// System.Console.WriteLine ("Creating error from string \"{0}\"", next);
-				if (error != null) {
-					cr.Errors.Insert (0, error);
-					// System.Console.WriteLine ("Adding error");
-				}
-			}
-			
-			reader.Close ();
-		}
-		
-		/// Error regex for valac
-		/// Sample output: "/home/user/project/src/blah.vala:23.5-23.5: error: syntax error, unexpected }, expecting ;"
-		private static Regex errorRegex = new Regex (
-			@"^\s*(?<file>.*):(?<line>\d*)\.(?<column>\d*)-\d*\.\d*: (?<level>[^:]*): (?<message>.*)",
-			RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
-		private static Regex gccRegex = new Regex (
-		    @"^\s*(?<file>.*):(?<line>\d*):((?<column>\d*):)?\s*(?<level>.*)\s*:\s(?<message>.*)",
-			RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
-		/// Error regex for gnu linker - this could still be pertinent for vala
-		private static Regex linkerRegex = new Regex (
-			@"^\s*(?<file>[^:]*):(?<line>\d*):\s*(?<message>[^:]*)",
-			RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
-		/// <summary>
-		/// Creates a compiler error from an output string
-		/// </summary>
-		/// <param name="errorString">
-		/// The error string to be parsed
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// A newly created CompilerError
-		/// <see cref="CompilerError"/>
-		/// </returns>
-		private CompilerError CreateErrorFromErrorString (string errorString, ProjectFileCollection projectFiles)
-		{
-			Match errorMatch = null;
-			foreach (Regex regex in new Regex[]{errorRegex, gccRegex})
-				if ((errorMatch = regex.Match (errorString)).Success)
-					break;
-			
-			if (!errorMatch.Success)
-				return null;
-
-			CompilerError error = new CompilerError ();
-			
-			foreach (ProjectFile pf in projectFiles) {
-				if (Path.GetFileName (pf.Name) == errorMatch.Groups["file"].Value) {
-					error.FileName = pf.FilePath;
-					break;
-				}
-			}// check for fully pathed file
-			if (string.Empty == error.FileName) {
-				error.FileName = errorMatch.Groups["file"].Value;
-			}// fallback to exact match
-			error.Line = int.Parse (errorMatch.Groups["line"].Value);
-			if (errorMatch.Groups["column"].Success)
-				error.Column = int.Parse (errorMatch.Groups["column"].Value);
-			error.IsWarning = !errorMatch.Groups["level"].Value.Equals (GettextCatalog.GetString ("error"), StringComparison.Ordinal);
-			error.ErrorText = errorMatch.Groups["message"].Value;
-			
-			return error;
-		}
-		
-		/// <summary>
-		/// Parses linker output into compiler results
-		/// </summary>
-		/// <param name="errorString">
-		/// The linker output to be parsed
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="cr">
-		/// Results will be stored here
-		/// <see cref="CompilerResults"/>
-		/// </param>
-		protected void ParseLinkerOutput (string errorString, CompilerResults cr)
-		{
-			TextReader reader = new StringReader (errorString);
-			string next;
-			
-			while ((next = reader.ReadLine ()) != null) {
-				CompilerError error = CreateLinkerErrorFromErrorString (next);
-				if (error != null)
-					cr.Errors.Add (error);
-			}
-			
-			reader.Close ();
-		}
-		
-		/// <summary>
-		/// Creates a linker error from an output string
-		/// </summary>
-		/// <param name="errorString">
-		/// The error string to be parsed
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// A newly created LinkerError
-		/// <see cref="LinkerError"/>
-		/// </returns>
-		private CompilerError CreateLinkerErrorFromErrorString (string errorString)
-		{
-			CompilerError error = new CompilerError ();
-			
-			Match linkerMatch = linkerRegex.Match (errorString);
-			
-			if (linkerMatch.Success)
-			{
-				error.FileName = linkerMatch.Groups["file"].Value;
-				error.Line = int.Parse (linkerMatch.Groups["line"].Value);
-				error.ErrorText = linkerMatch.Groups["message"].Value;
-				
-				return error;
-			}
-			
-			return null;
-		}
-
-		/// <summary>
-		/// Expands backticked portions of the parameter-list using "sh" and "echo"
-		/// </summary>
-		/// <param name="tmp">
-		/// The string to expand
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The result of the expansion
-		/// <see cref="System.String"/>
-		/// </returns> 
-		// TODO: Portability, although otoh, probably someone who doesn't have sh 
-		// isn't going to put backticks in the compiler flags
-		public static string ExpandBacktickedParameters (string tmp)
-		{
-			string parameters = "-c \"echo -n " + tmp + "\"";
-			Process p = new Process ();
-			
-			p.StartInfo.FileName = "sh";
-			p.StartInfo.Arguments = parameters;
-			p.StartInfo.UseShellExecute = false;
-			p.StartInfo.RedirectStandardOutput = true;
-			p.Start ();
-			p.WaitForExit ();
-
-			return p.StandardOutput.ReadToEnd ();
-		}
-		
-		/// <summary>
-		/// Check to see if we have a given app
-		/// </summary>
-		/// <param name="app">
-		/// The app to check
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// true if the app is found
-		/// <see cref="System.Boolean"/>
-		/// </returns>
-		bool CheckApp (string app)
-		{
-			try {
-				ProcessWrapper p = Runtime.ProcessService.StartProcess (app, "--version", null, null);
-				p.WaitForOutput ();
-				return true;
-			} catch {
-				return false;
-			}
-		}
-
-		public void GenerateDepfile (ValaProjectConfiguration configuration, ProjectPackageCollection packages)
-		{
-			try {
-				if (configuration.CompileTarget != CompileTarget.SharedLibrary){ return; }
-				
-				using (StreamWriter writer = new StreamWriter (Path.Combine (configuration.OutputDirectory, Path.ChangeExtension (configuration.Output, ".deps")))) {
-					foreach (ProjectPackage package in packages) {
-						writer.WriteLine (package.Name);
-					}
-				}
-			} catch { /* Don't care */ }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/AddLibraryDialog.cs b/extras/ValaBinding/Gui/AddLibraryDialog.cs
deleted file mode 100644
index ed2fa570dc..0000000000
--- a/extras/ValaBinding/Gui/AddLibraryDialog.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// AddLibraryDialog.cs: A simple open file dialog to add libraries to the project (using vapi files)
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-
-using Mono.Addins;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class AddLibraryDialog : Gtk.Dialog
-	{
-		private string lib = string.Empty;
-		
-		public AddLibraryDialog()
-		{
-			this.Build();
-			
-			Gtk.FileFilter libs = new Gtk.FileFilter ();
-			Gtk.FileFilter all = new Gtk.FileFilter ();
-			
-			libs.AddPattern ("*.vapi");
-			libs.Name = "Libraries";
-			
-			all.AddPattern ("*.*");
-			all.Name = "All Files";
-			
-			file_chooser_widget.AddFilter (libs);
-			file_chooser_widget.AddFilter (all);
-			file_chooser_widget.SetCurrentFolder ("/usr/share/vala/vapi");
-		}
-		
-		private void OnOkButtonClick (object sender, EventArgs e)
-		{
-			lib = System.IO.Path.GetFileNameWithoutExtension (
-				file_chooser_widget.Filename);
-			
-			Destroy ();
-		}
-		
-		private void OnCancelButtonClick (object sender, EventArgs e)
-		{
-			Destroy ();
-		}
-		
-		public string Library {
-			get { return lib; }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/AddPathDialog.cs b/extras/ValaBinding/Gui/AddPathDialog.cs
deleted file mode 100644
index 1d4f99477b..0000000000
--- a/extras/ValaBinding/Gui/AddPathDialog.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// AddPathDialog.cs: A simple open file dialog to add paths to the project
-// for includes and libraries (mime type: x-directory/normal)
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-
-using Mono.Addins;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class AddPathDialog : Gtk.Dialog
-	{
-		string path;
-		
-		public AddPathDialog (string currentDir)
-		{
-			this.Build ();
-			
-			Gtk.FileFilter filter = new Gtk.FileFilter ();
-			
-			filter.AddMimeType ("x-directory/normal");
-			filter.Name = "Folders";
-			
-			file_chooser_widget.SetCurrentFolder (currentDir);
-			file_chooser_widget.AddFilter (filter);
-		}
-		
-		private void OnOkButtonClick (object sender, EventArgs e)
-		{
-			path = file_chooser_widget.Filename;
-			Destroy ();
-		}
-		
-		private void OnCancelButtonClick (object sender, EventArgs e)
-		{
-			Destroy ();
-		}
-		
-		public string SelectedPath {
-			get { return path; }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/CodeGenerationPanel.cs b/extras/ValaBinding/Gui/CodeGenerationPanel.cs
deleted file mode 100644
index 72d177005f..0000000000
--- a/extras/ValaBinding/Gui/CodeGenerationPanel.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-//
-// CodeGenerationPanel.cs: Code generation panel to configure project
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Collections;
-
-using Mono.Addins;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Projects;
-using MonoDevelop.Ide.Gui.Dialogs;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class CodeGenerationPanel : Gtk.Bin
-	{
-		private ValaProjectConfiguration configuration;
-		private ValaCompilationParameters compilationParameters;
-		private Gtk.ListStore libStore = new Gtk.ListStore (typeof(string));
-		private Gtk.ListStore includePathStore = new Gtk.ListStore (typeof(string));
-		
-		public CodeGenerationPanel () 
-		{
-			this.Build ();
-			
-			Gtk.CellRendererText textRenderer = new Gtk.CellRendererText ();
-			
-			libTreeView.Model = libStore;
-			libTreeView.HeadersVisible = false;
-			libTreeView.AppendColumn ("Library", textRenderer, "text", 0);
-			
-			includePathTreeView.Model = includePathStore;
-			includePathTreeView.HeadersVisible = false;
-			includePathTreeView.AppendColumn ("Include", textRenderer, "text", 0);
-		}
-		
-		public void Load (ValaProjectConfiguration config)
-		{
-			configuration = config;
-			compilationParameters = (ValaCompilationParameters)configuration.CompilationParameters;
-			
-			switch (compilationParameters.WarningLevel)
-			{
-			case WarningLevel.None:
-				noWarningRadio.Active = true;
-				break;
-			case WarningLevel.Normal:
-				normalWarningRadio.Active = true;
-				break;
-			case WarningLevel.All:
-				allWarningRadio.Active = true;
-				break;
-			}
-			
-			warningsAsErrorsCheckBox.Active = compilationParameters.WarningsAsErrors;
-			threadingCheckbox.Sensitive = (config.CompileTarget == CompileTarget.Bin);
-			threadingCheckbox.Active = (threadingCheckbox.Sensitive && compilationParameters.EnableMultithreading);
-			
-			optimizationSpinButton.Value = compilationParameters.OptimizationLevel;
-			
-			switch (configuration.CompileTarget)
-			{
-			case ValaBinding.CompileTarget.Bin:
-				targetComboBox.Active = 0;
-				break;
-			case ValaBinding.CompileTarget.StaticLibrary:
-				targetComboBox.Active = 1;
-				break;
-			case ValaBinding.CompileTarget.SharedLibrary:
-				targetComboBox.Active = 2;
-				break;
-			}
-			
-			extraCompilerTextView.Buffer.Text = compilationParameters.ExtraCompilerArguments;
-			
-			defineSymbolsTextEntry.Text = compilationParameters.DefineSymbols;
-			
-			foreach (string lib in configuration.Libs)
-				libStore.AppendValues (lib);
-			
-			foreach (string includePath in configuration.Includes)
-				includePathStore.AppendValues (includePath);
-		}
-		
-		private void OnIncludePathAdded (object sender, EventArgs e)
-		{
-			if (includePathEntry.Text.Length > 0) {				
-				includePathStore.AppendValues (includePathEntry.Text);
-				includePathEntry.Text = string.Empty;
-			}
-		}
-		
-		private void OnIncludePathRemoved (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			includePathTreeView.Selection.GetSelected (out iter);
-			includePathStore.Remove (ref iter);
-		}
-		
-		private void OnLibAdded (object sender, EventArgs e)
-		{
-			if (libAddEntry.Text.Length > 0) {				
-				libStore.AppendValues (libAddEntry.Text);
-				libAddEntry.Text = string.Empty;
-			}
-		}
-		
-		private void OnLibRemoved (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			libTreeView.Selection.GetSelected (out iter);
-			libStore.Remove (ref iter);
-		}
-		
-		private void OnBrowseButtonClick (object sender, EventArgs e)
-		{
-			AddLibraryDialog dialog = new AddLibraryDialog ();
-			dialog.Run ();
-			libAddEntry.Text = dialog.Library;
-		}
-		
-		private void OnIncludePathBrowseButtonClick (object sender, EventArgs e)
-		{
-			AddPathDialog dialog = new AddPathDialog (configuration.SourceDirectory);
-			dialog.Run ();
-			includePathEntry.Text = dialog.SelectedPath;
-		}
-		
-		public bool Store ()
-		{
-			if (compilationParameters == null || configuration == null)
-				return false;
-			
-			string line;
-			Gtk.TreeIter iter;
-			
-			if (noWarningRadio.Active)
-				compilationParameters.WarningLevel = WarningLevel.None;
-			else if (normalWarningRadio.Active)
-				compilationParameters.WarningLevel = WarningLevel.Normal;
-			else
-				compilationParameters.WarningLevel = WarningLevel.All;
-			
-			compilationParameters.WarningsAsErrors = warningsAsErrorsCheckBox.Active;
-			
-			compilationParameters.OptimizationLevel = (int)optimizationSpinButton.Value;
-			
-			switch (targetComboBox.Active)
-			{
-			case 0:
-				configuration.CompileTarget = ValaBinding.CompileTarget.Bin;
-				compilationParameters.EnableMultithreading = threadingCheckbox.Active;
-				break;
-			case 1:
-				configuration.CompileTarget = ValaBinding.CompileTarget.StaticLibrary;
-				break;
-			case 2:
-				configuration.CompileTarget = ValaBinding.CompileTarget.SharedLibrary;
-				break;
-			}
-			
-			compilationParameters.ExtraCompilerArguments = extraCompilerTextView.Buffer.Text;
-			
-			compilationParameters.DefineSymbols = defineSymbolsTextEntry.Text;
-			
-			libStore.GetIterFirst (out iter);
-			configuration.Libs.Clear ();
-			while (libStore.IterIsValid (iter)) {
-				line = (string)libStore.GetValue (iter, 0);
-				configuration.Libs.Add (line);
-				libStore.IterNext (ref iter);
-			}
-			
-			includePathStore.GetIterFirst (out iter);
-			configuration.Includes.Clear ();
-			while (includePathStore.IterIsValid (iter)) {
-				line = (string)includePathStore.GetValue (iter, 0);
-				configuration.Includes.Add (line);
-				includePathStore.IterNext (ref iter);
-			}
-			
-			return true;
-		}
-
-		protected virtual void OnLibAddEntryChanged (object sender, EventArgs e)
-		{
-			if (string.IsNullOrEmpty (libAddEntry.Text))
-				addLibButton.Sensitive = false;
-			else
-				addLibButton.Sensitive = true;
-		}
-
-		protected virtual void OnLibTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			removeLibButton.Sensitive = true;
-		}
-
-		protected virtual void OnRemoveLibButtonClicked (object sender, System.EventArgs e)
-		{
-			removeLibButton.Sensitive = false;
-		}
-
-		protected virtual void OnIncludePathEntryChanged (object sender, System.EventArgs e)
-		{
-			if (string.IsNullOrEmpty (includePathEntry.Text))
-				includePathAddButton.Sensitive = false;
-			else
-				includePathAddButton.Sensitive = true;
-		}
-
-		protected virtual void OnIncludePathTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			includePathRemoveButton.Sensitive = true;
-		}
-
-		protected virtual void OnIncludePathRemoveButtonClicked (object sender, System.EventArgs e)
-		{
-			includePathRemoveButton.Sensitive = false;
-		}
-		
-		protected virtual void OnLibAddEntryActivated (object sender, System.EventArgs e)
-		{
-			OnLibAdded (this, new EventArgs ());
-		}
-
-		protected virtual void OnIncludePathEntryActivated (object sender, System.EventArgs e)
-		{
-			OnIncludePathAdded (this, new EventArgs ());
-		}
-
-		/// <summary>
-		/// Set sensitivity and activity of multithreading checkbox on target change
-		/// </summary>
-		protected virtual void OnTargetComboBoxChanged (object sender, System.EventArgs e)
-		{
-			threadingCheckbox.Sensitive = (0 == targetComboBox.Active);
-			threadingCheckbox.Active = (threadingCheckbox.Active && threadingCheckbox.Sensitive);
-		}
-	}
-	
-	public class CodeGenerationPanelBinding : MultiConfigItemOptionsPanel
-	{
-		private CodeGenerationPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			return panel = new CodeGenerationPanel ();
-		}
-		
-		public override void LoadConfigData ()
-		{
-			panel.Load((ValaProjectConfiguration) CurrentConfiguration);
-//			panel = new CodeGenerationPanel ((Properties)CustomizationObject);
-//			Add (panel);
-		}
-
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/CompilationUnitDataProvider.cs b/extras/ValaBinding/Gui/CompilationUnitDataProvider.cs
deleted file mode 100644
index 582a8b3b48..0000000000
--- a/extras/ValaBinding/Gui/CompilationUnitDataProvider.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// 
-//  CompilationUnitDataProvider.cs
-//  
-//  Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-//  Copyright (c) 2010 Levi Bard
-// 
-// This source code is licenced under The MIT License:
-//
-// 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 MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Components;
-using MonoDevelop.Projects.Dom;
-
-using Gtk;
-
-namespace MonoDevelop.ValaBinding
-{
-	// Yoinked from C# binding
-	public class CompilationUnitDataProvider : DropDownBoxListWindow.IListDataProvider
-	{
-		Document Document { get; set; }
-		
-		public CompilationUnitDataProvider (Document document)
-		{
-			this.Document = document;
-		}// constructor
-		
-		#region IListDataProvider implementation
-		public void Reset () { }
-		
-		public string GetMarkup (int n)
-		{
-			return Document.ParsedDocument.UserRegions.ElementAt (n).Name;
-		}// GetText
-		
-		internal static Gdk.Pixbuf Pixbuf
-		{
-			get { return ImageService.GetPixbuf (Gtk.Stock.Add, IconSize.Menu); }
-		}// Pixbuf
-		
-		public Gdk.Pixbuf GetIcon (int n)
-		{
-			return Pixbuf;
-		}// GetIcon
-		
-		public object GetTag (int n)
-		{
-			return Document.ParsedDocument.UserRegions.ElementAt (n);
-		}// GetTag
-		
-		
-		public void ActivateItem (int n)
-		{
-			var reg = Document.ParsedDocument.UserRegions.ElementAt (n);
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-			if (extEditor != null)
-				extEditor.SetCaretTo (Math.Max (1, reg.Region.Start.Line), reg.Region.Start.Column);
-		}// ActivateItem
-		
-		public int IconCount
-		{
-			get {
-				if (Document.ParsedDocument == null)
-					return 0;
-				return Document.ParsedDocument.UserRegions.Count ();
-			}
-		}// IconCount
-		
-		#endregion
-	}// CompilationUnitDataProvider
-}
-
diff --git a/extras/ValaBinding/Gui/DataProvider.cs b/extras/ValaBinding/Gui/DataProvider.cs
deleted file mode 100644
index 9671c79cbd..0000000000
--- a/extras/ValaBinding/Gui/DataProvider.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// 
-//  DataProvider.cs
-//  
-//  Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-//  Copyright (c) 2010 Levi Bard
-// 
-// This source code is licenced under The MIT License:
-//
-// 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 MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Components;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Output;
-
-using Gtk;
-
-namespace MonoDevelop.ValaBinding
-{
-	// Yoinked from C# binding
-	public class DataProvider : DropDownBoxListWindow.IListDataProvider
-	{
-		object tag;
-		Ambience amb;
-		List<IMember> memberList = new List<IMember> ();
-		
-		Document Document { get; set; }
-		
-		public DataProvider (Document doc, object tag, Ambience amb)
-		{
-			this.Document = doc;
-			this.tag = ((INode)tag).Parent;
-			this.amb = amb;
-			Reset ();
-		}// constructor
-		
-		#region IListDataProvider implementation
-		public void Reset ()
-		{
-			memberList.Clear ();
-			if (tag is ICompilationUnit) {
-				Stack<IType> types = new Stack<IType> (((ICompilationUnit)tag).Types);
-				while (types.Count > 0) {
-					IType type = types.Pop ();
-					memberList.Add (type);
-					foreach (IType innerType in type.InnerTypes)
-						types.Push (innerType);
-				}
-			} else  if (tag is IType) {
-				memberList.AddRange (((IType)tag).Members);
-			}
-			memberList.Sort ((x, y) => String.Compare (GetString (amb, x), GetString (amb, y), StringComparison.OrdinalIgnoreCase));
-		}// Reset
-		
-		string GetString (Ambience amb, IMember x)
-		{
-			if (tag is ICompilationUnit)
-				return amb.GetString (x, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.UseFullInnerTypeName | OutputFlags.ReformatDelegates);
-			return amb.GetString (x, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates);
-		}// GetString
-		
-		public string GetMarkup (int n)
-		{
-			return GetString (amb, memberList[n]);
-		}// GetText
-
-		public Gdk.Pixbuf GetIcon (int n)
-		{
-			return ImageService.GetPixbuf (memberList[n].StockIcon, IconSize.Menu);
-		}// GetIcon
-
-		public object GetTag (int n)
-		{
-			return memberList[n];
-		}// GetTag
-
-		public void ActivateItem (int n)
-		{
-			var member = memberList[n];
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-			if (extEditor != null)
-				extEditor.SetCaretTo (Math.Max (1, member.Location.Line), member.Location.Column);
-		}// ActivateItem
-
-		public int IconCount {
-			get {
-				return memberList.Count;
-			}
-		}// IconCount
-		#endregion
-	}// DataProvider
-}
-
diff --git a/extras/ValaBinding/Gui/EditPackagesDialog.cs b/extras/ValaBinding/Gui/EditPackagesDialog.cs
deleted file mode 100644
index 3fb2df10d8..0000000000
--- a/extras/ValaBinding/Gui/EditPackagesDialog.cs
+++ /dev/null
@@ -1,498 +0,0 @@
-//
-// EditPackagesDialog.cs: Allows you to add and remove pkg-config packages to the project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Collections.Generic;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class EditPackagesDialog : Gtk.Dialog
-	{
-		private Gtk.ListStore normalPackageListStore = new Gtk.ListStore (typeof(bool), typeof(string), typeof(string));
-		private Gtk.ListStore projectPackageListStore = new Gtk.ListStore (typeof(bool), typeof(string), typeof(string));
-		private Gtk.ListStore selectedPackageListStore = new Gtk.ListStore (typeof(string), typeof(string));
-		private ValaProject project;
-		private ProjectPackageCollection selectedPackages = new ProjectPackageCollection ();
-		private List<ProjectPackage> packagesOfProjects;
-		private List<ProjectPackage> packages = new List<ProjectPackage> ();
-		
-		// Column IDs
-		const int NormalPackageToggleID = 0;
-		const int NormalPackageNameID = 1;
-		const int NormalPackageVersionID = 2;
-		
-		const int ProjectPackageToggleID = 0;
-		const int ProjectPackageNameID = 1;
-		const int ProjectPackageVersionID = 2;
-		
-		const int SelectedPackageNameID = 0;
-		const int SelectedPackageVersionID = 1;
-
-		public EditPackagesDialog(ValaProject project)
-		{
-			this.Build();
-			
-			this.project = project;
-			
-			selectedPackages.Project = project;
-			selectedPackages.AddRange (project.Packages);
-			
-			Gtk.CellRendererText textRenderer = new Gtk.CellRendererText ();
-			
-			Gtk.CellRendererPixbuf pixbufRenderer = new Gtk.CellRendererPixbuf ();
-			pixbufRenderer.StockId = "md-package";
-			
-			normalPackageListStore.DefaultSortFunc = NormalPackageCompareNodes;
-			projectPackageListStore.DefaultSortFunc = ProjectPackageCompareNodes;
-			selectedPackageListStore.DefaultSortFunc = SelectedPackageCompareNodes;
-			
-			normalPackageListStore.SetSortColumnId (NormalPackageNameID, Gtk.SortType.Ascending);
-			projectPackageListStore.SetSortColumnId (ProjectPackageNameID, Gtk.SortType.Ascending);
-			selectedPackageListStore.SetSortColumnId (SelectedPackageNameID, Gtk.SortType.Ascending);
-			
-			normalPackageTreeView.SearchColumn = NormalPackageNameID;
-			projectPackageTreeView.SearchColumn = ProjectPackageNameID;
-			selectedPackageTreeView.SearchColumn = SelectedPackageNameID;
-			
-			// <!-- Normal packages -->
-			
-			Gtk.CellRendererToggle normalPackageToggleRenderer = new Gtk.CellRendererToggle ();
-			normalPackageToggleRenderer.Activatable = true;
-			normalPackageToggleRenderer.Toggled += OnNormalPackageToggled;
-			normalPackageToggleRenderer.Xalign = 0;
-			
-			Gtk.TreeViewColumn normalPackageColumn = new Gtk.TreeViewColumn ();
-			normalPackageColumn.Title = "Package";
-			normalPackageColumn.PackStart (pixbufRenderer, false);
-			normalPackageColumn.PackStart (textRenderer, true);
-			normalPackageColumn.AddAttribute (textRenderer, "text", NormalPackageNameID);
-			
-			normalPackageTreeView.Model = normalPackageListStore;
-			normalPackageTreeView.HeadersVisible = true;
-			normalPackageTreeView.AppendColumn ("", normalPackageToggleRenderer, "active", NormalPackageToggleID);
-			normalPackageTreeView.AppendColumn (normalPackageColumn);
-			normalPackageTreeView.AppendColumn ("Version", textRenderer, "text", NormalPackageVersionID);
-			
-			// <!-- Project packages -->
-			
-			Gtk.CellRendererToggle projectPackageToggleRenderer = new Gtk.CellRendererToggle ();
-			projectPackageToggleRenderer.Activatable = true;
-			projectPackageToggleRenderer.Toggled += OnProjectPackageToggled;
-			projectPackageToggleRenderer.Xalign = 0;
-			
-			Gtk.TreeViewColumn projectPackageColumn = new Gtk.TreeViewColumn ();
-			projectPackageColumn.Title = "Package";
-			projectPackageColumn.PackStart (pixbufRenderer, false);
-			projectPackageColumn.PackStart (textRenderer, true);
-			projectPackageColumn.AddAttribute (textRenderer, "text", ProjectPackageNameID);
-			
-			projectPackageTreeView.Model = projectPackageListStore;
-			projectPackageTreeView.HeadersVisible = true;
-			projectPackageTreeView.AppendColumn ("", projectPackageToggleRenderer, "active", ProjectPackageToggleID);
-			projectPackageTreeView.AppendColumn (projectPackageColumn);
-			projectPackageTreeView.AppendColumn ("Version", textRenderer, "text", ProjectPackageVersionID);
-			
-			
-			// <!-- Selected packages -->
-			
-			Gtk.TreeViewColumn selectedPackageColumn = new Gtk.TreeViewColumn ();
-			selectedPackageColumn.Title = "Package";
-			selectedPackageColumn.PackStart (pixbufRenderer, false);
-			selectedPackageColumn.PackStart (textRenderer, true);
-			selectedPackageColumn.AddAttribute (textRenderer, "text", SelectedPackageNameID);
-			
-			selectedPackageTreeView.Model = selectedPackageListStore;
-			selectedPackageTreeView.HeadersVisible = true;
-			selectedPackageTreeView.AppendColumn (selectedPackageColumn);
-			selectedPackageTreeView.AppendColumn ("Version", textRenderer, "text", SelectedPackageVersionID);
-			
-			// Fill up the project tree view
-			packagesOfProjects = GetPackagesOfProjects (project);
-			
-			foreach (ProjectPackage p in packagesOfProjects) {
-				if (p.Name == project.Name) continue;
-				
-				packages.Add (p);
-				string version = p.Version;
-				bool inProject = selectedPackages.Contains (p);
-
-				if (!IsPackageInStore (projectPackageListStore, p.Name, version, ProjectPackageNameID, ProjectPackageVersionID)) {
-				    projectPackageListStore.AppendValues (inProject, p.Name, version);
-				
-					if (inProject)
-						selectedPackageListStore.AppendValues (p.Name, version);
-				}
-			}
-			
-			// Fill up the normal tree view
-			foreach (string dir in ScanDirs ()) {
-				if (Directory.Exists (dir)) {	
-					DirectoryInfo di = new DirectoryInfo (dir);
-					FileInfo[] availablePackages = di.GetFiles ("*.vapi");
-					
-					foreach (FileInfo f in availablePackages) {
-						if (!IsValidPackage (f.FullName)) { 
-							continue;
-						}
-
-						string packagename = f.FullName;
-
-						GLib.Idle.Add (delegate {
-							ProjectPackage package = new ProjectPackage (packagename);
-							
-							packages.Add (package);
-							
-							string name = package.Name;
-							string version = package.Version;
-							bool inProject = selectedPackages.Contains (package);
-							
-							if (!IsPackageInStore (normalPackageListStore, name, version, NormalPackageNameID, NormalPackageVersionID)) {
-								normalPackageListStore.AppendValues (inProject, name, version);
-							
-								if (inProject)
-									selectedPackageListStore.AppendValues (name, version);
-							}
-							return false;
-						});
-					}
-				}
-			}
-		}
-		
-		private List<ProjectPackage> GetPackagesOfProjects (Project project)
-		{
-			List<ProjectPackage> packages = new List<ProjectPackage>();
-			ProjectPackage package;
-			
-			foreach (Project c in IdeApp.Workspace.GetAllProjects()) {
-				if (c is ValaProject) {
-					ValaProject proj = c as ValaProject;
-					ValaProjectConfiguration conf = proj.GetConfiguration (IdeApp.Workspace.ActiveConfiguration) as ValaProjectConfiguration;
-					if (conf.CompileTarget != CompileTarget.Bin) {
-						proj.WriteMDPkgPackage (conf.Selector);
-						package = new ProjectPackage (proj);
-						packages.Add (package);
-					}
-				}
-			}
-			
-			return packages;
-		}
-		
-		private bool IsPackageInStore (Gtk.ListStore store, string pname, string pversion, int pname_col, int pversion_col)
-		{
-			Gtk.TreeIter search_iter;
-			bool has_elem = store.GetIterFirst (out search_iter);
-				
-			if (has_elem) {
-				while (true) {
-					string name = (string)store.GetValue (search_iter, pname_col);
-					string version = (string)store.GetValue (search_iter, pversion_col);
-					
-					if (name == pname && version == pversion)
-						return true;
-						
-					if (!store.IterNext (ref search_iter))
-						break;
-				}
-			}
-			
-			return false;
-		}
-		
-		private string[] ScanDirs ()
-		{
-			return new string[]{ ValaProject.vapidir };
-		}
-		
-		private void OnOkButtonClick (object sender, EventArgs e)
-		{
-			// Use this instead of clear, since clear seems to not update the packages tree
-			while (project.Packages.Count > 0) {
-				project.Packages.RemoveAt (0);
-			}
-
-			project.Packages.AddRange (selectedPackages);
-			
-			Destroy ();
-		}
-		
-		private void OnCancelButtonClick (object sender, EventArgs e)
-		{
-			Destroy ();
-		}
-		
-		private void OnRemoveButtonClick (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			
-			selectedPackageTreeView.Selection.GetSelected (out iter);
-			
-			if (!selectedPackageListStore.IterIsValid (iter)) return;
-			
-			string package = (string)selectedPackageListStore.GetValue (iter, SelectedPackageNameID);
-			bool isProject = false;
-			
-			foreach (ProjectPackage p in selectedPackages) {
-				if (p.Name == package) {
-					isProject = p.IsProject;
-					selectedPackages.Remove (p);
-					break;
-				}
-			}
-			
-			selectedPackageListStore.Remove (ref iter);
-			
-			if (!isProject) {
-				Gtk.TreeIter search_iter;
-				bool has_elem = normalPackageListStore.GetIterFirst (out search_iter);
-					
-				if (has_elem) {
-					while (true) {
-						string current = (string)normalPackageListStore.GetValue (search_iter, NormalPackageNameID);
-						
-						if (current.Equals (package)) {
-							normalPackageListStore.SetValue (search_iter, NormalPackageToggleID, false);
-							break;
-						}
-						
-						if (!normalPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			} else {
-				Gtk.TreeIter search_iter;
-				bool has_elem = projectPackageListStore.GetIterFirst (out search_iter);
-					
-				if (has_elem) {
-					while (true) {
-						string current = (string)projectPackageListStore.GetValue (search_iter, ProjectPackageNameID);
-						
-						if (current.Equals (package)) {
-							projectPackageListStore.SetValue (search_iter, ProjectPackageToggleID, false);
-							break;
-						}
-						
-						if (!projectPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			}
-		}
-		
-		private void OnNormalPackageToggled (object sender, Gtk.ToggledArgs args)
-		{
-			Gtk.TreeIter iter;
-			bool old = true;
-			string name;
-			string version;
-
-			if (normalPackageListStore.GetIter (out iter, new Gtk.TreePath (args.Path))) {
-				old = (bool)normalPackageListStore.GetValue (iter, NormalPackageToggleID);
-				normalPackageListStore.SetValue (iter, NormalPackageToggleID, !old);
-			}
-			
-			name = (string)normalPackageListStore.GetValue (iter, NormalPackageNameID);
-			version = (string)normalPackageListStore.GetValue(iter, NormalPackageVersionID);
-			
-			if (old == false) {
-				selectedPackageListStore.AppendValues (name, version);
-				
-				foreach (ProjectPackage package in packages) {
-					if (package.Name == name /* && package.Version == version */) {
-						selectedPackages.Add (package);
-						break;
-					}
-				}
-				
-			} else {
-				Gtk.TreeIter search_iter;
-				bool has_elem = selectedPackageListStore.GetIterFirst (out search_iter);
-				
-				if (has_elem) {
-					while (true) {
-						string current = (string)selectedPackageListStore.GetValue (search_iter, SelectedPackageNameID);
-						
-						if (current.Equals (name)) {
-							selectedPackageListStore.Remove (ref search_iter);
-							foreach (ProjectPackage p in selectedPackages) {
-								if (p.Name == name) {
-									selectedPackages.Remove (p);
-									break;
-								}
-							}
-							
-							break;
-						}
-						
-						if (!selectedPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			}
-		}
-		
-		private void OnProjectPackageToggled (object sender, Gtk.ToggledArgs args)
-		{
-			Gtk.TreeIter iter;
-			bool old = true;
-			string name;
-			string version;
-
-			if (projectPackageListStore.GetIter (out iter, new Gtk.TreePath (args.Path))) {
-				old = (bool)projectPackageListStore.GetValue (iter, ProjectPackageToggleID);
-				projectPackageListStore.SetValue (iter, ProjectPackageToggleID, !old);
-			}
-			
-			name = (string)projectPackageListStore.GetValue (iter, ProjectPackageNameID);
-			version = (string)projectPackageListStore.GetValue(iter, ProjectPackageVersionID);
-			
-			if (old == false) {
-				selectedPackageListStore.AppendValues (name, version);
-				
-				foreach (ProjectPackage p in packagesOfProjects) {
-					if (p.Name == name) {
-						selectedPackages.Add (p);
-						break;
-					}
-				}
-			} else {
-				Gtk.TreeIter search_iter;
-				bool has_elem = selectedPackageListStore.GetIterFirst (out search_iter);
-				
-				if (has_elem)
-				{
-					while (true) {
-						string current = (string)selectedPackageListStore.GetValue (search_iter, SelectedPackageNameID);
-						
-						if (current.Equals (name)) {
-							selectedPackageListStore.Remove (ref search_iter);
-							foreach (ProjectPackage p in selectedPackages) {
-								if (p.Name == name) {
-									selectedPackages.Remove (p);
-									break;
-								}
-							}
-							
-							break;
-						}
-						
-						if (!selectedPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			}
-		}
-		
-		private bool IsValidPackage (string package)
-		{
-			return true;
-		}
-		
-		int NormalPackageCompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
-		{
-			string name1 = (string)model.GetValue (a, NormalPackageNameID);
-			string name2 = (string)model.GetValue (b, NormalPackageNameID);
-			return string.Compare (name1, name2, true);
-		}
-		
-		int ProjectPackageCompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
-		{
-			string name1 = (string)model.GetValue (a, ProjectPackageNameID);
-			string name2 = (string)model.GetValue (b, ProjectPackageNameID);
-			return string.Compare (name1, name2, true);
-		}
-		
-		int SelectedPackageCompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
-		{
-			string name1 = (string)model.GetValue (a, SelectedPackageNameID);
-			string name2 = (string)model.GetValue (b, SelectedPackageNameID);
-			return string.Compare (name1, name2, true);
-		}
-
-		protected virtual void OnSelectedPackagesTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			removeButton.Sensitive = true;
-		}
-
-		protected virtual void OnRemoveButtonClicked (object sender, System.EventArgs e)
-		{
-			removeButton.Sensitive = false;
-		}
-
-		protected virtual void OnDetailsButtonClicked (object sender, System.EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			Gtk.Widget active_tab = notebook1.Children [notebook1.Page];
-			string tab_label = notebook1.GetTabLabelText (active_tab);
-			string name = string.Empty;
-			// string version = string.Empty;
-			ProjectPackage package = null;
-			
-			if (tab_label == "System Packages") {
-				normalPackageTreeView.Selection.GetSelected (out iter);
-				name = (string)normalPackageListStore.GetValue (iter, NormalPackageNameID);
-				// version = (string)normalPackageListStore.GetValue (iter, NormalPackageVersionID);
-			} else if (tab_label == "Project Packages") {
-				projectPackageTreeView.Selection.GetSelected (out iter);
-				name = (string)projectPackageListStore.GetValue (iter, ProjectPackageNameID);
-				// version = (string)projectPackageListStore.GetValue (iter, ProjectPackageVersionID);
-			} else {
-				return;
-			}
-			
-			foreach (ProjectPackage p in packages) {
-				if (p.Name == name /* && p.Version == version */) {
-					package = p;
-					break;
-				}
-			}
-			
-			if (package == null)
-				return;
-			
-			PackageDetails details = new PackageDetails (package);
-			details.Modal = true;
-			details.Show ();
-		}
-		
-		protected virtual void OnNonSelectedPackageCursorChanged (object o, EventArgs e)
-		{
-			detailsButton.Sensitive = true;
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/GeneralOptionsPanel.cs b/extras/ValaBinding/Gui/GeneralOptionsPanel.cs
deleted file mode 100644
index c9a53385a4..0000000000
--- a/extras/ValaBinding/Gui/GeneralOptionsPanel.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// GeneralOptionsPanel.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Dialogs;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class GeneralOptionsPanel : Gtk.Bin
-	{
-		ICompiler default_vala_compiler;
-		List<ICompiler> vala_compilers = new List<ICompiler> ();
-		
-		public GeneralOptionsPanel ()
-		{
-			this.Build ();
-			
-			object[] compilers = AddinManager.GetExtensionObjects ("/ValaBinding/Compilers");
-		
-			foreach (ICompiler compiler in compilers) {
-				vala_compilers.Add (compiler);
-			}
-			
-			foreach (ICompiler compiler in vala_compilers)
-				valaCombo.AppendText (compiler.Name);
-			
-			string vala_compiler = PropertyService.Get<string> ("ValaBinding.DefaultValaCompiler", new ValaCompiler ().Name);
-			
-			foreach (ICompiler compiler in vala_compilers) {
-				if (compiler.Name == vala_compiler) {
-					default_vala_compiler = compiler;
-				}
-			}
-			
-			if (default_vala_compiler == null)
-				default_vala_compiler = new ValaCompiler ();
-			
-			int active;
-			Gtk.TreeIter iter;
-			Gtk.ListStore store;
-			
-			active = 0;
-			store = (Gtk.ListStore)valaCombo.Model;
-			store.GetIterFirst (out iter);
-			
-			while (store.IterIsValid (iter)) {
-				if ((string)store.GetValue (iter, 0) == default_vala_compiler.Name) {
-					break;
-				}
-				store.IterNext (ref iter);
-				active++;
-			}
-
-			valaCombo.Active = active;
-		}
-		
-		public bool Store ()
-		{
-			PropertyService.Set ("ValaBinding.DefaultValaCompiler", default_vala_compiler.Name);
-			PropertyService.SaveProperties ();
-			return true;
-		}
-
-		protected virtual void OnValaComboChanged (object sender, System.EventArgs e)
-		{
-			 string activeCompiler = valaCombo.ActiveText;
-			
-			foreach (ICompiler compiler in vala_compilers) {
-				if (compiler.Name == activeCompiler) {
-					 default_vala_compiler = compiler;
-				}
-			}
-			
-			if (default_vala_compiler == null)
-				default_vala_compiler = new ValaCompiler ();
-		}
-	}
-	
-	public class GeneralOptionsPanelBinding : OptionsPanel
-	{
-		private GeneralOptionsPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			panel = new GeneralOptionsPanel ();
-			return panel;
-		}
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/OutputOptionsPanel.cs b/extras/ValaBinding/Gui/OutputOptionsPanel.cs
deleted file mode 100644
index 29b68bf81a..0000000000
--- a/extras/ValaBinding/Gui/OutputOptionsPanel.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// OutputOptionsPanel.cs: configure output options
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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 MonoDevelop.Ide.Gui.Dialogs;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class OutputOptionsPanel : Gtk.Bin
-	{
-		private ValaProjectConfiguration configuration;
-		
-		public OutputOptionsPanel ()
-		{
-			this.Build ();
-			
-			table1.RowSpacing = 3;
-		}
-		
-		public void Load (ValaProjectConfiguration config)
-		{
-			configuration = config;
-			
-			outputNameTextEntry.Text = configuration.Output;
-			outputPathTextEntry.Text = configuration.OutputDirectory;
-			parametersTextEntry.Text = configuration.CommandLineParameters;
-			
-			externalConsoleCheckbox.Active = configuration.ExternalConsole;
-			pauseCheckbox.Active = configuration.PauseConsoleOutput;
-		}
-		
-		private void OnBrowseButtonClick (object sender, EventArgs e)
-		{
-			AddPathDialog dialog = new AddPathDialog (configuration.OutputDirectory);
-			dialog.Run ();
-			outputPathTextEntry.Text = dialog.SelectedPath;
-		}
-		
-		public bool Store ()
-		{
-			if (configuration == null)
-				return false;
-			
-			if (outputNameTextEntry != null && outputNameTextEntry.Text.Length > 0)
-				configuration.Output = outputNameTextEntry.Text.Trim ();
-			
-			if (outputPathTextEntry.Text != null && outputPathTextEntry.Text.Length > 0)
-				configuration.OutputDirectory = outputPathTextEntry.Text.Trim ();
-			
-			if (parametersTextEntry.Text != null && parametersTextEntry.Text.Length > 0)
-				configuration.CommandLineParameters = parametersTextEntry.Text.Trim ();
-			
-			configuration.ExternalConsole = externalConsoleCheckbox.Active;
-			configuration.PauseConsoleOutput = pauseCheckbox.Active;
-			
-			return true;
-		}
-
-		protected virtual void OnExternalConsoleCheckboxClicked (object sender, System.EventArgs e)
-		{
-			pauseCheckbox.Sensitive = externalConsoleCheckbox.Active;
-		}
-	}
-	
-	public class OutputOptionsPanelBinding : MultiConfigItemOptionsPanel
-	{
-		private OutputOptionsPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			return panel = new OutputOptionsPanel ();
-		}
-		
-		public override void LoadConfigData ()
-		{
-			panel.Load((ValaProjectConfiguration) CurrentConfiguration);
-//			panel = new OutputOptionsPanel ((Properties)CustomizationObject);
-//			Add (panel);
-		}
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/PackageDetails.cs b/extras/ValaBinding/Gui/PackageDetails.cs
deleted file mode 100644
index 26e881d592..0000000000
--- a/extras/ValaBinding/Gui/PackageDetails.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// PackageDetails.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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;
-
-namespace MonoDevelop.ValaBinding
-{
-	public partial class PackageDetails : Gtk.Dialog
-	{
-		Gtk.ListStore requiresStore = new Gtk.ListStore (typeof(string));
-//		Gtk.ListStore libPathsStore = new Gtk.ListStore (typeof(string));
-//		Gtk.ListStore libsStore = new Gtk.ListStore (typeof(string));
-//		Gtk.ListStore cflagsStore = new Gtk.ListStore (typeof(string));
-		
-		public PackageDetails (ProjectPackage package)
-		{
-			this.Build();
-			
-			package = new ProjectPackage(package.File);
-			
-			Gtk.CellRendererText textRenderer = new Gtk.CellRendererText ();
-			
-			requiresTreeView.Model = requiresStore;
-			requiresTreeView.AppendColumn ("Requires", textRenderer, "text", 0);
-			requiresTreeView.HeadersVisible = false;
-			
-//			libPathsTreeView.Model = libPathsStore;
-//			libPathsTreeView.AppendColumn ("LibPaths", textRenderer, "text", 0);
-//			libPathsTreeView.HeadersVisible = false;
-//			
-//			libsTreeView.Model = libsStore;
-//			libsTreeView.AppendColumn ("Libs", textRenderer, "text", 0);
-//			libsTreeView.HeadersVisible = false;
-//			
-//			cflagsTreeView.Model = cflagsStore;
-//			cflagsTreeView.AppendColumn ("CFlags", textRenderer, "text", 0);
-//			cflagsTreeView.HeadersVisible = false;
-//			
-			nameLabel.Text = package.Name;
-			
-			descriptionLabel.Text = package.Description;
-			versionLabel.Text = package.Version;
-			
-			foreach (string req in package.Requires)
-				requiresStore.AppendValues (req);
-			
-//			foreach (string libpath in package.LibPaths)
-//				libPathsStore.AppendValues (libpath);
-//			
-//			foreach (string lib in package.Libs)
-//				libsStore.AppendValues (lib);
-//			
-//			foreach (string cflag in package.CFlags)
-//				cflagsStore.AppendValues (cflag);
-		}
-
-		protected virtual void OnButtonOkClicked (object sender, System.EventArgs e)
-		{
-			Destroy ();
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/ParameterDataProvider.cs b/extras/ValaBinding/Gui/ParameterDataProvider.cs
deleted file mode 100644
index 26105ed851..0000000000
--- a/extras/ValaBinding/Gui/ParameterDataProvider.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-//
-// DataProvider.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Threading;
-
-using MonoDevelop.Core;
- 
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-
-using MonoDevelop.ValaBinding.Parser;
-using MonoDevelop.ValaBinding.Parser.Afrodite;
-
-namespace MonoDevelop.ValaBinding
-{
-	public class ParameterDataProvider : IParameterDataProvider
-	{
-		Document document;
-		private IList<Symbol> functions;
-		private string functionName;
-		
-		public ParameterDataProvider (Document document, ProjectInformation info, string functionName)
-		{
-			this.document = document;
-			this.functionName = functionName;
-
-			functions = new List<Symbol> ();
-			Symbol function = info.GetFunction (functionName, document.FileName, document.Editor.Caret.Line + 1, document.Editor.Caret.Column + 1);
-			if (null != function){ functions.Add (function); }
-		}// member function constructor
-		
-		/// <summary>
-		/// Create a ParameterDataProvider for a constructor
-		/// </summary>
-		/// <param name="constructorOverload">
-		/// A <see cref="System.String"/>: The named of the pertinent constructor overload
-		/// </param>
-		public ParameterDataProvider (Document document, ProjectInformation info, string typename, string constructorOverload)
-		{
-			this.functionName = constructorOverload;
-			this.document = document;
-			
-			List<Symbol> myfunctions = info.GetConstructorsForType (typename, document.FileName, document.Editor.Caret.Line + 1, document.Editor.Caret.Column + 1, null); // bottleneck
-			if (1 < myfunctions.Count) {
-				foreach (Symbol function in myfunctions) {
-					if (functionName.Equals (function.Name, StringComparison.Ordinal)) {
-						functions = new List<Symbol> () {function};
-						return;
-					}
-				}
-			}
-			
-			functions = myfunctions;
-		}// constructor constructor
-		
-		/// <summary>
-		/// The number of overloads for this method
-		/// </summary>
-		public int OverloadCount {
-			get { return functions.Count; }
-		}
-		
-		/// <summary>
-		/// Get the index of the parameter where the cursor is currently positioned.
-		/// </summary>
-		/// <param name="ctx">
-		/// A <see cref="CodeCompletionContext"/>
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.Int32"/>: The index of the parameter, 
-		/// 0 for no parameter entered, 
-		/// -1 for outside the list
-		/// </returns>
-		public int GetCurrentParameterIndex (ICompletionWidget widget, CodeCompletionContext ctx)
-		{
-			int cursor = document.Editor.Caret.Offset;
-			int i = ctx.TriggerOffset;
-			
-			if (i > cursor)
-				return -1;
-			else if (i == cursor)
-				return 1;
-			
-			int parameterIndex = 1;
-			
-			while (i++ < cursor) {
-				char ch = document.Editor.GetCharAt (i-1);
-				if (ch == ',')
-					parameterIndex++;
-				else if (ch == ')')
-					return -1;
-			}
-			
-			return parameterIndex;
-		}
-		
-		/// <summary>
-		/// Get the markup to use to represent the specified method overload
-		/// in the parameter information window.
-		/// </summary>
-		public string GetMethodMarkup (int overload, string[] parameterMarkup, int currentParameter)
-		{
-			string paramTxt = string.Join (", ", parameterMarkup);
-			Symbol function = functions[overload];
-			
-			int len = function.FullyQualifiedName.LastIndexOf (".");
-			string prename = null;
-			string returnType = (function.ReturnType == null)? string.Empty: function.ReturnType.TypeName;
-			
-			if (len > 0)
-				prename = function.FullyQualifiedName.Substring (0, len + 1);
-			
-//			string cons = string.Empty;
-			
-//			if (function.IsConst)
-//				cons = " const";
-
-			return string.Format ("{2} {3}<b>{0}</b>({1})", GLib.Markup.EscapeText (function.Name), 
-			                                                paramTxt, 
-			                                                GLib.Markup.EscapeText (returnType), 
-			                                                GLib.Markup.EscapeText (prename));
-			// return prename + "<b>" + function.Name + "</b>" + " (" + paramTxt + ")" + cons;
-		}
-		
-		/// <summary>
-		/// Get the text to use to represent the specified parameter
-		/// </summary>
-		public string GetParameterMarkup (int overload, int paramIndex)
-		{
-			Symbol function = functions[overload];
-			
-			if (null != function && null != function.Parameters[paramIndex]) {
-				string name = function.Parameters[paramIndex].Name;
-				string type = function.Parameters[paramIndex].TypeName;
-				return GLib.Markup.EscapeText (string.Format ("{1} {0}", name, type));
-			}
-			
-			return string.Empty;
-		}
-		
-		/// <summary>
-		/// Get the number of parameters of the specified method
-		/// </summary>
-		public int GetParameterCount (int overload)
-		{
-			if (null != functions && null != functions[overload] && null != functions[overload].Parameters) {
-				return functions[overload].Parameters.Count;
-			}
-			return 0;
-		}
-	}
-	
-	/// <summary>
-	/// Data for Vala completion
-	/// </summary>
-	internal class CompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
-	{
-		private string image;
-		private string text;
-		private string description;
-		private string completion_string;
-		
-		public CompletionData (Symbol item)
-		{
-			this.text = item.Name;
-			this.completion_string = item.Name;
-			this.description = item.DisplayText;
-			this.image = item.Icon;
-			DisplayFlags = DisplayFlags.None;
-			CompletionCategory = new ValaCompletionCategory (text, image);
-		}
-		
-		public override IconId Icon {
-			get { return image; }
-		}
-		
-		public override string DisplayText {
-			get { return text; }
-		}
-
-		public override string Description {
-			get { return description; }
-		}
-
-		public override string CompletionText {
-			get { return completion_string; }
-		}
-	}
-
-	internal class ValaCompletionDataList: CompletionDataList, IMutableCompletionDataList
-	{
-		public ValaCompletionDataList (): base ()
-		{
-			IsChanging = true;
-			Add (string.Empty);
-		}
-		
-		internal virtual void AddRange (IEnumerable<CompletionData> vals)
-		{
-			foreach (CompletionData item in vals) {
-				Add (item);
-			}
-		}
-		
-		#region IMutableCompletionDataList implementation
-		
-		public event EventHandler Changed;
-		public event EventHandler Changing;
-		
-		
-		public bool IsChanging {
-			get { return isChanging; }
-			set {
-				isChanging = value;
-				if (value){ OnChanging (this, null); }
-				else{ OnChanged (this, null); }
-			}
-		}
-		private bool isChanging;
-		
-		#endregion
-		
-		protected virtual void OnChanging (object sender, EventArgs args)
-		{
-			if (null != Changing) {
-				Changing (sender, args);
-			}
-		}
-		
-		protected virtual void OnChanged (object sender, EventArgs args)
-		{
-			if (null != Changed) {
-				Changed (sender, args);
-			}
-		}
-		
-		public void Dispose ()
-		{
-		}
-	}// ValaCompletionDataList
-	
-	internal class ValaCompletionCategory: CompletionCategory
-	{
-		public ValaCompletionCategory (string text, string image): base (text, image)
-		{
-		}
-		
-		public override int CompareTo (CompletionCategory other)
-		{
-			return DisplayText.CompareTo (other.DisplayText);
-		}
-	}
-}
diff --git a/extras/ValaBinding/Gui/ValaTextEditorExtension.cs b/extras/ValaBinding/Gui/ValaTextEditorExtension.cs
deleted file mode 100644
index 39a1525500..0000000000
--- a/extras/ValaBinding/Gui/ValaTextEditorExtension.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-//
-// ValaTextEditorExtension.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Text;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Threading;
-
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Output;
-
-using MonoDevelop.Core;
-using MonoDevelop.Components;
-
-using Gtk;
-
-using MonoDevelop.ValaBinding.Parser;
-
-namespace MonoDevelop.ValaBinding
-{
-	public class ValaTextEditorExtension : CompletionTextEditorExtension, IPathedDocument
-	{
-		// Allowed chars to be next to an identifier
-		private static char[] allowedChars = new char[] { ' ', '\t', '\r', '\n', 
-			':', '=', '*', '+', '-', '/', '%', ',', '&',
-			'|', '^', '{', '}', '[', ']', '(', ')', '\n', '!', '?', '<', '>'
-		};
-		
-		private static char[] operators = new char[] {
-			'=', '+', '-', ',', '&', '|',
-			'^', '[', '!', '?', '<', '>', ':'
-		};
-		
-		private ProjectInformation Parser {
-			get {
-				ValaProject project = Document.Project as ValaProject;
-				return (null == project)? null: ProjectInformationManager.Instance.Get (project);
-			}
-		}// Parser
-		
-		protected Mono.TextEditor.TextEditorData textEditorData{ get; set; }
-		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
-		{
-			string lineText = Editor.GetLineText (Editor.Caret.Line);
-			
-			// smart formatting strategy
-			if (TextEditorProperties.IndentStyle == IndentStyle.Smart) {
-				if (key == Gdk.Key.Return) {
-					if (lineText.TrimEnd ().EndsWith ("{")) {
-						Editor.InsertAtCaret ("\n" + TextEditorProperties.IndentString + Editor.Document.GetLineIndent (Editor.Caret.Line));
-						return false;
-					}
-				} else if (key == Gdk.Key.braceright && AllWhiteSpace (lineText) 
-				    && lineText.StartsWith (TextEditorProperties.IndentString)) {
-					if (lineText.Length > 0)
-						lineText = lineText.Substring (TextEditorProperties.IndentString.Length);
-					var lineSegment = Editor.Document.GetLine (Editor.Caret.Line);
-					Editor.Replace (lineSegment.Offset, lineSegment.EditableLength, lineText + "}");
-					return false;
-				}
-			}
-			
-			return base.KeyPress (key, keyChar, modifier);
-		}
-		
-		/// <summary>
-		/// Expression to match instance construction/initialization
-		/// </summary>
-		private static Regex initializationRegex = new Regex (@"(((?<typename>\w[\w\d\.<>]*)\s+)?(?<variable>\w[\w\d]*)\s*=\s*)?new\s*(?<constructor>\w[\w\d\.<>]*)?", RegexOptions.Compiled);
-		
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar)
-		{
-			string lineText = null;
-			ProjectInformation parser = Parser;
-			var loc = Editor.Document.OffsetToLocation (completionContext.TriggerOffset);
-			int line = loc.Line, column = loc.Column;
-			switch (completionChar) {
-			case '.': // foo.[complete]
-				lineText = Editor.GetLineText (line);
-				if (column > lineText.Length){ column = lineText.Length; }
-				lineText = lineText.Substring (0, column - 1);
-				
-				string itemName = GetTrailingSymbol (lineText);
-				
-				if (string.IsNullOrEmpty (itemName))
-					return null;
-				
-				return GetMembersOfItem (itemName, line, column);
-			case '\t':
-			case ' ':
-				lineText = Editor.GetLineText (line);
-				if (0 == lineText.Length){ return null; }
-				if (column > lineText.Length){ column = lineText.Length; }
-				lineText = lineText.Substring (0, column-1).Trim ();
-				
-				if (lineText.EndsWith ("new")) {
-					return CompleteConstructor (lineText, line, column);
-				} else if (lineText.EndsWith ("is")) {
-					ValaCompletionDataList list = new ValaCompletionDataList ();
-					ThreadPool.QueueUserWorkItem (delegate {
-						parser.GetTypesVisibleFrom (Document.FileName, line, column, list);
-					});
-					return list;
-				} else if (0 < lineText.Length) {
-					char lastNonWS = lineText[lineText.Length-1];
-					if (0 <= Array.IndexOf (operators, lastNonWS) || 
-				          (1 == lineText.Length && 0 > Array.IndexOf (allowedChars, lastNonWS))) { 
-						return GlobalComplete (completionContext); 
-					}
-				}
-				
-				break;
-			default:
-				if (0 <= Array.IndexOf (operators, completionChar)) {
-					return GlobalComplete (completionContext);
-				}
-				break;
-			}
-			
-			return null;
-		}
-		
-		static string GetTrailingSymbol (string text)
-		{
-				// remove the trailing '.'
-				if (text.EndsWith (".", StringComparison.Ordinal))
-					text = text.Substring (0, text.Length-1);
-				
-				int nameStart = text.LastIndexOfAny (allowedChars);
-				return text.Substring (nameStart+1).Trim ();
-		}
-		
-		/// <summary>
-		/// Perform constructor-specific completion
-		/// </summary>
-		private ValaCompletionDataList CompleteConstructor (string lineText, int line, int column)
-		{
-			ProjectInformation parser = Parser;
-			Match match = initializationRegex.Match (lineText);
-			ValaCompletionDataList list = new ValaCompletionDataList ();
-			
-			ThreadPool.QueueUserWorkItem (delegate {
-				if (match.Success) {
-					// variable initialization
-					if (match.Groups["typename"].Success || "var" != match.Groups["typename"].Value) {
-						// simultaneous declaration and initialization
-						parser.GetConstructorsForType (match.Groups["typename"].Value, Document.FileName, line, column, list);
-					} else if (match.Groups["variable"].Success) {
-						// initialization of previously declared variable
-						parser.GetConstructorsForExpression (match.Groups["variable"].Value, Document.FileName, line, column, list);
-					}
-					if (0 == list.Count) { 
-						// Fallback to known types
-						parser.GetTypesVisibleFrom (Document.FileName, line, column, list);
-					}
-				}
-			});
-			
-			return list;
-		}// CompleteConstructor
-		
-		public override ICompletionDataList CodeCompletionCommand (
-		    CodeCompletionContext completionContext)
-		{
-			if (null == (Document.Project as ValaProject)){ return null; }
-			
-			int pos = completionContext.TriggerOffset;
-			
-			ICompletionDataList list = HandleCodeCompletion(completionContext, Editor.GetTextBetween (pos - 1, pos)[0]);
-			if (null == list) {
-				list = GlobalComplete (completionContext);
-			}
-			return list;
-		}
-		
-		/// <summary>
-		/// Get the members of a symbol
-		/// </summary>
-		private ValaCompletionDataList GetMembersOfItem (string itemFullName, int line, int column)
-		{
-			ProjectInformation info = Parser;
-			if (null == info){ return null; }
-			
-			ValaCompletionDataList list = new ValaCompletionDataList ();
-			ThreadPool.QueueUserWorkItem (delegate {
-				info.Complete (itemFullName, Document.FileName, line, column, list);
-			});
-			return list;
-		}
-		
-		/// <summary>
-		/// Complete all symbols visible from a given location
-		/// </summary>
-		private ValaCompletionDataList GlobalComplete (CodeCompletionContext context)
-		{
-			ProjectInformation info = Parser;
-			if (null == info){ return null; }
-			
-			ValaCompletionDataList list = new ValaCompletionDataList ();
-			var loc = Editor.Document.OffsetToLocation (context.TriggerOffset);
-			ThreadPool.QueueUserWorkItem (delegate {
-				info.GetSymbolsVisibleFrom (Document.FileName, loc.Line + 1, loc.Column + 1, list);
-			});
-			return list;
-		}
-		
-		public override  IParameterDataProvider HandleParameterCompletion (
-		    CodeCompletionContext completionContext, char completionChar)
-		{
-			if (completionChar != '(')
-				return null;
-			
-			ProjectInformation info = Parser;
-			if (null == info){ return null; }
-			
-			int position = Editor.Document.GetLine (Editor.Caret.Line).Offset;
-			string lineText = Editor.GetTextBetween (position, Editor.Caret.Offset - 1).TrimEnd ();
-			string functionName = string.Empty;
-			
-			Match match = initializationRegex.Match (lineText);
-			if (match.Success && match.Groups["constructor"].Success) {
-				string[] tokens = match.Groups["constructor"].Value.Split('.');
-				string overload = tokens[tokens.Length-1];
-				string typename = (match.Groups["typename"].Success? match.Groups["typename"].Value: null);
-				int index = 0;
-				
-				if (1 == tokens.Length || null == typename) {
-					// Ideally if typename is null and token length is longer than 1, 
-					// we have an expression like: var w = new x.y.z(); and 
-					// we would check whether z is the type or if y.z is an overload for type y
-					typename = overload;
-				} else if ("var".Equals (typename, StringComparison.Ordinal)) {
-					typename = match.Groups["constructor"].Value;
-				} else {
-					// Foo.Bar bar = new Foo.Bar.blah( ...
-					for (string[] typeTokens = typename.Split ('.'); index < typeTokens.Length && index < tokens.Length; ++index) {
-						if (!typeTokens[index].Equals (tokens[index], StringComparison.Ordinal)) {
-							break;
-						}
-					}
-					List<string> overloadTokens = new List<string> ();
-					for (int i=index; i<tokens.Length; ++i) {
-						overloadTokens.Add (tokens[i]);
-					}
-					overload = string.Join (".", overloadTokens.ToArray ());
-				} 
-				
-				// HACK: Generics
-				if (0 < (index = overload.IndexOf ("<", StringComparison.Ordinal))) {
-					overload = overload.Substring (0, index);
-				}
-				if (0 < (index = typename.IndexOf ("<", StringComparison.Ordinal))) {
-					typename = typename.Substring (0, index);
-				}
-				
-				// Console.WriteLine ("Constructor: type {0}, overload {1}", typename, overload);
-				return new ParameterDataProvider (Document, info, typename, overload); 
-			} 
-			
-			int nameStart = lineText.LastIndexOfAny (allowedChars) + 1;
-			functionName = lineText.Substring (nameStart).Trim ();
-			return (string.IsNullOrEmpty (functionName)? null: new ParameterDataProvider (Document, info, functionName));
-		}
-		
-		private bool AllWhiteSpace (string lineText)
-		{
-			foreach (char c in lineText)
-				if (!char.IsWhiteSpace (c))
-					return false;
-			
-			return true;
-		}
-		
-		#region IPathedDocument implementation
-		public event EventHandler<DocumentPathChangedEventArgs> PathChanged;
-
-		public Gtk.Widget CreatePathWidget (int index)
-		{
-			PathEntry[] path = CurrentPath;
-			if (null == path || 0 > index || path.Length <= index) {
-				return null;
-			}
-			
-			object tag = path[index].Tag;
-			DropDownBoxListWindow.IListDataProvider provider = null;
-			if (tag is ICompilationUnit) {
-				provider = new CompilationUnitDataProvider (Document);
-			} else {
-				provider = new DataProvider (Document, tag, GetAmbience ());
-			}
-			
-			DropDownBoxListWindow window = new DropDownBoxListWindow (provider);
-			window.SelectItem (tag);
-			return window;
-		}
-
-		public PathEntry[] CurrentPath {
-			get;
-			private set;
-		}
-		
-		protected virtual void OnPathChanged (DocumentPathChangedEventArgs args)
-		{
-			if (null != PathChanged) {
-				PathChanged (this, args);
-			}
-		}
-		#endregion
-		
-		// Yoinked from C# binding
-		void UpdatePath (object sender, Mono.TextEditor.TextDocumentLocationEventArgs e)
-		{
-			var unit = Document.CompilationUnit;
-			if (unit == null)
-				return;
-				
-			var loc = textEditorData.Caret.Location;
-			IType type = unit.GetTypeAt (loc.Line, loc.Column);
-			List<PathEntry> result = new List<PathEntry> ();
-			Ambience amb = GetAmbience ();
-			IMember member = null;
-			INode node = (INode)unit;
-			
-			if (type != null && type.ClassType != ClassType.Delegate) {
-				member = type.GetMemberAt (loc.Line, loc.Column);
-			}
-			
-			if (null != member) {
-				node = member;
-			} else if (null != type) {
-				node = type;
-			}
-			
-			while (node != null) {
-				PathEntry entry;
-				if (node is ICompilationUnit) {
-					if (!Document.ParsedDocument.UserRegions.Any ())
-						break;
-					FoldingRegion reg = Document.ParsedDocument.UserRegions.Where (r => r.Region.Contains (loc.Line, loc.Column)).LastOrDefault ();
-					if (reg == null) {
-						entry = new PathEntry (GettextCatalog.GetString ("No region"));
-					} else {
-						entry = new PathEntry (CompilationUnitDataProvider.Pixbuf, reg.Name);
-					}
-					entry.Position = EntryPosition.Right;
-				} else {
-					entry = new PathEntry (ImageService.GetPixbuf (((IMember)node).StockIcon, IconSize.Menu), amb.GetString ((IMember)node, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates));
-				}
-				entry.Tag = node;
-				result.Insert (0, entry);
-				node = node.Parent;
-			}
-			
-			PathEntry noSelection = null;
-			if (type == null) {
-				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = new CustomNode (Document.CompilationUnit) };
-			} else if (member == null && type.ClassType != ClassType.Delegate) 
-				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = new CustomNode (type) };
-			if (noSelection != null) {
-				result.Add (noSelection);
-			}
-			
-			var prev = CurrentPath;
-			CurrentPath = result.ToArray ();
-			OnPathChanged (new DocumentPathChangedEventArgs (prev));
-		}
-		
-		public override void Initialize ()
-		{
-			base.Initialize ();
-			textEditorData = Document.Editor;
-			UpdatePath (null, null);
-			textEditorData.Caret.PositionChanged += UpdatePath;
-			Document.DocumentParsed += delegate { UpdatePath (null, null); };
-		}
-		
-		// Yoinked from C# binding
-		class CustomNode : MonoDevelop.Projects.Dom.AbstractNode
-		{
-			public CustomNode (INode parent)
-			{
-				this.Parent = parent;
-			}
-		}
-	}
-}
diff --git a/extras/ValaBinding/Makefile.am b/extras/ValaBinding/Makefile.am
deleted file mode 100644
index eb50d3c406..0000000000
--- a/extras/ValaBinding/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-ADDIN_BUILD = $(top_builddir)/build
-ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.ValaBinding.dll
-ASSEMBLY_CONFIG = MonoDevelop.ValaBinding.dll.config
-
-REFS =  \
-	$(GLIB_SHARP_LIBS) \
-	$(GTK_SHARP_LIBS) \
-	$(MONO_ADDINS_LIBS) \
-	$(MONODEVELOP_CORE_ADDINS_LIBS) \
-	$(MONODEVELOP_LIBS) \
-	-r:Mono.Posix \
-	-r:System \
-	-r:System.Xml
-	
-
-FILES =  \
-	AssemblyInfo.cs \
-	Compiler/ICompiler.cs \
-	Compiler/ValaCompiler.cs \
-	gtk-gui/generated.cs \
-	gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs \
-	gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs \
-	gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs \
-	gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs \
-	gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs \
-	gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs \
-	gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs \
-	Gui/AddLibraryDialog.cs \
-	Gui/AddPathDialog.cs \
-	Gui/CodeGenerationPanel.cs \
-	Gui/CompilationUnitDataProvider.cs \
-	Gui/DataProvider.cs \
-	Gui/EditPackagesDialog.cs \
-	Gui/GeneralOptionsPanel.cs \
-	Gui/OutputOptionsPanel.cs \
-	Gui/PackageDetails.cs \
-	Gui/ParameterDataProvider.cs \
-	Gui/ValaTextEditorExtension.cs \
-	Navigation/ClassPadEventArgs.cs \
-	Navigation/LanguageItemCommandHandler.cs \
-	Navigation/LanguageItemEventArgs.cs \
-	Navigation/LanguageItemNodeBuilder.cs \
-	Navigation/ProjectNodeBuilderExtension.cs \
-	Parser/Afrodite.cs \
-	Parser/ProjectInformation.cs \
-	Parser/ProjectInformationManager.cs \
-	Parser/ValaDocumentParser.cs \
-	Project/MakefileHandler.cs \
-	Project/ProjectPackage.cs \
-	Project/ProjectPackageCollection.cs \
-	Project/ProjectPackageEventArgs.cs \
-	Project/ValaCompilationParameters.cs \
-	Project/ValaProject.cs \
-	Project/ValaProjectBinding.cs \
-	Project/ValaProjectConfiguration.cs \
-	Project/ValaProjectServiceExtension.cs \
-	ProjectPad/ProjectNodeExtension.cs \
-	ProjectPad/ProjectPackageNodeBuilder.cs \
-	ProjectPad/ProjectPackagesFolderNodeBuilder.cs \
-	ProjectPad/ProjectReferencesExtension.cs \
-	ValaLanguageBinding.cs
-
-RES =  \
-	gtk-gui/gui.stetic \
-	gtk-gui/objects.xml \
-	icons/Icons.16x16.PrivateUnion \
-	icons/Icons.16x16.ProjectReference \
-	icons/Icons.16x16.ProtectedUnion \
-	icons/Icons.16x16.Union \
-	icons/text-x-vala.16x16.png \
-	icons/text-x-vala.24x24.png \
-	icons/text-x-vala.32x32.png \
-	icons/text-x-vala.48x48.png \
-	icons/vala-icon-32.png \
-	templates/ConsoleValaProject.xpt.xml \
-	templates/EmptyValaProject.xpt.xml \
-	templates/EmptyValaSourceFile.xft.xml \
-	templates/SharedLibraryValaProject.xpt.xml \
-	templates/ValaTestFixture.xpt.xml \
-	templates/Makefile.am.template \
-	templates/Makefile.template \
-	ValaBinding.addin.xml
-
-all: $(ASSEMBLY)
-
-LOCAL_PKGCONFIG=PKG_CONFIG_PATH=../../local-config:$$PKG_CONFIG_PATH
-
-$(ASSEMBLY): $(build_sources) $(build_resources)
-	mkdir -p $(ADDIN_BUILD)
-	$(LOCAL_PKGCONFIG) $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \
-		$(build_resources:%=/resource:%) $(build_sources)
-	cp $(ASSEMBLY_CONFIG) $(ADDIN_BUILD)
-
-valabindinglibdir = $(prefix)/lib/monodevelop/AddIns/BackendBindings
-valabindinglib_DATA = $(ASSEMBLY) $(ASSEMBLY_CONFIG)
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-
-EXTRA_DIST = $(FILES) $(RES) $(ASSEMBLY_CONFIG)
-
-# include $(top_srcdir)/Makefile.include
-
-build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
-build_resources = $(addprefix $(srcdir)/, $(RES))
-build_test_sources = $(addprefix $(srcdir)/, $(TESTFILES)) $(GENERATED_FILES)
-
diff --git a/extras/ValaBinding/Makefile.am.intree b/extras/ValaBinding/Makefile.am.intree
deleted file mode 100644
index a9947bf808..0000000000
--- a/extras/ValaBinding/Makefile.am.intree
+++ /dev/null
@@ -1,86 +0,0 @@
-# This Makefile.am can be used to build ValaBinding as part of the MonoDevelop tree
-# in main/src/addins/
-
-ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
-ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.ValaBinding.dll
-
-REFS =  \
-	$(GLIB_SHARP_LIBS) \
-	$(GTK_SHARP_LIBS) \
-	$(MONO_ADDINS_LIBS) \
-	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
-	-r:$(top_srcdir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Components.dll \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Core.dll \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Core.Gui.dll \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Ide.dll \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Projects.dll \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Projects.Gui.dll \
-	-r:Mono.Posix \
-	-r:System \
-	-r:System.Xml
-	
-
-FILES =  \
-	Compiler/ICompiler.cs \
-	Compiler/ValaCompiler.cs \
-	gtk-gui/generated.cs \
-	gtk-gui/ValaBinding.AddLibraryDialog.cs \
-	gtk-gui/ValaBinding.AddPathDialog.cs \
-	gtk-gui/ValaBinding.CodeGenerationPanel.cs \
-	gtk-gui/ValaBinding.GeneralOptionsPanel.cs \
-	gtk-gui/ValaBinding.OutputOptionsPanel.cs \
-	Gui/AddLibraryDialog.cs \
-	Gui/AddPathDialog.cs \
-	Gui/CodeGenerationPanel.cs \
-	Gui/GeneralOptionsPanel.cs \
-	Gui/OutputOptionsPanel.cs \
-	Project/ProjectPackage.cs \
-	Project/ProjectPackageCollection.cs \
-	Project/ProjectPackageEventArgs.cs \
-	Project/ValaCompilationParameters.cs \
-	Project/ValaProject.cs \
-	Project/ValaProjectBinding.cs \
-	Project/ValaProjectConfiguration.cs \
-	Project/ValaProjectServiceExtension.cs \
-	ValaLanguageBinding.cs
-
-RES =  \
-	gtk-gui/gui.stetic \
-	gtk-gui/objects.xml \
-	icons/Icons.16x16.PrivateUnion \
-	icons/Icons.16x16.ProjectReference \
-	icons/Icons.16x16.ProtectedUnion \
-	icons/Icons.16x16.Union \
-	icons/text-x-vala.16x16.png \
-	icons/text-x-vala.24x24.png \
-	icons/text-x-vala.32x32.png \
-	icons/text-x-vala.48x48.png \
-	icons/vala-icon-32.png \
-	templates/ConsoleValaProject.xpt.xml \
-	templates/EmptyValaProject.xpt.xml \
-	templates/EmptyValaSourceFile.xft.xml \
-	templates/SharedLibraryValaProject.xpt.xml \
-	ValaBinding.addin.xml
-
-if ENABLE_VALA
-all: $(ASSEMBLY)
-else
-all:
-endif
-
-$(ASSEMBLY): $(build_sources) $(build_resources)
-	mkdir -p $(ADDIN_BUILD)
-	$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \
-		$(build_resources:%=/resource:%) $(build_sources)
-
-if ENABLE_VALA
-valabindinglibdir = $(MD_ADDIN_DIR)/BackendBindings
-valabindinglib_DATA = $(ASSEMBLY)
-endif
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-
-EXTRA_DIST = $(FILES) $(RES)
-
-include $(top_srcdir)/Makefile.include
diff --git a/extras/ValaBinding/MonoDevelop.ValaBinding.dll.config b/extras/ValaBinding/MonoDevelop.ValaBinding.dll.config
deleted file mode 100644
index c1544076d7..0000000000
--- a/extras/ValaBinding/MonoDevelop.ValaBinding.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-	<dllmap dll="vala" target="vala-0.12" />
-	<dllmap dll="afrodite" target="afrodite-0.12" />
-</configuration>
diff --git a/extras/ValaBinding/NEWS b/extras/ValaBinding/NEWS
deleted file mode 100644
index e69de29bb2..0000000000
--- a/extras/ValaBinding/NEWS
+++ /dev/null
diff --git a/extras/ValaBinding/Navigation/ClassPadEventArgs.cs b/extras/ValaBinding/Navigation/ClassPadEventArgs.cs
deleted file mode 100644
index 8e46665ed4..0000000000
--- a/extras/ValaBinding/Navigation/ClassPadEventArgs.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// ClassPadEventHandler.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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 MonoDevelop.Projects;
-
-namespace MonoDevelop.ValaBinding.Navigation
-{
-	public delegate void ClassPadEventHandler (ClassPadEventArgs e);
-	
-	public class ClassPadEventArgs : EventArgs
-	{
-		private Project project;
-		
-		public ClassPadEventArgs (Project project)
-		{
-			this.project = project;
-		}
-		
-		public Project Project {
-			get { return project; }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Navigation/LanguageItemCommandHandler.cs b/extras/ValaBinding/Navigation/LanguageItemCommandHandler.cs
deleted file mode 100644
index ba4a622a51..0000000000
--- a/extras/ValaBinding/Navigation/LanguageItemCommandHandler.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// LanguageItemCommandHandler.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using MonoDevelop.ValaBinding.Parser;
-using MonoDevelop.ValaBinding.Parser.Afrodite;
-
-namespace MonoDevelop.ValaBinding.Navigation
-{
-	public class LanguageItemCommandHandler : NodeCommandHandler
-	{
-		/// <summary>
-		/// Jump to a node's declaration when it's activated
-		/// </summary>
-		public override void ActivateItem ()
-		{
-			Symbol item = (Symbol)CurrentNode.DataItem;
-			
-			if (null != item && 0 < item.SourceReferences.Count) {
-				SourceReference reference = item.SourceReferences[0];
-				IdeApp.Workbench.OpenDocument (reference.File, reference.FirstLine, reference.FirstColumn);
-			}
-		}
-	}
-}
diff --git a/extras/ValaBinding/Navigation/LanguageItemEventArgs.cs b/extras/ValaBinding/Navigation/LanguageItemEventArgs.cs
deleted file mode 100644
index 00e804cf91..0000000000
--- a/extras/ValaBinding/Navigation/LanguageItemEventArgs.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// LanguageItemEventArgs.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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 MonoDevelop.ValaBinding.Parser;
-using MonoDevelop.ValaBinding.Parser.Afrodite;
-
-namespace MonoDevelop.ValaBinding.Navigation
-{
-	public delegate void LanguageItemEventHandler (object sender, LanguageItemEventArgs e);
-	
-	public class LanguageItemEventArgs : EventArgs
-	{
-		Symbol item;
-		
-		internal LanguageItemEventArgs (Symbol item)
-		{
-			this.item = item;
-		}
-		
-		internal Symbol Item {
-			get { return item; }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Navigation/LanguageItemNodeBuilder.cs b/extras/ValaBinding/Navigation/LanguageItemNodeBuilder.cs
deleted file mode 100644
index 12fd10b0c1..0000000000
--- a/extras/ValaBinding/Navigation/LanguageItemNodeBuilder.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// LanguageItemNodeBuilder.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2009 Levi Bard
-//
-// This source code is licenced under The MIT License:
-//
-// 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 System.Threading;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using MonoDevelop.ValaBinding.Parser;
-using MonoDevelop.ValaBinding.Parser.Afrodite;
-
-namespace MonoDevelop.ValaBinding.Navigation
-{
-	/// <summary>
-	/// Class pad node builder for all Vala language items
-	/// </summary>
-	public class LanguageItemNodeBuilder: TypeNodeBuilder
-	{
-		//// <value>
-		/// Sort order for nodes
-		/// </value>
-		private static string[] types = { "namespace", "class", "struct", "interface", "property", "method", "signal", "field", "constant", "enum", "other" };
-		
-		public override Type NodeDataType {
-			get { return typeof(Symbol); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Symbol)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                ref string label,
-		                                ref Gdk.Pixbuf icon,
-		                                ref Gdk.Pixbuf closedIcon)
-		{
-			Symbol c = (Symbol)dataObject;
-			label = c.DisplayText;
-			icon = Context.GetIcon (c.Icon);
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			// bool publicOnly = treeBuilder.Options["PublicApiOnly"];
-			Symbol thisSymbol = (Symbol)dataObject;
-
-			foreach (Symbol child in thisSymbol.Children) {
-				treeBuilder.AddChild (child);
-			}
-		}
-
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			Symbol symbol = (Symbol)dataObject;
-			return (null != symbol.Children && 0 < symbol.Children.Count);
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (null != thisNode && null != otherNode) {
-				Symbol thisCN = thisNode.DataItem as Symbol,
-				         otherCN = otherNode.DataItem as Symbol;
-	
-				if (null != thisCN && null != otherCN) {
-					return Array.IndexOf<string>(types, thisCN.MemberType) - 
-					       Array.IndexOf<string>(types, otherCN.MemberType);
-				}
-			}
-
-			return -1;
-		}
-	}
-}
diff --git a/extras/ValaBinding/Navigation/ProjectNodeBuilderExtension.cs b/extras/ValaBinding/Navigation/ProjectNodeBuilderExtension.cs
deleted file mode 100644
index 00dc156310..0000000000
--- a/extras/ValaBinding/Navigation/ProjectNodeBuilderExtension.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// ProjectNodeBuilderExtension.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Threading;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-using MonoDevelop.ValaBinding;
-using MonoDevelop.ValaBinding.Parser;
-using MonoDevelop.ValaBinding.Parser.Afrodite;
-
-namespace MonoDevelop.ValaBinding.Navigation
-{
-	public class ProjectNodeBuilderExtension : NodeBuilderExtension
-	{
-		public ClassPadEventHandler finishedBuildingTreeHandler;
-		
-		public override bool CanBuildNode (Type dataType)
-		{
-			return typeof(ValaProject).IsAssignableFrom (dataType);
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(ProjectNodeBuilderExtensionHandler); }
-		}
-		
-		protected override void Initialize ()
-		{
-			finishedBuildingTreeHandler = (ClassPadEventHandler)DispatchService.GuiDispatch (new ClassPadEventHandler (OnFinishedBuildingTree));
-		}
-		
-		public override void Dispose ()
-		{
-		}
-		
-		public static void CreatePadTree (object o)
-		{
-			ValaProject p = o as ValaProject;
-			if (o == null) return;
-			ProjectInformation pi = ProjectInformationManager.Instance.Get (p);
-			
-			try {
-				foreach (ProjectFile f in p.Files) {
-					if (f.BuildAction == BuildAction.Compile)
-						pi.AddFile (f.FilePath);
-				}
-				foreach (ProjectPackage package in p.Packages) {
-					if(!package.IsProject){ pi.AddPackage (p.Name); }
-				}
-			} catch (IOException) {
-				return;
-			}
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                ref string label,
-		                                ref Gdk.Pixbuf icon,
-		                                ref Gdk.Pixbuf closedIcon)
-		{
-		}
-
-		
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{			
-			ValaProject p = dataObject as ValaProject;
-			if (p == null) return;
-			
-			// bool nestedNamespaces = builder.Options["NestedNamespaces"];
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			// Namespaces
-			foreach (ProjectFile file in p.Files) {
-				foreach (Symbol child in info.GetNamespacesForFile (file.FilePath.FullPath)) {
-					builder.AddChild (child);
-				}
-			}
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		private void OnFinishedBuildingTree (ClassPadEventArgs e)
-		{
-			ITreeBuilder builder = Context.GetTreeBuilder (e.Project);
-			if (null != builder)
-				builder.UpdateChildren ();
-		}
-	}
-	
-	public class ProjectNodeBuilderExtensionHandler : NodeCommandHandler
-	{
-		[CommandHandler (ValaProjectCommands.UpdateClassPad)]
-		public void UpdateClassPad ()
-		{
-			ProjectNodeBuilderExtension.CreatePadTree (CurrentNode.DataItem);
-		}
-	}
-}
diff --git a/extras/ValaBinding/Parser/Afrodite.cs b/extras/ValaBinding/Parser/Afrodite.cs
deleted file mode 100644
index 6eaeec2d5c..0000000000
--- a/extras/ValaBinding/Parser/Afrodite.cs
+++ /dev/null
@@ -1,1176 +0,0 @@
-// 
-// Afrodite.cs
-//  
-// Author:
-//       Levi Bard <levi.bard@emhartglass.com>
-// 
-// Copyright (c) 2010 Levi Bard
-// 
-// 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.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using MonoDevelop.Ide.Gui;
-
-/// <summary>
-/// Wrappers for Afrodite completion library
-/// </summary>
-namespace MonoDevelop.ValaBinding.Parser.Afrodite
-{
-	/// <summary>
-	/// Afrodite completion engine - interface for queueing source and getting CodeDOMs
-	/// </summary>
-	internal class CompletionEngine
-	{
-		public CompletionEngine (string id)
-		{
-			instance = afrodite_completion_engine_new (id);
-		}
-		
-		/// <summary>
-		/// Queue a new source file for parsing
-		/// </summary>
-		public void QueueSourcefile (string path)
-		{
-			QueueSourcefile (path, !string.IsNullOrEmpty (path) && path.EndsWith (".vapi", StringComparison.OrdinalIgnoreCase), false);
-		}
-		
-		/// <summary>
-		/// Queue a new source file for parsing
-		/// </summary>
-		public void QueueSourcefile (string path, bool isVapi, bool isGlib)
-		{
-			afrodite_completion_engine_queue_sourcefile (instance, path, null, isVapi, isGlib);
-		}
-		
-		/// <summary>
-		/// Attempt to acquire the current CodeDOM
-		/// </summary>
-		/// <returns>
-		/// A <see cref="CodeDom"/>: null if unable to acquire
-		/// </returns>
-		public CodeDom TryAcquireCodeDom ()
-		{
-			IntPtr codeDom = afrodite_completion_engine_get_codedom (instance);
-			return (codeDom == IntPtr.Zero)? null: new CodeDom (codeDom, this);
-		}
-		
-		/// <summary>
-		/// Release the given CodeDOM (required for continued parsing)
-		/// </summary>
-		public void ReleaseCodeDom (CodeDom codeDom)
-		{
-			// Obsolete
-		}
-			
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_completion_engine_new (string id);
-		
-		[DllImport("afrodite")]
-		static extern void afrodite_completion_engine_queue_sourcefile (IntPtr instance, string path, string content, 
-		                                                                bool is_vapi, bool is_glib);
-		                                                                
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_completion_engine_get_codedom (IntPtr instance);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Represents a Vala symbol
-	/// </summary>
-	internal class Symbol
-	{
-		public Symbol (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		/// <summary>
-		/// Children of this symbol
-		/// </summary>
-		public List<Symbol> Children {
-			get {
-				List<Symbol> list = new List<Symbol> ();
-				IntPtr children = afrodite_symbol_get_children (instance);
-				
-				if (IntPtr.Zero != children) {
-					list = new ValaList (children).ToTypedList (item => new Symbol (item));
-				}
-				
-				return list;
-			}
-		}
-		
-		/// <summary>
-		/// The type of this symbol
-		/// </summary>
-		public DataType SymbolType {
-			get { 
-				IntPtr datatype = afrodite_symbol_get_symbol_type (instance);
-				return (IntPtr.Zero == datatype)? null: new DataType (afrodite_symbol_get_symbol_type (instance));
-			}
-		}
-		
-		/// <summary>
-		/// The return type of this symbol, if applicable
-		/// </summary>
-		public DataType ReturnType {
-			get { 
-				IntPtr datatype = afrodite_symbol_get_return_type (instance);
-				return (IntPtr.Zero == datatype)? null: new DataType (afrodite_symbol_get_return_type (instance));
-			}
-		}
-		
-		/// <summary>
-		/// The name of this symbol
-		/// </summary>
-		public string Name {
-			get{ return Marshal.PtrToStringAuto (afrodite_symbol_get_display_name (instance)); }
-		}
-		
-		/// <summary>
-		/// The fully qualified name of this symbol
-		/// </summary>
-		public string FullyQualifiedName {
-			get { return Marshal.PtrToStringAuto (afrodite_symbol_get_fully_qualified_name (instance)); }
-		}
-		
-		/// <summary>
-		/// The parent of this symbol
-		/// </summary>
-		public Symbol Parent {
-			get {
-				IntPtr parent = afrodite_symbol_get_parent (instance);
-				return (IntPtr.Zero == parent)? null: new Symbol (parent);
-			}
-		}
-		
-		/// <summary>
-		/// The places where this symbol is declared/defined
-		/// </summary>
-		public List<SourceReference> SourceReferences {
-			get {
-				List<SourceReference> list = new List<SourceReference> ();
-				IntPtr refs = afrodite_symbol_get_source_references (instance);
-				
-				if (IntPtr.Zero != refs) {
-					list = new ValaList (refs).ToTypedList (item => new SourceReference (item));
-				}
-				
-				return list;
-			}
-		}
-		
-		/// <summary>
-		/// The symbol type (class, method, ...) of this symbol
-		/// </summary>
-		public string MemberType {
-			get{ return Utils.GetMemberType (afrodite_symbol_get_member_type (instance)); }
-		}
-		
-		/// <summary>
-		/// The accessibility (public, private, ...) of this symbol
-		/// </summary>
-		public SymbolAccessibility Accessibility {
-			get{ return (SymbolAccessibility)afrodite_symbol_get_access (instance); }
-		}
-		
-		/// <summary>
-		/// The parameters this symbol accepts, if applicable
-		/// </summary>
-		public List<DataType> Parameters {
-			get {
-				List<DataType> list = new List<DataType> ();
-				IntPtr parameters = afrodite_symbol_get_parameters (instance);
-				
-				if (IntPtr.Zero != parameters) {
-					list = new ValaList (parameters).ToTypedList (delegate (IntPtr item){ return new DataType (item); });
-				}
-				
-				return list;
-			}
-		}
-		
-		/// <summary>
-		/// The icon to be used for this symbol
-		/// </summary>
-		public string Icon {
-			get{ return GetIconForType (MemberType, Accessibility); }
-		}
-		
-		/// <summary>
-		/// Descriptive text for this symbol
-		/// </summary>
-		public string DisplayText {
-			get {
-				StringBuilder text = new StringBuilder (Name);
-				List<DataType> parameters = Parameters;
-				if (0 < parameters.Count) {
-					text.AppendFormat ("({0} {1}", parameters[0].TypeName, Parameters[0].Name);
-					for (int i = 1; i < parameters.Count; i++) {
-						text.AppendFormat (", {0} {1}", parameters[i].TypeName, Parameters[i].Name);
-					}
-					text.AppendFormat (")");
-				}
-				if (null != ReturnType && !string.IsNullOrEmpty (ReturnType.TypeName)) {
-					text.AppendFormat (": {0}", ReturnType.TypeName);
-				}
-				
-				return text.ToString ();
-			}
-		}
-		
-		#region Icons
-		
-		private static Dictionary<string,string> publicIcons = new Dictionary<string, string> () {
-			{ "namespace", Stock.NameSpace },
-			{ "class", Stock.Class },
-			{ "struct", Stock.Struct },
-			{ "enum", Stock.Enum },
-			{ "error domain", Stock.Enum },
-			{ "field", Stock.Field },
-			{ "method", Stock.Method },
-			{ "constructor", Stock.Method },
-			{ "creationmethod", Stock.Method },
-			{ "property", Stock.Property },
-			{ "constant", Stock.Literal },
-			{ "enum value", Stock.Literal },
-			{ "error code", Stock.Literal },
-			{ "signal", Stock.Event },
-			{ "delegate", Stock.Delegate },
-			{ "interface", Stock.Interface },
-			{ "other", Stock.Delegate }
-		};
-
-		private static Dictionary<string,string> privateIcons = new Dictionary<string, string> () {
-			{ "namespace", Stock.NameSpace },
-			{ "class", Stock.PrivateClass },
-			{ "struct", Stock.PrivateStruct },
-			{ "enum", Stock.PrivateEnum },
-			{ "error domain", Stock.PrivateEnum },
-			{ "field", Stock.PrivateField },
-			{ "method", Stock.PrivateMethod },
-			{ "constructor", Stock.PrivateMethod },
-			{ "creationmethod", Stock.PrivateMethod },
-			{ "property", Stock.PrivateProperty },
-			{ "constant", Stock.Literal },
-			{ "enum value", Stock.Literal },
-			{ "error code", Stock.Literal },
-			{ "signal", Stock.PrivateEvent },
-			{ "delegate", Stock.PrivateDelegate },
-			{ "interface", Stock.PrivateInterface },
-			{ "other", Stock.PrivateDelegate }
-		};
-
-		private static Dictionary<string,string> protectedIcons = new Dictionary<string, string> () {
-			{ "namespace", Stock.NameSpace },
-			{ "class", Stock.ProtectedClass },
-			{ "struct", Stock.ProtectedStruct },
-			{ "enum", Stock.ProtectedEnum },
-			{ "error domain", Stock.ProtectedEnum },
-			{ "field", Stock.ProtectedField },
-			{ "method", Stock.ProtectedMethod },
-			{ "constructor", Stock.ProtectedMethod },
-			{ "creationmethod", Stock.ProtectedMethod },
-			{ "property", Stock.ProtectedProperty },
-			{ "constant", Stock.Literal },
-			{ "enum value", Stock.Literal },
-			{ "error code", Stock.Literal },
-			{ "signal", Stock.ProtectedEvent },
-			{ "delegate", Stock.ProtectedDelegate },
-			{ "interface", Stock.ProtectedInterface },
-			{ "other", Stock.ProtectedDelegate }
-		};
-
-		private static Dictionary<SymbolAccessibility,Dictionary<string,string>> iconTable = new Dictionary<SymbolAccessibility, Dictionary<string, string>> () {
-			{ SymbolAccessibility.Public, publicIcons },
-			{ SymbolAccessibility.Internal, publicIcons },
-			{ SymbolAccessibility.Private, privateIcons },
-			{ SymbolAccessibility.Protected, protectedIcons }
-		};
-
-		public static string GetIconForType (string nodeType, SymbolAccessibility visibility)
-		{
-			string icon = null;
-			iconTable[visibility].TryGetValue (nodeType.ToLower (), out icon);
-			return icon;
-		}
-
-		#endregion
-		
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_type_name (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_display_name (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_children (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_parent (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_fully_qualified_name (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_source_references (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern int afrodite_symbol_get_access (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_parameters (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern int afrodite_symbol_get_member_type (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_symbol_type (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_symbol_get_return_type (IntPtr instance);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Represents a Vala CodeDOM
-	/// </summary>
-	/// <remarks>
-	/// MUST be disposed for parsing to continue
-	/// </remarks>
-	internal class CodeDom: IDisposable
-	{
-		CompletionEngine engine;
-		
-		/// <summary>
-		/// Create a new CodeDOM wrapper
-		/// </summary>
-		/// <param name="instance">
-		/// A <see cref="IntPtr"/>: The native pointer for this CodeDOM
-		/// </param>
-		/// <param name="engine">
-		/// A <see cref="CompletionEngine"/>: The completion engine to which this CodeDOM belongs
-		/// </param>
-		public CodeDom (IntPtr instance, CompletionEngine engine)
-		{
-			this.instance = instance;
-			this.engine = engine;
-		}
-		
-		public QueryResult GetSymbolsForPath (string path)
-		{
-			return new QueryResult (afrodite_code_dom_get_symbols_for_path (instance, new QueryOptions ().Instance, path));
-		}
-		
-		/// <summary>
-		/// Lookup the symbol at a given location
-		/// </summary>
-		public Symbol LookupSymbolAt (string filename, int line, int column)
-		{
-			IntPtr symbol = afrodite_code_dom_lookup_symbol_at (instance, filename, line, column);
-			return (IntPtr.Zero == symbol)? null: new Symbol (symbol);
-		}
-		
-		/// <summary>
-		/// Lookup a symbol and its parent by fully qualified name
-		/// </summary>
-		public Symbol Lookup (string fully_qualified_name, out Symbol parent)
-		{
-			IntPtr parentInstance = IntPtr.Zero,
-			       result = IntPtr.Zero;
-			
-			result = afrodite_code_dom_lookup (instance, fully_qualified_name, out parentInstance);
-			parent = (IntPtr.Zero == parentInstance)? null: new Symbol (parentInstance);
-			return (IntPtr.Zero == result)? null: new Symbol (result);
-		}
-		
-		/// <summary>
-		/// Lookup a symbol, given a name and source location
-		/// </summary>
-		public Symbol GetSymbolForNameAndPath (string name, string path, int line, int column)
-		{
-			IntPtr result = afrodite_code_dom_get_symbol_for_name_and_path (instance, QueryOptions.Standard ().Instance,
-			                                                           name, path, line, column);
-			if (IntPtr.Zero != result) {
-				QueryResult qresult = new QueryResult (result);
-				if (null != qresult.Children && 0 < qresult.Children.Count)
-					return qresult.Children[0].Symbol;
-			}
-			
-			return null;
-		}
-		
-		/// <summary>
-		/// Get the source files used to create this CodeDOM
-		/// </summary>
-		public List<SourceFile> SourceFiles {
-			get {
-				List<SourceFile> files = new List<SourceFile> ();
-				IntPtr sourceFiles = afrodite_code_dom_get_source_files (instance);
-				
-				if (IntPtr.Zero != sourceFiles) {
-					ValaList list = new ValaList (sourceFiles);
-					files = list.ToTypedList (delegate (IntPtr item){ return new SourceFile (item); });
-				}
-				
-				return files;
-			}
-		}
-		
-		/// <summary>
-		/// Lookup a source file by filename
-		/// </summary>
-		public SourceFile LookupSourceFile (string filename)
-		{
-			IntPtr sourceFile = afrodite_code_dom_lookup_source_file (instance, filename);
-			return (IntPtr.Zero == sourceFile)? null: new SourceFile (sourceFile);
-		}
-		
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		internal IntPtr Instance {
-			get{ return instance; }
-		}
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_code_dom_get_symbols_for_path (IntPtr instance, IntPtr options, string path);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_code_dom_lookup_symbol_at (IntPtr instance, string filename, int line, int column);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_code_dom_lookup (IntPtr instance, string fully_qualified_name, out IntPtr parent);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_code_dom_get_symbol_for_name_and_path (IntPtr instance, IntPtr options,
-		                                                                string symbol_qualified_name, string path,
-		                                                                int line, int column);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_code_dom_get_source_files (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_code_dom_lookup_source_file (IntPtr instance, string filename);
-		
-		#endregion
-		
-		#region IDisposable implementation
-		
-		/// <summary>
-		/// Release this CodeDOM for reuse
-		/// </summary>
-		public void Dispose ()
-		{
-			engine.ReleaseCodeDom (this);
-		}
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Utility class for dumping a CodeDOM to Console.Out
-	/// </summary>
-	internal class CodeDomDumper
-	{
-		public CodeDomDumper ()
-		{
-			instance = afrodite_ast_dumper_new ();
-		}
-		
-		public void Dump (CodeDom codeDom, string filterSymbol)
-		{
-			afrodite_ast_dumper_dump (instance, codeDom.Instance, filterSymbol);
-		}
-		
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_ast_dumper_new ();
-		
-		[DllImport("afrodite")]
-		static extern void afrodite_ast_dumper_dump (IntPtr instance, IntPtr codeDom, string filterSymbol);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Wrapper class for Afrodite query results
-	/// </summary>
-	internal class QueryResult
-	{
-		public QueryResult (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		/// <summary>
-		/// ResultItems contained in this query result
-		/// </summary>
-		public List<ResultItem> Children {
-			get {
-				List<ResultItem> list = new List<ResultItem> ();
-				IntPtr children = afrodite_query_result_get_children (instance);
-				
-				if (IntPtr.Zero != children) {
-					list = new ValaList (children).ToTypedList (delegate (IntPtr item){ return new ResultItem (item); });
-				}
-				
-				return list;
-			}
-		}
-		
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		internal IntPtr Instance {
-			get{ return instance; }
-		}
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_query_result_get_children (IntPtr instance);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// A single result from a query
-	/// </summary>
-	internal class ResultItem
-	{
-		public ResultItem (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		public Symbol Symbol {
-			get {
-				IntPtr symbol = afrodite_result_item_get_symbol (instance);
-				return (IntPtr.Zero == symbol)? null: new Symbol (symbol);
-			}
-		}
-		
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		internal IntPtr Instance {
-			get{ return instance; }
-		}
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_result_item_get_symbol (IntPtr instance);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Options for querying a CodeDOM
-	/// </summary>
-	internal class QueryOptions
-	{
-		public QueryOptions (): this (afrodite_query_options_new ())
-		{
-		}
-		
-		public QueryOptions (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		public static QueryOptions Standard ()
-		{
-			return new QueryOptions (afrodite_query_options_standard ());
-		}
-		
-		#region P/Invokes
-		
-		IntPtr instance;
-		
-		internal IntPtr Instance {
-			get{ return instance; }
-		}
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_query_options_new ();
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_query_options_standard ();
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// IEnumerator wrapper for (Gee|Vala).Iterator
-	/// </summary>
-	internal class ValaEnumerator: IEnumerator<IntPtr>
-	{
-		public ValaEnumerator (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		#region IDisposable implementation
-
-		public void Dispose ()
-		{
-		}
-		
-		#endregion
-		
-		#region IEnumerator implementation
-		
-		object IEnumerator.Current {
-			get { return ((IEnumerator<IntPtr>)this).Current; }
-		}
-		
-		
-		public bool MoveNext ()
-		{
-			return vala_iterator_next (instance);
-		}
-		
-		
-		public void Reset ()
-		{
-			throw new System.NotImplementedException();
-		}
-		
-		#endregion
-		
-		#region IEnumerator[System.IntPtr] implementation
-		
-		IntPtr IEnumerator<IntPtr>.Current {
-			get { return vala_iterator_get (instance); }
-		}
-		
-		#endregion
-		                                              
-		#region P/Invoke
-		                                              
-		IntPtr instance;
-		                                              
-		[DllImport("vala")]
-		static extern bool vala_iterator_next (IntPtr instance);
-		
-		[DllImport("vala")]
-		static extern IntPtr vala_iterator_get (IntPtr instance);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// IList wrapper for (Gee|Vala).List
-	/// </summary>
-	internal class ValaList: IList<IntPtr>
-	{
-		public ValaList (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		#region ICollection[System.IntPtr] implementation
-		
-		public void Add (IntPtr item)
-		{
-			vala_collection_add (instance, item);
-		}
-		
-		
-		public void Clear ()
-		{
-			vala_collection_clear (instance);
-		}
-		
-		
-		public bool Contains (IntPtr item)
-		{
-			return vala_collection_contains (instance, item);
-		}
-		
-		
-		public void CopyTo (IntPtr[] array, int arrayIndex)
-		{
-			if (Count < array.Length - arrayIndex)
-				throw new ArgumentException ("Destination array too small", "array");
-			for (int i=0; i<Count; ++i)
-				array[i+arrayIndex] = this[i];
-		}
-		
-		
-		public int Count {
-			get { 
-				return vala_collection_get_size (instance); 
-			}
-		}
-		
-		
-		public bool IsReadOnly {
-			get { return false; }
-		}
-		
-		
-		public bool Remove (IntPtr item)
-		{
-			return vala_collection_remove (instance, item);
-		}
-		
-		#endregion
-		
-		#region IEnumerable implementation
-		
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return ((IEnumerable<IntPtr>)this).GetEnumerator ();
-		}
-		
-		#endregion
-		
-		#region IList[System.IntPtr] implementation
-		
-		public int IndexOf (IntPtr item)
-		{
-			return vala_list_index_of (instance, item);
-		}
-		
-		
-		public void Insert (int index, IntPtr item)
-		{
-			vala_list_insert (instance, index, item);
-		}
-		
-		
-		public IntPtr this[int index] {
-			get { return vala_list_get (instance, index); }
-			set { vala_list_set (instance, index, value); }
-		}
-		
-		
-		public void RemoveAt (int index)
-		{
-			vala_list_remove_at (instance, index);
-		}
-		
-		#endregion
-		
-		#region IEnumerable[System.IntPtr] implementation
-		IEnumerator<IntPtr> IEnumerable<IntPtr>.GetEnumerator ()
-		{
-			return new ValaEnumerator (vala_iterable_iterator (instance));
-		}
-		
-		#endregion
-		
-		internal List<T> ToTypedList<T> (Func<IntPtr,T> factory)
-		{
-			List<T> list = new List<T> (Math.Max (0, Count));
-			foreach (IntPtr item in this) {
-				list.Add (factory (item));
-			}
-			return list;
-		}
-
-		#region P/Invoke
-		
-		IntPtr instance;
-
-		[DllImport("vala")]
-		static extern bool vala_collection_add (IntPtr instance, IntPtr item);
-		
-		[DllImport("vala")]
-		static extern void vala_collection_clear (IntPtr instance);
-		
-		[DllImport("vala")]
-		static extern bool vala_collection_contains (IntPtr instance, IntPtr item);
-		
-		[DllImport("vala")]
-		static extern int vala_collection_get_size (IntPtr instance);
-		
-		[DllImport("vala")]
-		static extern bool vala_collection_remove (IntPtr instance, IntPtr item);
-		
-		[DllImport("vala")]
-		static extern IntPtr vala_iterable_iterator (IntPtr instance);
-		
-		[DllImport("vala")]
-		static extern int vala_list_index_of (IntPtr instance, IntPtr item);
-		
-		[DllImport("vala")]
-		static extern void vala_list_insert (IntPtr instance, int index, IntPtr item);
-		
-		[DllImport("vala")]
-		static extern IntPtr vala_list_get (IntPtr instance, int index);
-		
-		[DllImport("vala")]
-		static extern void vala_list_set (IntPtr instance, int index, IntPtr item);
-		
-		[DllImport("vala")]
-		static extern void vala_list_remove_at (IntPtr instance, int index);
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Class to represent a CodeDOM source file
-	/// </summary>
-	internal class SourceFile
-	{
-		public SourceFile (string filename)
-		      :this (afrodite_source_file_new (filename))
-		{
-		}
-		
-		public SourceFile (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		/// <summary>
-		/// Symbols declared in this source file
-		/// </summary>
-		public List<Symbol> Symbols {
-			get {
-				List<Symbol> list = new List<Symbol> ();
-				IntPtr symbols = afrodite_source_file_get_symbols (instance);
-				
-				if (IntPtr.Zero != symbols) {
-					list = new ValaList (symbols).ToTypedList (delegate (IntPtr item){ return new Symbol (item); });
-				}
-				
-				return list;
-			}
-		}
-		
-		/// <summary>
-		/// Using directives in this source file
-		/// </summary>
-		public List<DataType> UsingDirectives {
-			get {
-				List<DataType> list = new List<DataType> ();
-				IntPtr symbols = afrodite_source_file_get_using_directives (instance);
-				
-				if (IntPtr.Zero != symbols) {
-					list = new ValaList (symbols).ToTypedList (item => new DataType (item));
-				}
-				
-				return list;
-			}
-		}
-		
-		/// <summary>
-		/// The name of this source file
-		/// </summary>
-		public string Name {
-			get{ return Marshal.PtrToStringAuto (afrodite_source_file_get_filename (instance)); }
-		}
-		
-		#region P/Invoke
-		                                              
-		IntPtr instance;
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_source_file_new (string filename);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_source_file_get_filename (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_source_file_get_symbols (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_source_file_get_using_directives (IntPtr instance);
-		
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Represents an Afrodite symbol data type
-	/// </summary>
-	internal class DataType
-	{
-		public DataType (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		/// <summary>
-		/// Get the raw name of this datatype
-		/// </summary>
-		public string Name {
-			get{ return Marshal.PtrToStringAuto (afrodite_data_type_get_name (instance)); }
-		}
-		
-		/// <summary>
-		/// Get the descriptive type name (ref Gee.List<string>[]?) for this datatype
-		/// </summary>
-		public string TypeName {
-			get {
-				StringBuilder text = new StringBuilder ();
-				
-				// prefix out/ref
-				if (IsOut) {
-					text.Append ("out ");
-				} else if (IsRef) {
-					text.Append ("ref ");
-				}
-				
-				text.Append (Marshal.PtrToStringAuto (afrodite_data_type_get_type_name (instance)));
-				
-				if (IsGeneric) {
-					text.Append ("<");
-					List<DataType> parameters = GenericTypes;
-					if (parameters != null && parameters.Count > 0) {
-						text.Append (parameters[0].TypeName);
-						for (int i = 0; i < parameters.Count; i++) {
-							text.AppendFormat (",{0}", parameters[i].TypeName);
-						}
-					}
-					text.Append (">");
-				}
-				
-				if (IsArray) { text.Append ("[]"); }
-				if (IsNullable){ text.Append ("?"); }
-				if (IsPointer){ text.Append ("*"); }
-				
-				return text.ToString ();
-			}
-		}
-		
-		/// <summary>
-		/// Get the symbol for this datatype
-		/// </summary>
-		public Symbol Symbol {
-			get {
-				IntPtr symbol = afrodite_data_type_get_symbol (instance);
-				return (IntPtr.Zero == symbol)? null: new Symbol (symbol);
-			}
-		}
-		
-		/// <summary>
-		/// Whether this datatype is an array
-		/// </summary>
-		public bool IsArray {
-			get{ return afrodite_data_type_get_is_array (instance); }
-		}
-		
-		/// <summary>
-		/// Whether this datatype is a pointer
-		/// </summary>
-		public bool IsPointer {
-			get{ return afrodite_data_type_get_is_pointer (instance); }
-		}
-		
-		/// <summary>
-		/// Whether this datatype is nullable
-		/// </summary>
-		public bool IsNullable {
-			get{ return afrodite_data_type_get_is_nullable (instance); }
-		}
-		
-		/// <summary>
-		/// Whether this is an out datatype
-		/// </summary>
-		public bool IsOut {
-			get{ return afrodite_data_type_get_is_out (instance); }
-		}
-		
-		/// <summary>
-		/// Whether this is a ref datatype
-		/// </summary>
-		public bool IsRef {
-			get{ return afrodite_data_type_get_is_ref (instance); }
-		}
-		
-		/// <summary>
-		/// Whether this datatype is generic
-		/// </summary>
-		public bool IsGeneric {
-			get{ return afrodite_data_type_get_is_generic (instance); }
-		}
-		
-		/// <summary>
-		/// Type list for generic datatypes (e.g. HashMap<KeyType,ValueType>)
-		/// </summary>
-		public List<DataType> GenericTypes {
-			get {
-				List<DataType> list = new List<DataType> ();
-				IntPtr types = afrodite_data_type_get_generic_types (instance);
-				
-				if (IntPtr.Zero != types) {
-					list = new ValaList (types).ToTypedList (item => new DataType (item));
-				}
-				
-				return list;
-			}
-		}
-		
-		#region P/Invoke
-		                                              
-		IntPtr instance;
-		                                              
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_data_type_get_type_name (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_data_type_get_name (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_data_type_get_symbol (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_data_type_get_generic_types (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern bool afrodite_data_type_get_is_array (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern bool afrodite_data_type_get_is_pointer (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern bool afrodite_data_type_get_is_nullable (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern bool afrodite_data_type_get_is_out (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern bool afrodite_data_type_get_is_ref (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern bool afrodite_data_type_get_is_generic (IntPtr instance);
-		
-		
-		#endregion
-	}
-	
-	/// <summary>
-	/// Class to represent a reference area in a source file
-	/// </summary>
-	internal class SourceReference
-	{
-		public SourceReference (IntPtr instance)
-		{
-			this.instance = instance;
-		}
-		
-		public string File {
-			get { 
-				IntPtr sourcefile = afrodite_source_reference_get_file (instance);
-				return (IntPtr.Zero == sourcefile)? string.Empty: new SourceFile (sourcefile).Name;
-			}
-		}
-		
-		public int FirstLine {
-			get{ return afrodite_source_reference_get_first_line (instance); }
-		}
-		
-		public int LastLine {
-			get{ return afrodite_source_reference_get_last_line (instance); }
-		}
-		
-		public int FirstColumn {
-			get{ return afrodite_source_reference_get_first_column (instance); }
-		}
-		
-		public int LastColumn {
-			get{ return afrodite_source_reference_get_last_column (instance); }
-		}
-		
-		#region P/Invoke
-		                                              
-		IntPtr instance;
-		                                              
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_source_reference_get_file (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern int afrodite_source_reference_get_first_line (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern int afrodite_source_reference_get_last_line (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern int afrodite_source_reference_get_first_column (IntPtr instance);
-		
-		[DllImport("afrodite")]
-		static extern int afrodite_source_reference_get_last_column (IntPtr instance);
-		
-		
-		#endregion
-	}
-	
-	// From afrodite.vapi
-	public enum SymbolAccessibility {
-		Private = 0x1,
-		Internal = 0x2,
-		Protected = 0x4,
-		Public = 0x8,
-		Any = 0x10
-	}
-	
-	/// <summary>
-	/// Wrapper class for Afrodite.Utils namespace
-	/// </summary>
-	internal static class Utils
-	{
-		/// <summary>
-		/// Get a list of vapi files for a given package
-		/// </summary>
-		public static List<string> GetPackagePaths (string package)
-		{
-			List<string> list = new List<string> ();
-			IntPtr paths = afrodite_utils_get_package_paths (package, IntPtr.Zero, null);
-			if (IntPtr.Zero != paths)
-				list = new ValaList (paths).ToTypedList (delegate(IntPtr item){ return Marshal.PtrToStringAuto (item); });
-				
-			return list;
-		}
-		
-		public static string GetMemberType (int memberType)
-		{
-			return Marshal.PtrToStringAuto (afrodite_utils_symbols_get_symbol_type_description (memberType));
-		}
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_utils_get_package_paths (string package, IntPtr codeContext, string[] vapiDirs);
-		
-		[DllImport("afrodite")]
-		static extern IntPtr afrodite_utils_symbols_get_symbol_type_description (int memberType);
-	}
-}
-
diff --git a/extras/ValaBinding/Parser/ProjectInformation.cs b/extras/ValaBinding/Parser/ProjectInformation.cs
deleted file mode 100644
index 31b0baee80..0000000000
--- a/extras/ValaBinding/Parser/ProjectInformation.cs
+++ /dev/null
@@ -1,416 +0,0 @@
-//
-// ProjectInformation.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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 System.Diagnostics;
-using System.IO;
-using System.Threading;
-using System.Text;
-using System.Text.RegularExpressions;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide.CodeCompletion;
-
-namespace MonoDevelop.ValaBinding.Parser
-{
-	/// <summary>
-	/// Class to obtain parse information for a project
-	/// </summary>
-	public class ProjectInformation
-	{
-		private bool vtgInstalled = false;
-		private bool checkedVtgInstalled = false;
-		
-		private Afrodite.CompletionEngine engine;
-		
-		static readonly string[] containerTypes = new string[]{ "class", "struct", "interface" };
-
-		public Project Project{ get; set; }
-		
-		//// <value>
-		/// Checks whether <see cref="http://code.google.com/p/vtg/">Vala Toys for GEdit</see> 
-		/// is installed.
-		/// </value>
-		bool DepsInstalled {
-			get {
-				if (!checkedVtgInstalled) {
-					checkedVtgInstalled = true;
-					vtgInstalled = false;
-					try {
-						Afrodite.Utils.GetPackagePaths ("glib-2.0");
-						return (vtgInstalled = true);
-					} catch (DllNotFoundException) {
-						LoggingService.LogWarning ("Cannot update Vala parser database because libafrodite (VTG) is not installed: {0}{1}{2}{3}", 
-						                           Environment.NewLine, "http://code.google.com/p/vtg/",
-						                           Environment.NewLine, "Note: If you're using Vala 0.10 or higher, you may need to symlink libvala-YOUR_VERSION.so to libvala.so");
-					} catch (Exception ex) {
-						LoggingService.LogError ("ValaBinding: Error while checking for libafrodite", ex);
-					}
-				}
-				return vtgInstalled;
-			}
-			set {
-				//don't assume that the caller is correct :-)
-				if (value)
-					checkedVtgInstalled = false; //will re-determine on next getting
-				else
-					vtgInstalled = false;
-			}
-		}
-
-		public ProjectInformation (Project project)
-		{
-			this.Project = project;
-			string projectName = (null == project)? "NoExistingProject": project.Name;
-			
-			if (DepsInstalled) {
-				engine = new Afrodite.CompletionEngine (projectName);
-			}
-		}
-		
-		/// <summary>
-		/// Gets the completion list for a given type name in a given file
-		/// </summary>
-		internal List<Afrodite.Symbol> CompleteType (string typename, string filename, int linenum, int column, ValaCompletionDataList results)
-		{
-			List<Afrodite.Symbol> nodes = new List<Afrodite.Symbol> ();
-			if (!DepsInstalled){ return nodes; }
-			
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null != parseTree) {
-					Afrodite.Symbol symbol = parseTree.GetSymbolForNameAndPath (typename, filename, linenum, column);
-					if (null == symbol){ LoggingService.LogDebug ("CompleteType: Unable to lookup {0} in {1} at {2}:{3}", typename, filename, linenum, column); }
-					else{ nodes = symbol.Children; }
-				} else {
-					LoggingService.LogDebug ("CompleteType: Unable to acquire codedom");
-				}
-			}
-			
-			return nodes;
-		}
-
-		/// <summary>
-		/// Adds a file to be parsed
-		/// </summary>
-		public void AddFile (string filename)
-		{
-			if (vtgInstalled) {
-				LoggingService.LogDebug ("Adding file {0}", filename);
-				engine.QueueSourcefile (filename, filename.EndsWith (".vapi", StringComparison.OrdinalIgnoreCase), false);
-			}
-		}// AddFile
-
-		/// <summary>
-		/// Removes a file from the parse list
-		/// </summary>
-		public void RemoveFile (string filename)
-		{
-			// Not currently possible with Afrodite completion engine
-		}// RemoveFile
-
-		/// <summary>
-		/// Adds a package to be parsed
-		/// </summary>
-		public void AddPackage (string packagename)
-		{
-			if (!DepsInstalled){ return; }
-			
-			if ("glib-2.0".Equals (packagename, StringComparison.Ordinal)) {
-				LoggingService.LogDebug ("AddPackage: Skipping {0}", packagename);
-				return;
-			} else {
-				LoggingService.LogDebug ("AddPackage: Adding package {0}", packagename);
-			}
-			
-			foreach (string path in Afrodite.Utils.GetPackagePaths (packagename)) {
-				LoggingService.LogDebug ("AddPackage: Queueing {0} for package {1}", path, packagename);
-				engine.QueueSourcefile (path, true, false);
-			}
-		}// AddPackage
-
-		/// <summary>
-		/// Gets the completion list for a given symbol at a given location
-		/// </summary>
-		internal List<Afrodite.Symbol> Complete (string symbol, string filename, int line, int column, ValaCompletionDataList results)
-		{
-			List<Afrodite.Symbol> nodes = new List<Afrodite.Symbol> ();
-			if (!DepsInstalled){ return nodes; }
-			
-			
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null != parseTree) {
-					LoggingService.LogDebug ("Complete: Looking up symbol at {0}:{1}:{2}", filename, line, column);
-					Afrodite.Symbol sym = parseTree.GetSymbolForNameAndPath (symbol, filename, line, column);
-					LoggingService.LogDebug ("Complete: Got {0}", (null == sym)? "null": sym.Name);
-					if (null != sym) {
-						nodes = sym.Children;
-						AddResults (nodes, results);
-					}
-				} else {
-					LoggingService.LogDebug ("Complete: Unable to acquire codedom");
-				}
-			}
-			
-			return nodes;
-		}// Complete
-		
-		internal Afrodite.Symbol GetFunction (string name, string filename, int line, int column)
-		{
-			if (!DepsInstalled){ return null; }
-			
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null != parseTree) {
-					LoggingService.LogDebug ("GetFunction: Looking up symbol at {0}:{1}:{2}", filename, line, column);
-					Afrodite.Symbol symbol = parseTree.GetSymbolForNameAndPath (name, filename, line, column);
-					LoggingService.LogDebug ("GetFunction: Got {0}", (null == symbol)? "null": symbol.Name);
-					return symbol;
-				} else {
-					LoggingService.LogDebug ("GetFunction: Unable to acquire codedom");
-				}
-			}
-
-			return null;
-		}
-
-		/// <summary>
-		/// Get the type of a given expression
-		/// </summary>
-		public string GetExpressionType (string symbol, string filename, int line, int column)
-		{
-			if (!DepsInstalled){ return symbol; }
-			
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null != parseTree) {
-					LoggingService.LogDebug ("GetExpressionType: Looking up symbol at {0}:{1}:{2}", filename, line, column);
-					Afrodite.Symbol sym = parseTree.LookupSymbolAt (filename, line, column);
-					if (null != sym) {
-						LoggingService.LogDebug ("Got {0}", sym.SymbolType.TypeName);
-						return sym.SymbolType.TypeName;
-					}
-				} else {
-					LoggingService.LogDebug ("GetExpressionType: Unable to acquire codedom");
-				}
-			}
-
-			return symbol;
-		}// GetExpressionType
-		
-		/// <summary>
-		/// Get overloads for a method
-		/// </summary>
-		internal List<Afrodite.Symbol> GetOverloads (string name, string filename, int line, int column)
-		{
-			List<Afrodite.Symbol> overloads = new List<Afrodite.Symbol> ();
-			if (!DepsInstalled){ return overloads; }
-			
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null != parseTree) {
-					Afrodite.Symbol symbol = parseTree.GetSymbolForNameAndPath (name, filename, line, column);
-					overloads = new List<Afrodite.Symbol> (){ symbol };
-				} else {
-					LoggingService.LogDebug ("GetOverloads: Unable to acquire codedom");
-				}
-			}
-			
-			return overloads;
-		}// GetOverloads
-		
-		/// <summary>
-		/// Get constructors for a given type
-		/// </summary>
-		internal List<Afrodite.Symbol> GetConstructorsForType (string typename, string filename, int line, int column, ValaCompletionDataList results)
-		{
-			List<Afrodite.Symbol> functions = new List<Afrodite.Symbol> ();
-			foreach (Afrodite.Symbol node in CompleteType (typename, filename, line, column, null)) {
-				if ("constructor".Equals (node.MemberType, StringComparison.OrdinalIgnoreCase) || 
-				      "creationmethod".Equals (node.MemberType, StringComparison.OrdinalIgnoreCase)) {
-					functions.Add (node);
-				}
-			}
-			
-			AddResults ((IList<Afrodite.Symbol>)functions, results);
-			
-			return functions;
-		}// GetConstructorsForType
-		
-		/// <summary>
-		/// Get constructors for a given expression
-		/// </summary>
-		internal List<Afrodite.Symbol> GetConstructorsForExpression (string expression, string filename, int line, int column, ValaCompletionDataList results)
-		{
-			string typename = GetExpressionType (expression, filename, line, column);
-			return GetConstructorsForType (typename, filename, line, column, results);
-		}// GetConstructorsForExpression
-		
-		/// <summary>
-		/// Get types visible from a given source location
-		/// </summary>
-		internal void GetTypesVisibleFrom (string filename, int line, int column, ValaCompletionDataList results)
-		{
-			if (!DepsInstalled){ return; }
-			
-			// Add contents of parents
-			ICollection<Afrodite.Symbol> containers = GetClassesForFile (filename);
-			AddResults (containers, results);
-			foreach (Afrodite.Symbol klass in containers) {
-				// TODO: check source references once afrodite reliably captures the entire range
-				for (Afrodite.Symbol parent = klass.Parent;
-				     parent != null;
-				     parent = parent.Parent)
-				{
-					AddResults (parent.Children.FindAll (delegate (Afrodite.Symbol sym){
-						return 0 <= Array.IndexOf (containerTypes, sym.MemberType.ToLower ());
-					}), results);
-				}
-			}
-				
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null == parseTree){ return; }
-				
-				AddResults (GetNamespacesForFile (filename), results);
-				AddResults (GetClassesForFile (filename), results);
-				Afrodite.SourceFile file = parseTree.LookupSourceFile (filename);
-				if (null != file) {
-					Afrodite.Symbol parent;
-					foreach (Afrodite.DataType directive in file.UsingDirectives) {
-						if (directive.Symbol == null) { continue; }
-						Afrodite.Symbol ns = parseTree.Lookup (directive.Symbol.FullyQualifiedName, out parent);
-						if (null != ns) {
-							containers = new List<Afrodite.Symbol> ();
-							AddResults (new Afrodite.Symbol[]{ ns }, results);
-							foreach (Afrodite.Symbol child in ns.Children) {
-								foreach (string containerType in containerTypes) {
-									if (containerType.Equals (child.MemberType, StringComparison.OrdinalIgnoreCase))
-										containers.Add (child);
-								}
-							}
-							AddResults (containers, results);
-						}
-					}
-				}
-			}
-		}// GetTypesVisibleFrom
-		
-		/// <summary>
-		/// Get symbols visible from a given source location
-		/// </summary>
-		internal void GetSymbolsVisibleFrom (string filename, int line, int column, ValaCompletionDataList results) 
-		{
-			GetTypesVisibleFrom (filename, line, column, results);
-			Complete ("this", filename, line, column, results);
-		}// GetSymbolsVisibleFrom
-		
-		/// <summary>
-		/// Add results to a ValaCompletionDataList on the GUI thread
-		/// </summary>
-		private static void AddResults (IEnumerable<Afrodite.Symbol> list, ValaCompletionDataList results) 
-		{
-			if (null == list || null == results)
-			{
-				LoggingService.LogDebug ("AddResults: null list or results!");
-				return;
-			}
-			
-			List<CompletionData> data = new List<CompletionData> ();
-			foreach (Afrodite.Symbol symbol in list) {
-				data.Add (new CompletionData (symbol));
-			}
-			
-			DispatchService.GuiDispatch (delegate {
-				results.IsChanging = true;
-				results.AddRange (data);
-				results.IsChanging = false;
-			});
-		}// AddResults
-		
-		/// <summary>
-		/// Get a list of classes declared in a given file
-		/// </summary>
-		internal List<Afrodite.Symbol> GetClassesForFile (string file)
-		{
-			return GetSymbolsForFile (file, containerTypes);
-		}// GetClassesForFile
-		
-		/// <summary>
-		/// Get a list of namespaces declared in a given file
-		/// </summary>
-		internal List<Afrodite.Symbol> GetNamespacesForFile (string file)
-		{
-			return GetSymbolsForFile (file, new string[]{ "namespace" });
-		}
-		
-		/// <summary>
-		/// Get a list of symbols declared in a given file
-		/// </summary>
-		/// <param name="file">
-		/// A <see cref="System.String"/>: The file to check
-		/// </param>
-		/// <param name="desiredTypes">
-		/// A <see cref="IEnumerable<System.String>"/>: The types of symbols to allow
-		/// </param>
-		List<Afrodite.Symbol> GetSymbolsForFile (string file, IEnumerable<string> desiredTypes)
-		{
-			List<Afrodite.Symbol> symbols = null;
-			List<Afrodite.Symbol> classes = new List<Afrodite.Symbol> ();
-			
-			if (!DepsInstalled){ return classes; }
-			
-			using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
-				if (null != parseTree){
-					Afrodite.SourceFile sourceFile = parseTree.LookupSourceFile (file);
-					if (null != sourceFile) {
-						symbols = sourceFile.Symbols;
-						if (null != symbols) {
-							foreach (Afrodite.Symbol symbol in symbols) {
-								foreach (string containerType in desiredTypes) {
-									if (containerType.Equals (symbol.MemberType, StringComparison.OrdinalIgnoreCase))
-										classes.Add (symbol);
-								}
-							}
-						}
-					} else {
-						LoggingService.LogDebug ("GetClassesForFile: Unable to lookup source file {0}", file);
-					}
-				} else {
-					LoggingService.LogDebug ("GetClassesForFile: Unable to acquire codedom");
-				}
-				
-			}
-			
-			return classes;
-		}
-	}
-}
diff --git a/extras/ValaBinding/Parser/ProjectInformationManager.cs b/extras/ValaBinding/Parser/ProjectInformationManager.cs
deleted file mode 100644
index e4cd1be210..0000000000
--- a/extras/ValaBinding/Parser/ProjectInformationManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// ProjectInformationManager.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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 MonoDevelop.Projects;
-
-namespace MonoDevelop.ValaBinding.Parser
-{
-	/// <summary>
-	/// Singleton class to manage the navigation information of each project
-	/// </summary>
-	public class ProjectInformationManager
-	{
-		private static ProjectInformationManager instance;
-		private List<ProjectInformation> projects = new List<ProjectInformation> ();
-		
-		private ProjectInformationManager ()
-		{
-		}
-
-		/// <summary>
-		/// Gets or creates the ProjectInformation for a given project
-		/// </summary>
-		public ProjectInformation Get (Project project)
-		{
-			foreach (ProjectInformation p in projects) {
-				if (project == p.Project || (null != project && project.Equals (p.Project))) {
-					return p;
-				}
-			}
-			
-			ProjectInformation newinfo = new ProjectInformation (project);
-			projects.Add (newinfo);
-			
-			return newinfo;
-		}
-		
-		public static ProjectInformationManager Instance {
-			get { 
-				if (instance == null)
-					instance = new ProjectInformationManager ();
-
-				return instance;
-			}
-		}
-	}
-}
diff --git a/extras/ValaBinding/Parser/ValaDocumentParser.cs b/extras/ValaBinding/Parser/ValaDocumentParser.cs
deleted file mode 100644
index adae51b34a..0000000000
--- a/extras/ValaBinding/Parser/ValaDocumentParser.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 
-// ValaDocumentParser.cs
-//  
-// Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-// Copyright (c) 2009 Levi Bard
-// 
-// 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.IO;
-using System.Collections.Generic;
-using System.Threading;
-
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
-
-using MonoDevelop.ValaBinding.Parser.Afrodite;
-
-namespace MonoDevelop.ValaBinding.Parser
-{
-	/// <summary>
-	/// Parser for Vala source and vapi files
-	/// </summary>
-	public class ValaDocumentParser: AbstractParser
-	{
-		private ParsedDocument lastGood;
-		
-		public override ParsedDocument Parse (ProjectDom dom, string fileName, string content)
-		{
-			ParsedDocument doc = new ParsedDocument (fileName);
-			ProjectInformation pi = ProjectInformationManager.Instance.Get ((null == dom)? null: dom.Project);
-			if(null == doc.CompilationUnit){ doc.CompilationUnit = new CompilationUnit (fileName); }
-			CompilationUnit cu = (CompilationUnit)doc.CompilationUnit;
-			int lastLine = 0;
-			ICollection<Symbol> classes = pi.GetClassesForFile (fileName); 
-			
-			if (null == classes || 0 == classes.Count) {
-				return lastGood;
-			}
-			
-			foreach (Symbol node in classes) {
-				if (null == node){ continue; }
-				List<IMember> members = new List<IMember> ();
-				lastLine = node.SourceReferences[0].LastLine;
-                
-				foreach (Symbol child in node.Children) {
-					if (1 > child.SourceReferences.Count || 
-					    child.SourceReferences[0].File != node.SourceReferences[0].File){ continue; }
-					lastLine = Math.Max (lastLine, child.SourceReferences[0].LastLine+1);
-					
-					switch (child.MemberType.ToLower ()) {
-					case "class":
-						members.Add (new DomType (new CompilationUnit (fileName), ClassType.Class, child.Name, new DomLocation (child.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new List<IMember> ()));
-						break;
-					case "interface":
-						members.Add (new DomType (new CompilationUnit (fileName), ClassType.Interface, child.Name, new DomLocation (child.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new List<IMember> ()));
-						break;
-					case "delegate":
-						members.Add (new DomType (new CompilationUnit (fileName), ClassType.Delegate, child.Name, new DomLocation (child.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new List<IMember> ()));
-						break;
-					case "struct":
-						members.Add (new DomType (new CompilationUnit (fileName), ClassType.Struct, child.Name, new DomLocation (child.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new List<IMember> ()));
-						break;
-					case "enum":
-						members.Add (new DomType (new CompilationUnit (fileName), ClassType.Enum, child.Name, new DomLocation (child.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new List<IMember> ()));
-						break;
-					case "method":
-					case "creationmethod":
-					case "constructor":
-						DomMethod method = new DomMethod (child.Name, Modifiers.None, MethodModifier.None, new DomLocation (child.SourceReferences[0].FirstLine, 1), new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new DomReturnType (child.ReturnType.TypeName));
-						foreach (DataType param in child.Parameters) {
-							method.Add (new DomParameter (method, param.Name, new DomReturnType (param.TypeName)));
-						}
-						members.Add (method);
-						break;
-					case "property":
-						members.Add (new DomProperty (child.Name, Modifiers.None, new DomLocation (child.SourceReferences[0].FirstLine, 1), new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new DomReturnType ()));
-						break;
-					case "field":
-					case "constant":
-					case "errorcode":
-						members.Add (new DomField (child.Name, Modifiers.None, new DomLocation (child.SourceReferences[0].FirstLine, 1), new DomReturnType ()));
-						break;
-					case "signal":
-						members.Add (new DomEvent (child.Name, Modifiers.None, new DomLocation (child.SourceReferences[0].FirstLine, 1), new DomReturnType ()));
-						break;
-					default:
-						MonoDevelop.Core.LoggingService.LogDebug ("ValaDocumentParser: Unsupported member type: {0}", child.MemberType);
-						break;
-					}// Switch on node type
-				}// Collect members
-				
-				cu.Add (new DomType (new CompilationUnit (fileName), ClassType.Class, node.Name, new DomLocation (node.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (node.SourceReferences[0].FirstLine, int.MaxValue, lastLine, int.MaxValue), members));
-			}// Add each class in file
-			
-			return (lastGood = doc);
-		}// Parse
-	}// ValaDocumentParser
-}
diff --git a/extras/ValaBinding/Parser/ValaParsedDocument.cs b/extras/ValaBinding/Parser/ValaParsedDocument.cs
deleted file mode 100644
index 52587d81a6..0000000000
--- a/extras/ValaBinding/Parser/ValaParsedDocument.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// 
-// ValaParsedDocument.cs
-//  
-// Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-// Copyright (c) 2009 Levi Bard
-// 
-// 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 MonoDevelop.Projects.Dom;
-
-namespace MonoDevelop.ValaBinding.Parser
-{
-	/// <summary>
-	/// Parsed Vala source file
-	/// </summary>
-	public class ValaParsedDocument: ParsedDocument
-	{
-		public ValaParsedDocument (string file): base(file) {}
-
-		public override IEnumerable<FoldingRegion> GenerateFolds ()
-		{
-			return new List<FoldingRegion> ();
-		}// No folds for now
-	}// ValaParsedDocument
-}
diff --git a/extras/ValaBinding/Project/MakefileHandler.cs b/extras/ValaBinding/Project/MakefileHandler.cs
deleted file mode 100644
index 8b6e039281..0000000000
--- a/extras/ValaBinding/Project/MakefileHandler.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-
-using MonoDevelop.Core;
-using MonoDevelop.Autotools;
-using MonoDevelop.Projects;
-using MonoDevelop.Deployment;
-
-namespace MonoDevelop.ValaBinding
-{
-	/// <summary>
-	/// Handler for makefile generation
-	/// </summary>
-	public class MakefileHandler: IMakefileHandler
-	{
-
-		#region IMakefileHandler implementation
-		public bool CanDeploy (MonoDevelop.Projects.SolutionItem entry, MakefileType type)
-		{
-		    return entry is ValaProject;
-		}
-		
-		/// <summary>
-		/// Deploys a makefile to build the default configuration. 
-		/// </summary>
-		/// <remarks>
-		/// TODO: Make configuration-based targets as advertised.
-		/// </remarks>
-		public Makefile Deploy (AutotoolsContext ctx, MonoDevelop.Projects.SolutionItem entry, MonoDevelop.Core.IProgressMonitor monitor)
-		{
-			Makefile mkfile = new Makefile ();
-			ValaProject project = (ValaProject) entry;
-			ValaProjectConfiguration conf = (ValaProjectConfiguration)project.DefaultConfiguration;
-			
-			StringBuilder files = new StringBuilder ();
-			foreach (ProjectFile t in project.Files) {
-				if(BuildAction.Compile == t.BuildAction) {
-					files.Append ("\\\n\t" + FileService.AbsoluteToRelativePath(project.BaseDirectory, t.FilePath));
-				}
-			}
-			
-			string dir = ctx.DeployContext.GetResolvedPath (TargetDirectory.ProgramFiles, FileService.AbsoluteToRelativePath(conf.OutputDirectory, ctx.TargetSolution.BaseDirectory));
-			dir = dir.Replace ("@prefix@", "$(prefix)");
-			dir = dir.Replace ("@PACKAGE@", "$(PACKAGE)");
-			
-			TemplateEngine templateEngine = new TemplateEngine ();
-			templateEngine.Variables ["TOP_SRCDIR"] = FileService.AbsoluteToRelativePath (project.BaseDirectory, ctx.TargetSolution.BaseDirectory);
-			templateEngine.Variables ["FILES"] = files.ToString ();
-			templateEngine.Variables ["BUILD_DIR"] = ".";
-			templateEngine.Variables ["INSTALL_DIR"] = "$(DESTDIR)" + dir;
-			templateEngine.Variables ["ALL_TARGET"] = string.Format("all-{0}", conf.Name);
-			templateEngine.Variables ["VFLAGS"] = string.Format("{0} {1}", ValaCompiler.GetCompilerFlags(conf), ValaCompiler.GeneratePkgCompilerArgs(project.Packages));
-			templateEngine.Variables ["VTARGET"] = conf.CompiledOutputName;
-			
-			StringWriter sw = new StringWriter ();
-			
-			string mt;
-			if (ctx.MakefileType == MakefileType.AutotoolsMakefile)
-				mt = "Makefile.am.template";
-			else
-				mt = "Makefile.template";
-
-			using (Stream stream = GetType().Assembly.GetManifestResourceStream (mt)) {
-				StreamReader reader = new StreamReader (stream);
-
-				templateEngine.Process (reader, sw);
-				reader.Close ();
-			}
-
-			mkfile.Append (sw.ToString ());
-			
-			return mkfile;
-		}
-		#endregion
-	}
-}
diff --git a/extras/ValaBinding/Project/ProjectPackage.cs b/extras/ValaBinding/Project/ProjectPackage.cs
deleted file mode 100644
index 2bc4de18b4..0000000000
--- a/extras/ValaBinding/Project/ProjectPackage.cs
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-// ProjectPackage.cs: A pkg-config package
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-
-using Mono.Addins;
-
-using MonoDevelop.Core.Serialization;
-
-namespace MonoDevelop.ValaBinding
-{
-	public class ProjectPackage
-	{
-		[ItemProperty ("file")]
-		private string file;
-		
-		[ItemProperty ("name")]
-		private string name;
-		
-		[ItemProperty ("IsProject")]
-		private bool is_project;
-		
-		public string Description {
-			get{ return description; }
-			set{ description = value; }
-		}
-		private string description;
-		
-		public string Version {
-			get{ return version; }
-			set{ version = value; }
-		}
-		private string version;
-		
-		public List<string> Requires {
-			get { return requires; }
-		}
-		private List<string> requires;
-		
-		private static string[] packagePaths;
-		
-		static ProjectPackage () {
-			packagePaths = ScanPackageDirs ();
-		}
-
-		protected ProjectPackage() {
-			requires = new List<string>();
-			description = string.Empty;
-			version = string.Empty;
-		}
-		
-		public ProjectPackage (string file): this()
-		{
-			this.file = file;
-			this.name = Path.GetFileNameWithoutExtension(file);
-			this.is_project = false;
-			ParsePackage();
-			ParseRequires();
-		}
-		
-		public ProjectPackage (ValaProject project): this()
-		{
-			name = project.Name;
-			ValaProjectConfiguration vpc = (ValaProjectConfiguration)(project.DefaultConfiguration);
-			file = Path.Combine (vpc.OutputDirectory, name + ".vapi");
-			is_project = true;
-		}
-		
-		public string File {
-			get { return file; }
-			set { file = value; }
-		}
-		
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-		
-		public bool IsProject {
-			get { return is_project; }
-			set { is_project = value; }
-		}
-		
-		public override bool Equals (object o)
-		{
-			ProjectPackage other = o as ProjectPackage;
-			
-			if (other == null) return false;
-			
-			return other.File.Equals (file);
-		}
-		
-		public override int GetHashCode ()
-		{
-			return (file + name).GetHashCode ();
-		}
-		
-		/// <summary>
-		/// Insert '\n's to make sure string isn't too long.
-		/// </summary>
-		/// <param name="desc">
-		/// The unprocessed description.
-		/// A <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The processed description.
-		/// A <see cref="System.String"/>
-		/// </returns>
-		public static string ProcessDescription (string desc)
-		{
-			return Regex.Replace(desc, @"(.{1,80} )", "$&" + Environment.NewLine, RegexOptions.Compiled);
-		}
-		
-		/// <summary>
-		/// Search for a .pc file for this package, and parse its relevant attributes
-		/// </summary>
-		protected void ParsePackage ()
-		{
-			string line, pcfile;
-			
-			try {
-				foreach(string path in packagePaths) {
-					pcfile = Path.Combine (path, Path.ChangeExtension (Path.GetFileName (file), ".pc"));
-					if (!System.IO.File.Exists (pcfile)){ continue; }
-					using (StreamReader reader = new StreamReader (pcfile)) {
-						if (null == reader){ continue; }
-						
-						while ((line = reader.ReadLine ()) != null) {
-							if (Regex.IsMatch(line, @"^\s*#", RegexOptions.Compiled))
-							    continue;
-							    
-		//					if (line.IndexOf ('=') >= 0)
-		//						ParseVar (line);
-							
-							if (line.IndexOf (':') >= 0)
-								ParseProperty (line);
-						}
-						return;
-					}
-				}
-			} catch (FileNotFoundException) {
-				// We just won't populate some fields
-			} catch (IOException) {
-				// We just won't populate some fields
-			}
-		}
-		
-		protected void ParseProperty (string line)
-		{
-			string[] tokens = line.Split(new char[]{':'}, 2);
-			
-			if(2 != tokens.Length){ return; }
-			
-			string key = tokens[0];
-			string value = tokens[1].Trim();
-			
-			if (value.Length <= 0)
-				return;
-			
-			switch (key) {
-			case "Description":;
-				description = ProcessDescription (value);
-				break;
-			case "Version":
-				version = value;
-				break;
-			}
-		}
-		
-		protected void ParseRequires ()
-		{
-			string line;
-			
-			try {
-				using (StreamReader reader = new StreamReader (Path.ChangeExtension(file, ".deps"))) {
-					if(null == reader){ return; }
-					for(; null != (line = reader.ReadLine()); requires.Add(line));
-				}
-			} catch (FileNotFoundException) {
-				// We just won't populate requires
-			} catch (IOException) {
-				// We just won't populate requires
-			}
-		}
-		
-		/// <summary>
-		/// Scans PKG_CONFIG_PATH and a few static directories 
-		/// for potential pkg-config repositories
-		/// </summary>
-		/// <returns>
-		/// A <see cref="System.String"/> array: The potential directories
-		/// </returns>
-		private static string[] ScanPackageDirs ()
-		{
-			List<string> dirs = new List<string> ();
-			string pkg_var = Environment.GetEnvironmentVariable ("PKG_CONFIG_PATH");
-			string[] staticPaths = { "/usr/lib/pkgconfig",
-				"/usr/lib64/pkgconfig",
-				"/usr/share/pkgconfig",
-				"/usr/local/lib/pkgconfig",
-				"/usr/local/share/pkgconfig"
-			};
-				
-			if (null != pkg_var){ dirs.AddRange(pkg_var.Split(new char[]{System.IO.Path.PathSeparator}, StringSplitOptions.RemoveEmptyEntries)); }
-			
-			foreach(string dir in staticPaths) {
-				if(!dirs.Contains(dir)){ dirs.Add(dir); }
-			}
-			
-			return dirs.ToArray ();
-		}
-		
-		/// <summary>
-		/// Converts an absolute path to a relative one
-		/// </summary>
-		/// <param name="absolutePath">
-		/// A <see cref="System.String"/>: The absolute path
-		/// </param>
-		/// <param name="relativeTo">
-		/// A <see cref="System.String"/>: The path to which the output path shall be relative
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.String"/>: The relative path from relativeTo to absolutePath
-		/// </returns>
-		public static string ToRelativePath (string absolutePath, string relativeTo) {
-			List<string>  fileTokens = new List<string> (absolutePath.Split (Path.DirectorySeparatorChar)),
-						  anchorTokens = new List<string> (relativeTo.Split (Path.DirectorySeparatorChar));
-			StringBuilder builder = new StringBuilder ();
-			int length = 0;
-
-			if (!Path.IsPathRooted(absolutePath)){ return absolutePath; }
-			if (absolutePath == relativeTo){ return Path.GetFileName (absolutePath); }
-	
-			if (absolutePath.StartsWith (relativeTo) && Directory.Exists (relativeTo)) {
-				builder.AppendFormat (".{0}", Path.DirectorySeparatorChar);
-			}// if absolutePath is inside relativeTo
-	
-			for (;0 != fileTokens.Count && 0 != anchorTokens.Count;) {
-				if (fileTokens[0] == anchorTokens[0]) {
-					fileTokens.RemoveAt (0);
-					anchorTokens.RemoveAt (0);
-				} else { break; }
-			}// strip identical leading path
-	
-			for (int i=0; i < anchorTokens.Count-1; ++i) {
-				builder.AppendFormat ("..{0}", Path.DirectorySeparatorChar);
-			}// navigate out of anchor subdir
-	
-			foreach (string token in fileTokens) {
-				builder.AppendFormat ("{0}{1}", token, Path.DirectorySeparatorChar);
-			}// append filepath
-	
-			length = builder.Length;
-			if (0 < builder.Length && Path.DirectorySeparatorChar == builder[builder.Length-1]) {
-				--length;
-			}// check for trailing separator
-
-			return builder.ToString (0, length);
-		}// ToRelativePath
-	}
-}
diff --git a/extras/ValaBinding/Project/ProjectPackageCollection.cs b/extras/ValaBinding/Project/ProjectPackageCollection.cs
deleted file mode 100644
index 7365922bef..0000000000
--- a/extras/ValaBinding/Project/ProjectPackageCollection.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// ProjectPackageCollection.cs: Collection of pkg-config packages for the project
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using Mono.Addins;
-
-namespace MonoDevelop.ValaBinding
-{
-	[Serializable()]
-	public class ProjectPackageCollection : Collection<ProjectPackage>
-	{
-		private ValaProject project;
-		
-		internal ValaProject Project {
-			get { return project; }
-			set { project = value; }
-		}
-		
-		public ProjectPackageCollection ()
-		{
-		}
-		
-		public void AddRange (IEnumerable<ProjectPackage> packages)
-		{
-			foreach (ProjectPackage p in packages) {
-				bool found = false;
-				foreach (ProjectPackage item in Items) {
-					if (item.File == p.File) {
-						found = true;
-					}
-				}
-				if (!found) { Add (p); }
-			}
-		}
-		
-		protected override void ClearItems()
-		{
-			if (project != null) {
-				List<ProjectPackage> list = new List<ProjectPackage> (Items);
-				base.ClearItems ();
-				foreach (ProjectPackage p in list) {
-					project.NotifyPackageRemovedFromProject (p);
-				}
-			}
-		}
-		
-		protected override void InsertItem (int index, ProjectPackage value)
-		{
-			if(value.IsProject && null != project) {
-				ValaProjectConfiguration vpc = (ValaProjectConfiguration)project.DefaultConfiguration;
-				value.File = ProjectPackage.ToRelativePath(value.File, Path.Combine(vpc.OutputDirectory, vpc.CompiledOutputName));
-			}
-			base.InsertItem (index, value);
-			if (project != null) {
-				project.NotifyPackageAddedToProject (value);
-			}
-		}
-		
-		protected override void RemoveItem (int index)
-		{
-			ProjectPackage p = Items [index];
-			base.RemoveItem (index);
-			if (project != null) {
-				project.NotifyPackageRemovedFromProject (p);
-			}
-		}
-		
-		protected override void SetItem (int index, ProjectPackage item)
-		{
-			ProjectPackage oldValue = Items [index];
-			if(item.IsProject && null != project) {
-				ValaProjectConfiguration vpc = (ValaProjectConfiguration)project.DefaultConfiguration;
-				item.File = ProjectPackage.ToRelativePath(item.File, Path.Combine(vpc.OutputDirectory, vpc.CompiledOutputName));
-			}
-			base.SetItem (index, item);
-			if (project != null) {
-				project.NotifyPackageRemovedFromProject (oldValue);
-				project.NotifyPackageAddedToProject (item);
-			}
-		}
-
-		public string[] ToStringArray ()
-		{
-			string[] array = new string[Count];
-			int i = 0;
-			
-			foreach (ProjectPackage p in Items)
-				array[i++] = p.Name;
-			
-			return array;
-		}
-	}
-}
diff --git a/extras/ValaBinding/Project/ProjectPackageEventArgs.cs b/extras/ValaBinding/Project/ProjectPackageEventArgs.cs
deleted file mode 100644
index 8c156b399e..0000000000
--- a/extras/ValaBinding/Project/ProjectPackageEventArgs.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// ProjectPackageEventArgs.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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;
-
-namespace MonoDevelop.ValaBinding
-{
-	public delegate void ProjectPackageEventHandler (object sender, ProjectPackageEventArgs e);
-	
-	public class ProjectPackageEventArgs
-	{
-		ValaProject project;
-		ProjectPackage package;
-		
-		public ProjectPackageEventArgs(ValaProject project, ProjectPackage package)
-		{
-			this.project = project;
-			this.package = package;
-		}
-		
-		public ValaProject Project {
-			get { return project; }
-		}
-		
-		public ProjectPackage Package {
-			get { return package; }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Project/ValaCompilationParameters.cs b/extras/ValaBinding/Project/ValaCompilationParameters.cs
deleted file mode 100644
index 49509576e8..0000000000
--- a/extras/ValaBinding/Project/ValaCompilationParameters.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// ValaCompilationParameters.cs: Project compilation parameters
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.Xml;
-using System.Diagnostics;
-using System.Collections;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-
-namespace MonoDevelop.ValaBinding
-{
-	public enum WarningLevel {
-		None,
-		Normal,
-		All
-	}
-	
-	public class ValaCompilationParameters : ICloneable
-	{		
-		[ItemProperty ("WarningLevel")]
-		private WarningLevel warning_level = WarningLevel.Normal;
-		
-		[ItemProperty ("WarningsAsErrors")]
-		private bool warnings_as_errors = false;
-		
-		[ItemProperty ("OptimizationLevel")]
-		private int optimization = 0;
-		
-		[ItemProperty ("ExtraCompilerArguments")]
-		private string extra_compiler_args = string.Empty;
-		
-		[ItemProperty ("DefineSymbols")]
-		private string define_symbols = string.Empty;
-
-		[ItemProperty ("EnableMultithreading")]
-		private bool enable_multithreading = false;
-		
-		public object Clone ()
-		{
-			return MemberwiseClone ();
-		}
-		
-		public WarningLevel WarningLevel {
-			get { return warning_level; }
-			set { warning_level = value; }
-		}
-		
-		public bool WarningsAsErrors {
-			get { return warnings_as_errors; }
-			set { warnings_as_errors = value; }
-		}
-		
-		public int OptimizationLevel {
-			get { return optimization; }
-			set {
-				if (value >= 0 && value <= 3)
-					optimization = value;
-				else
-					optimization = 0;
-			}
-		}
-		
-		public string ExtraCompilerArguments {
-			get { return extra_compiler_args; }
-			set { extra_compiler_args = value; }
-		}
-		
-		public string DefineSymbols {
-			get { return define_symbols; }
-			set { define_symbols = value; }
-		}
-
-		public bool EnableMultithreading {
-			get { return enable_multithreading; }
-			set { enable_multithreading = value; }
-		}
-	}
-}
diff --git a/extras/ValaBinding/Project/ValaProject.cs b/extras/ValaBinding/Project/ValaProject.cs
deleted file mode 100644
index 0ca84697e4..0000000000
--- a/extras/ValaBinding/Project/ValaProject.cs
+++ /dev/null
@@ -1,547 +0,0 @@
-//
-// ValaProject.cs: Vala Project
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Xml;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.CodeDom.Compiler;
-using System.Text.RegularExpressions;
-using System.Diagnostics;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Deployment;
-using MonoDevelop.Deployment.Linux;
-
-using MonoDevelop.ValaBinding.Parser;
-
-namespace MonoDevelop.ValaBinding
-{
-	public enum ValaProjectCommands {
-		AddPackage,
-		ShowPackageDetails,
-		UpdateClassPad
-	}
-	
-	[DataInclude(typeof(ValaProjectConfiguration))]
-	public class ValaProject : Project, IDeployable
-	{
-		[ItemProperty ("compiler", ValueType = typeof(ValaCompiler))]
-		private ICompiler compiler_manager;
-		
-		private ProjectPackageCollection packages = new ProjectPackageCollection ();
-		public static string vapidir;
-		
-		public event ProjectPackageEventHandler PackageAddedToProject;
-		public event ProjectPackageEventHandler PackageRemovedFromProject;
-		
-		private void Init ()
-		{
-			packages.Project = this;
-			this.PackageAddedToProject += AddDependencies; // Special handling for project packages
-			//IdeApp.ProjectOperations.EntryAddedToCombine += OnEntryAddedToCombine;
-		}
-		
-		static ValaProject()
-		{
-			try {
-				Process pkgconfig = new Process();
-				pkgconfig.StartInfo.FileName = "pkg-config";
-				pkgconfig.StartInfo.Arguments = "--variable=vapidir vala-1.0";
-				pkgconfig.StartInfo.CreateNoWindow = true;
-				pkgconfig.StartInfo.RedirectStandardOutput = true;
-				pkgconfig.StartInfo.UseShellExecute = false;
-				pkgconfig.Start();
-				vapidir = pkgconfig.StandardOutput.ReadToEnd().Trim();
-				pkgconfig.WaitForExit();
-				pkgconfig.Dispose();
-			} catch(Exception e) {
-				MessageService.ShowError("Unable to detect VAPI path", string.Format("{0}{1}{2}", e.Message, Environment.NewLine, e.StackTrace));
-			}
-			
-			if(!Directory.Exists(vapidir)){ vapidir = "/usr/share/vala/vapi"; }
-		}
-		
-
-		
-		public ValaProject ()
-		{
-			Init ();
-		}
-		
-		public ValaProject (ProjectCreateInformation info,
-						 XmlElement projectOptions, string language)
-		{
-			Init ();
-			string binPath = ".";
-			
-			if (info != null) {
-				Name = info.ProjectName;
-				binPath = info.BinPath;
-			}
-			
-			Compiler = null;
-			
-			ValaProjectConfiguration configuration =
-				(ValaProjectConfiguration)CreateConfiguration ("Debug");
-			
-			configuration.DebugMode = true;
-			((ValaCompilationParameters)configuration.CompilationParameters).DefineSymbols = "DEBUG MONODEVELOP";		
-				
-			Configurations.Add (configuration);
-			
-			configuration =
-				(ValaProjectConfiguration)CreateConfiguration ("Release");
-				
-			configuration.DebugMode = false;
-			((ValaCompilationParameters)configuration.CompilationParameters).OptimizationLevel = 3;
-			((ValaCompilationParameters)configuration.CompilationParameters).DefineSymbols = "MONODEVELOP";
-			Configurations.Add (configuration);
-			
-			foreach (ValaProjectConfiguration c in Configurations) {
-				c.OutputDirectory = Path.Combine (binPath, c.Name);
-				c.SourceDirectory = info.ProjectBasePath;
-				c.Output = Name;
-				ValaCompilationParameters parameters = c.CompilationParameters as ValaCompilationParameters;
-				
-				if (projectOptions != null) {
-					if (projectOptions.Attributes["Target"] != null) {
-						c.CompileTarget = (ValaBinding.CompileTarget)Enum.Parse (
-							typeof(ValaBinding.CompileTarget),
-							projectOptions.Attributes["Target"].InnerText);
-					}
-					if (projectOptions.Attributes["PauseConsoleOutput"] != null) {
-						c.PauseConsoleOutput = bool.Parse (
-							projectOptions.Attributes["PauseConsoleOutput"].InnerText);
-					}
-					if (projectOptions.Attributes["CompilerArgs"].InnerText != null) {
-						if (parameters != null) {
-							parameters.ExtraCompilerArguments = projectOptions.Attributes["CompilerArgs"].InnerText;
-						}
-					}
-					if (projectOptions.Attributes["Packages"].InnerText != null) {
-						List<ProjectPackage> packs = new List<ProjectPackage>();
-						foreach(string pack in projectOptions.Attributes["Packages"].InnerText.Split('|')) {
-							packs.Add(new ProjectPackage(
-								string.Format("{0}{1}{2}.vapi", 
-									vapidir, 
-									Path.DirectorySeparatorChar, 
-									pack)));
-						}
-						packages.AddRange(packs);
-					}
-				}
-			}
-		}
-		
-		public override string ProjectType {
-			get { return "Vala"; }
-		}
-		
-		public override string[] SupportedLanguages {
-			get { return new string[] { "Vala" }; }
-		}
-		
-		public override bool IsCompileable (string fileName)
-		{
-			string ext = Path.GetExtension(fileName);
-			return (ext.Equals(".vala", StringComparison.CurrentCultureIgnoreCase) ||
-				ext.Equals(".vapi", StringComparison.CurrentCultureIgnoreCase));
-		}
-		
-		public List<ValaProject> DependedOnProjects ()
-		{
-			List<string> project_names = new List<string> ();
-			List<ValaProject> projects = new List<ValaProject> ();
-			
-			foreach (ProjectPackage p in Packages) {
-				if (p.IsProject && p.Name != Name) {
-					project_names.Add (p.Name);
-				}
-			}
-			
-			foreach (SolutionItem e in ParentFolder.Items) {
-				if (e is ValaProject && project_names.Contains (e.Name)) {
-					projects.Add ((ValaProject)e);
-				}
-			}
-			
-			return projects;
-		}
-		
-		/// <summary>
-		/// Ths pkg-config package is for internal MonoDevelop use only, it is not deployed.
-		/// </summary>
-		public void WriteMDPkgPackage (ConfigurationSelector configuration)
-		{
-			string pkgfile = Path.Combine (BaseDirectory, Name + ".md.pc");
-			
-			ValaProjectConfiguration config = (ValaProjectConfiguration)GetConfiguration(configuration);
-			
-			using (StreamWriter writer = new StreamWriter (pkgfile)) {
-				writer.WriteLine ("Name: {0}", Name);
-				writer.WriteLine ("Description: {0}", Description);
-				writer.WriteLine ("Version: {0}", Version);
-				writer.WriteLine ("Libs: -L{0} -l{1}", config.OutputDirectory, config.Output);
-//				writer.WriteLine ("Cflags: -I{0}", BaseDirectory);
-			}
-			
-			// If this project compiles into a shared object we need to
-			// export the output path to the LD_LIBRARY_PATH
-			string literal = "LD_LIBRARY_PATH";
-			string ld_library_path = Environment.GetEnvironmentVariable (literal);
-			
-			if (string.IsNullOrEmpty (ld_library_path)) {
-				Environment.SetEnvironmentVariable (literal, config.OutputDirectory);
-			} else if (!ld_library_path.Contains (config.OutputDirectory)) {
-				ld_library_path = string.Format ("{0}:{1}", config.OutputDirectory, ld_library_path);
-				Environment.SetEnvironmentVariable (literal, ld_library_path);
-			}
-		}
-		
-		/// <summary>
-		/// This is the pkg-config package that gets deployed.
-		/// <returns>The pkg-config package's filename</returns>
-		/// </summary>
-		private string WriteDeployablePkgPackage (ConfigurationSelector configuration)
-		{
-			// FIXME: This should probably be grabed from somewhere.
-			string prefix = "/usr/local";
-			string pkgfile = Path.Combine (BaseDirectory, Name + ".pc");
-			ValaProjectConfiguration config = (ValaProjectConfiguration)GetConfiguration(configuration);
-			
-			using (StreamWriter writer = new StreamWriter (pkgfile)) {
-				writer.WriteLine ("prefix={0}", prefix);
-				writer.WriteLine ("exec_prefix=${prefix}");
-				writer.WriteLine ("libdir=${exec_prefix}/lib");
-				writer.WriteLine ("includedir=${prefix}/include");
-				writer.WriteLine ();
-				writer.WriteLine ("Name: {0}", Name);
-				writer.WriteLine ("Description: {0}", Description);
-				writer.WriteLine ("Version: {0}", Version);
-				writer.WriteLine ("Requires: {0}", string.Join (" ", Packages.ToStringArray ()));
-				// TODO: How should I get this?
-				writer.WriteLine ("Conflicts: {0}", string.Empty);
-				writer.Write ("Libs: -L${libdir} ");
-				writer.WriteLine ("-l{0}", config.Output);
-				writer.Write ("Cflags: -I${includedir}/");
-				writer.WriteLine ("{0} {1}", Name, Regex.Replace(((ValaCompilationParameters)config.CompilationParameters).DefineSymbols, @"(^|\s+)(\w+)", "-D$2 ", RegexOptions.Compiled));
-			}
-			
-			return pkgfile;
-		}
-		
-		protected override BuildResult DoBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
-		{
-			ValaProjectConfiguration pc = (ValaProjectConfiguration)GetConfiguration(configuration);
-			pc.SourceDirectory = BaseDirectory;
-			
-			return compiler_manager.Compile (
-				Files, packages,
-				pc,
-				monitor);
-		}
-		
-		ExecutionCommand CreateExecutionCommand (ValaProjectConfiguration conf)
-		{
-			NativeExecutionCommand cmd = new NativeExecutionCommand ();
-			cmd.Command = Path.Combine (conf.OutputDirectory, conf.Output);
-			cmd.Arguments = conf.CommandLineParameters;
-			cmd.WorkingDirectory = Path.GetFullPath (conf.OutputDirectory);
-			return cmd;
-		}
-
-		protected override bool OnGetCanExecute (MonoDevelop.Projects.ExecutionContext context, ConfigurationSelector solutionConfiguration)
-		{
-			ValaProjectConfiguration conf = (ValaProjectConfiguration)GetConfiguration(solutionConfiguration);
-			ExecutionCommand cmd = CreateExecutionCommand (conf);
-			return (conf.CompileTarget == ValaBinding.CompileTarget.Bin) &&
-				context.ExecutionHandler.CanExecute (cmd);
-		}
-		
-		protected override void DoExecute (IProgressMonitor monitor,
-										   ExecutionContext context,
-		                                   ConfigurationSelector configuration)
-		{
-			ValaProjectConfiguration conf = (ValaProjectConfiguration) GetConfiguration (configuration);
-			bool pause = conf.PauseConsoleOutput;
-			IConsole console;
-			
-			if (conf.CompileTarget != ValaBinding.CompileTarget.Bin) {
-				MessageService.ShowMessage ("Compile target is not an executable!");
-				return;
-			}
-			
-			ExecutionCommand cmd = CreateExecutionCommand (conf);
-			
-			monitor.Log.WriteLine ("Running project...");
-			
-			if (conf.ExternalConsole)
-				console = context.ExternalConsoleFactory.CreateConsole (!pause);
-			else
-				console = context.ConsoleFactory.CreateConsole (!pause);
-			
-			AggregatedOperationMonitor operationMonitor = new AggregatedOperationMonitor (monitor);
-			
-			try {
-				if (!context.ExecutionHandler.CanExecute (cmd)) {
-					monitor.ReportError ("Cannot execute \"" + conf.Output + "\". The selected execution mode is not supported for Vala projects.", null);
-					return;
-				}
-				
-				IProcessAsyncOperation op = context.ExecutionHandler.Execute (cmd, console);
-				
-				operationMonitor.AddOperation (op);
-				op.WaitForCompleted ();
-				
-				monitor.Log.WriteLine ("The operation exited with code: {0}", op.ExitCode);
-			} catch (Exception ex) {
-				monitor.ReportError ("Cannot execute \"" + conf.Output + "\"", ex);
-			} finally {			
-				operationMonitor.Dispose ();			
-				console.Dispose ();
-			}
-		}
-		
-		public override FilePath GetOutputFileName (ConfigurationSelector configuration)
-		{
-			ValaProjectConfiguration conf = (ValaProjectConfiguration)GetConfiguration(configuration);
-			return conf.OutputDirectory.Combine (conf.CompiledOutputName);
-		}
-		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
-		{
-			ValaProjectConfiguration conf = new ValaProjectConfiguration ();
-			
-			conf.Name = name;
-			conf.CompilationParameters = new ValaCompilationParameters ();
-			
-			return conf;
-		}
-		
-		public ICompiler Compiler {
-			get { return compiler_manager; }
-			set {
-				if (value != null) {
-					compiler_manager = value;
-				} else {
-					object[] compilers = AddinManager.GetExtensionObjects ("/ValaBinding/Compilers");
-					string compiler = PropertyService.Get ("ValaBinding.DefaultValaCompiler", new ValaCompiler().Name);
-					
-					foreach (ICompiler c in compilers) {
-						if (compiler == c.Name) {
-							compiler_manager = c;
-						}
-					}
-				}
-			}
-		}
-		
-		[Browsable(false)]
-		[ItemProperty ("Packages")]
-		public ProjectPackageCollection Packages {
-			get { return packages; }
-			set {
-				packages = value;
-				packages.Project = this;
-				ProjectInformation pi = ProjectInformationManager.Instance.Get (this);
-				ValaProjectConfiguration configuration = (ValaProjectConfiguration)DefaultConfiguration;
-				
-				foreach(ProjectPackage p in packages) {
-					if (p.IsProject) {
-						string file = Path.GetFullPath (Path.Combine (configuration.OutputDirectory, p.File));
-						LoggingService.LogDebug ("Adding {0} for project package {1}", file, p.Name);
-						pi.AddFile (file);
-					} else {
-						pi.AddPackage (p.Name);
-					}
-				}
-			}
-		}
-		
-		protected override void OnFileAddedToProject (ProjectFileEventArgs args)
-		{
-			base.OnFileAddedToProject (args);
-			
-			foreach (ProjectFileEventInfo e in args) {
-				if (!IsCompileable (e.ProjectFile.Name) &&
-					e.ProjectFile.BuildAction == BuildAction.Compile) {
-					e.ProjectFile.BuildAction = BuildAction.None;
-				}
-				
-				if (e.ProjectFile.BuildAction == BuildAction.Compile)
-					ProjectInformationManager.Instance.Get (this).AddFile (e.ProjectFile.FilePath);
-			}
-		}
-		
-		protected override void OnFileChangedInProject (ProjectFileEventArgs args)
-		{
-			base.OnFileChangedInProject (args);
-			foreach (ProjectFileEventInfo e in args) {
-				// ProjectInformationManager.Instance.Get (this).Reparse ();
-				ProjectInformationManager.Instance.Get (this).AddFile (e.ProjectFile.FilePath);
-			}
-		}
-		
-		protected override void OnFileRemovedFromProject (ProjectFileEventArgs args)
-		{
-			base.OnFileRemovedFromProject(args);
-			foreach (ProjectFileEventInfo e in args)
-				ProjectInformationManager.Instance.Get (this).RemoveFile (e.ProjectFile.FilePath);
-		}
-		
-		private static void OnEntryAddedToCombine (object sender, SolutionItemEventArgs e)
-		{
-			ValaProject p = e.SolutionItem as ValaProject;
-			
-			if (p == null)
-				return;
-			
-			foreach (ProjectPackage package in p.Packages)
-				if (!package.IsProject){ ProjectInformationManager.Instance.Get (p).AddPackage (package.Name); }
-			foreach (ProjectFile f in p.Files)
-				ProjectInformationManager.Instance.Get (p).AddFile (f.FilePath);
-		}
-		
-		internal void NotifyPackageRemovedFromProject (ProjectPackage package)
-		{
-			if (null != PackageRemovedFromProject) {
-				PackageRemovedFromProject (this, new ProjectPackageEventArgs (this, package));
-			}
-		}
-		
-		internal void NotifyPackageAddedToProject (ProjectPackage package)
-		{
-			if(null != PackageAddedToProject) {
-				PackageAddedToProject (this, new ProjectPackageEventArgs (this, package));
-			}
-			if (!package.IsProject){ ProjectInformationManager.Instance.Get (this).AddPackage (package.Name); }
-		}
-
-		public DeployFileCollection GetDeployFiles (ConfigurationSelector configuration)
-		{
-			DeployFileCollection deployFiles = new DeployFileCollection ();
-			
-			CompileTarget target = ((ValaProjectConfiguration)GetConfiguration(configuration)).CompileTarget;
-			
-			// Headers and resources
-			foreach (ProjectFile f in Files) {
-				if (f.BuildAction == BuildAction.Content) {
-					string targetDirectory =
-						(/*IsHeaderFile (f.Name) ? TargetDirectory.Include :*/ TargetDirectory.ProgramFiles);
-					
-					deployFiles.Add (new DeployFile (this, f.FilePath, f.ProjectVirtualPath, targetDirectory));
-				}
-			}
-			
-			// Output
-			string output = GetOutputFileName (configuration);
-			if (!string.IsNullOrEmpty (output)) {
-				string targetDirectory = string.Empty;
-				
-				switch (target) {
-				case CompileTarget.Bin:
-					targetDirectory = TargetDirectory.ProgramFiles;
-					break;
-				case CompileTarget.SharedLibrary:
-					targetDirectory = TargetDirectory.ProgramFiles;
-					break;
-				case CompileTarget.StaticLibrary:
-					targetDirectory = TargetDirectory.ProgramFiles;
-					break;
-				}					
-				
-				deployFiles.Add (new DeployFile (this, output, Path.GetFileName (output), targetDirectory));
-			}
-			
-			// PkgPackage
-			if (target != CompileTarget.Bin) {
-				string pkgfile = WriteDeployablePkgPackage (configuration);
-				deployFiles.Add (new DeployFile (this, Path.Combine (BaseDirectory, pkgfile), pkgfile, LinuxTargetDirectory.PkgConfig));
-			}
-			
-			return deployFiles;
-		}
-
-		/// <summary>
-		/// Add dependencies of project packages to current project,
-		/// and add cflags for project package and LD_LIBRARY_PATH
-		/// </summary>
-		private void AddDependencies (object obj, ProjectPackageEventArgs args) {
-			ProjectPackage package = args.Package;
-			if (!package.IsProject){ return; }
-
-			string depsfile = Path.ChangeExtension (package.File, ".deps");
-			try {
-				if (File.Exists (depsfile)) {
-					string[] lines = File.ReadAllLines (depsfile);
-					List<ProjectPackage> deps = new List<ProjectPackage>();
-					foreach (string line in lines) {
-						deps.Add(new ProjectPackage(Path.Combine(vapidir, line) + ".vapi"));
-					}// add package for each dep
-					packages.AddRange(deps);
-				}
-
-				// Currently, we need to add include directory and linker flags - this should be obsoleted
-				string ccargs = string.Format (" --Xcc=\\\\\\\"-I{0}\\\\\\\" --Xcc=\\\\\\\"-L{0}\\\\\\\" --Xcc=\\\\\\\"-l{1}\\\\\\\" ", Path.GetDirectoryName (depsfile), package.Name);
-				string ldpath = string.Empty;
-				string packagePath = Path.GetDirectoryName(package.File);
-				
-				foreach (ItemConfiguration pc in Configurations) {
-					ValaProjectConfiguration valapc = pc as ValaProjectConfiguration;
-					if (null == valapc){ continue; }
-
-					ValaCompilationParameters vcp = (ValaCompilationParameters)valapc.CompilationParameters;
-					if (!vcp.ExtraCompilerArguments.Contains (ccargs)){ vcp.ExtraCompilerArguments += ccargs; }
-
-					if(valapc.EnvironmentVariables.TryGetValue ("LD_LIBRARY_PATH", out ldpath)) {
-						if (!ldpath.Contains (packagePath)){ ldpath += Path.PathSeparator + packagePath; }
-					} else {
-						ldpath = packagePath;
-					}
-					
-					valapc.EnvironmentVariables["LD_LIBRARY_PATH"] = ldpath;
-				}// add compilation parameters and LD_LIBRARY_PATH
-			} catch { /* Do anything here? */ }
-		}// AddDependencies
-	}
-}
diff --git a/extras/ValaBinding/Project/ValaProjectBinding.cs b/extras/ValaBinding/Project/ValaProjectBinding.cs
deleted file mode 100644
index 59988b0d4a..0000000000
--- a/extras/ValaBinding/Project/ValaProjectBinding.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// ValaProjectBinding.cs: binding for a ValaProject
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.Xml;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.ValaBinding
-{
-	public class ValaProjectBinding : IProjectBinding
-	{
-		public string Name {
-			get { return "Vala"; }
-		}
-		
-		public Project CreateProject (ProjectCreateInformation info,
-									  XmlElement projectOptions)
-		{
-			string language = projectOptions.GetAttribute ("language");
-			return new ValaProject (info, projectOptions, language);
-		}
-		
-		public Project CreateSingleFileProject (string sourceFile)
-		{
-			ProjectCreateInformation info = new ProjectCreateInformation ();
-			info.ProjectName = Path.GetFileNameWithoutExtension (sourceFile);
-			info.SolutionPath = Path.GetDirectoryName (sourceFile);
-			info.ProjectBasePath = Path.GetDirectoryName (sourceFile);
-			
-			string language = "Vala";
-			
-			Project project =  new ValaProject (info, null, language);
-			project.Files.Add (new ProjectFile (sourceFile));
-			return project;
-		}
-		
-		public bool CanCreateSingleFileProject (string sourceFile)
-		{
-			return sourceFile.EndsWith (".vala", StringComparison.OrdinalIgnoreCase);
-		}
-	}
-}
diff --git a/extras/ValaBinding/Project/ValaProjectConfiguration.cs b/extras/ValaBinding/Project/ValaProjectConfiguration.cs
deleted file mode 100644
index 11834f4189..0000000000
--- a/extras/ValaBinding/Project/ValaProjectConfiguration.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// ValaProjectConfiguration.cs: Configuration for Vala projects
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-
-namespace MonoDevelop.ValaBinding
-{
-	public enum CompileTarget {
-		Bin,
-		StaticLibrary,
-		SharedLibrary
-	};
-	
-	public class ValaProjectConfiguration : ProjectConfiguration
-	{
-		[ItemProperty("Output/output")]
-		string output = string.Empty;
-		
-		[ItemProperty("Build/target")]
-		ValaBinding.CompileTarget target = ValaBinding.CompileTarget.Bin;
-		
-		[ItemProperty ("Includes")]
-		[ProjectPathItemProperty ("Include", Scope = "*", ValueType = typeof(string))]
-		private ArrayList includes = new ArrayList ();
-		
-//		[ItemProperty ("LibPaths")]
-//		[ProjectPathItemProperty ("LibPath", Scope = 1, ValueType = typeof(string))]
-//		private ArrayList libpaths = new ArrayList ();
-//		
-		[ItemProperty ("Libs")]
-		[ItemProperty ("Lib", Scope = "*", ValueType = typeof(string))]
-		private ArrayList libs = new ArrayList ();
-		
-		[ItemProperty ("CodeGeneration",
-					  FallbackType = typeof(UnknownCompilationParameters))]
-		ICloneable compilationParameters;
-		
-		[ProjectPathItemProperty ("SourceDirectory")]
-		private string source_directory_path;
-		
-		public string Output {
-			get { return output; }
-			set { output = value; }
-		}
-		
-		public CompileTarget CompileTarget {
-			get { return target; }
-			set { target = value; }
-		}
-
-		public ICloneable CompilationParameters {
-			get { return compilationParameters; }
-			set { compilationParameters = value; }
-		}
-		
-		// TODO: This should be revised to use the naming conventions depending on OS
-		public string CompiledOutputName {
-			get {
-				string suffix = string.Empty;
-				string prefix = string.Empty;
-				
-				switch (target)
-				{
-				case CompileTarget.Bin:
-					break;
-				case CompileTarget.StaticLibrary:
-					if (!Output.StartsWith ("lib"))
-						prefix = "lib";
-					if (!Output.EndsWith (".a"))
-						suffix = ".a";
-					break;
-				case CompileTarget.SharedLibrary:
-					if (!Output.StartsWith ("lib"))
-						prefix = "lib";
-					if (!Output.EndsWith (".so"))
-						suffix = ".so";
-					break;
-				}
-				
-				return string.Format("{0}{1}{2}", prefix, Output, suffix);
-			}
-		}
-		
-		public string SourceDirectory {
-			get { return source_directory_path; }
-			set { source_directory_path = value; }
-		}
-		
-		public ArrayList Includes {
-			get { return includes; }
-			set { includes = value; }
-		}
-		
-		public ArrayList Libs {
-			get { return libs; }
-			set { libs = value; }
-		}
-		
-		public override void CopyFrom (ItemConfiguration configuration)
-		{
-			base.CopyFrom (configuration);
-			ValaProjectConfiguration conf = (ValaProjectConfiguration)configuration;
-			
-			output = conf.output;
-			target = conf.target;
-			includes = conf.includes;
-			libs = conf.libs;
-			source_directory_path = conf.source_directory_path;
-			
-			if (conf.CompilationParameters == null) {
-				compilationParameters = null;
-			} else {
-				compilationParameters = (ICloneable)conf.compilationParameters.Clone ();
-			}
-		}
-	}
-	
-	public class UnknownCompilationParameters : ICloneable, IExtendedDataItem
-	{
-		Hashtable table = new Hashtable ();
-		
-		public IDictionary ExtendedProperties {
-			get { return table; }
-		}
-		
-		public object Clone ()
-		{
-			return MemberwiseClone ();
-		}
-	}
-}
diff --git a/extras/ValaBinding/Project/ValaProjectServiceExtension.cs b/extras/ValaBinding/Project/ValaProjectServiceExtension.cs
deleted file mode 100644
index 490823ccba..0000000000
--- a/extras/ValaBinding/Project/ValaProjectServiceExtension.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// ValaProjectServiceExtension.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-using System.Text;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Execution;
-
-namespace MonoDevelop.ValaBinding
-{
-	public class ValaProjectServiceExtension : ProjectServiceExtension
-	{
-		protected override BuildResult Build (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
-		{
-			ValaProject project = entry as ValaProject;
-			
-			if (project == null)
-				return base.Build (monitor, entry, configuration);
-			
-			foreach (ValaProject p in project.DependedOnProjects ()) {
-				p.Build (monitor, configuration, true);
-			}
-			
-			ValaProjectConfiguration conf = (ValaProjectConfiguration)project.GetConfiguration(configuration);
-			
-			if (conf.CompileTarget != CompileTarget.Bin)
-				project.WriteMDPkgPackage (configuration);
-			
-			return base.Build (monitor, entry, configuration);
-		}
-		
-		protected override void Clean (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
-		{
-			base.Clean (monitor, entry, configuration);
-			
-			ValaProject project = entry as ValaProject;
-			if (project == null)
-				return;
-			
-			project.Compiler.Clean (project.Files, (ValaProjectConfiguration) project.GetConfiguration(configuration), monitor);
-		}
-	}
-}
diff --git a/extras/ValaBinding/ProjectPad/ProjectNodeExtension.cs b/extras/ValaBinding/ProjectPad/ProjectNodeExtension.cs
deleted file mode 100644
index 6b174dfb49..0000000000
--- a/extras/ValaBinding/ProjectPad/ProjectNodeExtension.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// ProjectNodeExtension.cs: Adds the packages node to a ValaProject
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace MonoDevelop.ValaBinding.ProjectPad
-{
-	public class ProjectNodeExtension : NodeBuilderExtension
-	{
-		public override bool CanBuildNode (Type dataType)
-		{
-			return typeof(ValaProject).IsAssignableFrom (dataType);
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			ValaProject p = dataObject as ValaProject;
-			
-			if (p == null) return;
-			
-			builder.AddChild (p.Packages);
-		}
-	}
-}
diff --git a/extras/ValaBinding/ProjectPad/ProjectPackageNodeBuilder.cs b/extras/ValaBinding/ProjectPad/ProjectPackageNodeBuilder.cs
deleted file mode 100644
index 32c852bef3..0000000000
--- a/extras/ValaBinding/ProjectPad/ProjectPackageNodeBuilder.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// ProjectPackageNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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.Reflection;
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace MonoDevelop.ValaBinding.ProjectPad
-{
-	public class ProjectPackageNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(ProjectPackage); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(PackageNodeCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((ProjectPackage)dataObject).File;
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/MonoDevelop/ValaBinding/Views/ProjectBrowser/ContextMenu/PackageNode"; }
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                ref string label,
-		                                ref Gdk.Pixbuf icon,
-		                                ref Gdk.Pixbuf closedIcon)
-		{
-			label = ((ProjectPackage)dataObject).Name;
-			
-			if (((ProjectPackage)dataObject).IsProject)
-				icon = new Gdk.Pixbuf (Assembly.GetExecutingAssembly (), "Icons.16x16.ProjectReference");
-			else
-				icon = Context.GetIcon (Stock.Reference);
-		}
-	}
-	
-	public class PackageNodeCommandHandler : NodeCommandHandler
-	{
-		public override void DeleteItem ()
-		{
-			ProjectPackage package = CurrentNode.DataItem as ProjectPackage;
-			ValaProject project = CurrentNode.GetParentDataItem (
-			    typeof(ValaProject), false) as ValaProject;
-			
-			project.Packages.Remove (package);
-			
-			IdeApp.ProjectOperations.Save (project);
-		}
-		
-		public override DragOperation CanDragNode ()
-		{
-			return DragOperation.Copy;
-		}
-		
-		[CommandHandler (MonoDevelop.ValaBinding.ValaProjectCommands.ShowPackageDetails)]
-		public void ShowPackageDetails ()
-		{
-			ProjectPackage package = (ProjectPackage)CurrentNode.DataItem;
-			
-			// package.ParsePackage ();
-			
-			PackageDetails details = new PackageDetails (package);
-			details.Show ();
-		}
-	}
-}
diff --git a/extras/ValaBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs b/extras/ValaBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
deleted file mode 100644
index c11c74eae1..0000000000
--- a/extras/ValaBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-// ProjectPackagesFolderNodeBuilder.cs: Node to control the packages in the project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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;
-
-using Mono.Addins;
-
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui.Pads.ProjectPad;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace MonoDevelop.ValaBinding.ProjectPad
-{	
-	public class ProjectPackagesFolderNodeBuilder : TypeNodeBuilder
-	{
-		ProjectPackageEventHandler addedHandler;
-		ProjectPackageEventHandler removedHandler;
-		
-		public override Type NodeDataType {
-			get { return typeof(ProjectPackageCollection); }
-		}
-		
-		public override void OnNodeAdded (object dataObject)
-		{
-			ValaProject project = ((ProjectPackageCollection)dataObject).Project;
-			if (project == null) return;
-			project.PackageAddedToProject += addedHandler;
-			project.PackageRemovedFromProject += removedHandler;
-		}
-
-		public override void OnNodeRemoved (object dataObject)
-		{
-			ValaProject project = ((ProjectPackageCollection)dataObject).Project;
-			if (project == null) return;
-			project.PackageAddedToProject -= addedHandler;
-			project.PackageRemovedFromProject -= removedHandler;
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(ProjectPackagesFolderNodeCommandHandler); }
-		}
-		
-		protected override void Initialize ()
-		{
-			addedHandler = (ProjectPackageEventHandler)DispatchService.GuiDispatch (new ProjectPackageEventHandler (OnAddPackage));
-			removedHandler = (ProjectPackageEventHandler)DispatchService.GuiDispatch (new ProjectPackageEventHandler (OnRemovePackage));
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return "Packages";
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, ref string label, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon)
-		{			
-			label = "Packages";
-			icon = Context.GetIcon (Stock.OpenReferenceFolder);
-			closedIcon = Context.GetIcon (Stock.ClosedReferenceFolder);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return ((ProjectPackageCollection)dataObject).Count > 0;
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			ProjectPackageCollection packages = (ProjectPackageCollection)dataObject;
-			
-			foreach (ProjectPackage p in packages)
-				treeBuilder.AddChild (p);
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/MonoDevelop/ValaBinding/Views/ProjectBrowser/ContextMenu/PackagesFolderNode"; }
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			return -1;
-		}
-		
-		private void OnAddPackage (object sender, ProjectPackageEventArgs e)
-		{
-			ITreeBuilder builder = Context.GetTreeBuilder (e.Project.Packages);
-			if (builder != null)
-				builder.UpdateAll ();
-		}
-		
-		private void OnRemovePackage (object sender, ProjectPackageEventArgs e)
-		{
-			ITreeBuilder builder = Context.GetTreeBuilder (e.Project.Packages);
-			if (builder != null)
-				builder.UpdateAll ();
-		}
-	}
-	
-	public class ProjectPackagesFolderNodeCommandHandler : NodeCommandHandler
-	{
-		[CommandHandler (MonoDevelop.ValaBinding.ValaProjectCommands.AddPackage)]
-		public void AddPackageToProject ()
-		{
-			ValaProject project = (ValaProject)CurrentNode.GetParentDataItem (
-			    typeof(ValaProject), false);
-			
-			EditPackagesDialog dialog = new EditPackagesDialog (project);
-			dialog.Run ();			
-			
-			IdeApp.ProjectOperations.Save (project);
-			CurrentNode.Expanded = true;
-		}
-		
-		// Currently only accepts packages and projects that compile into a static library
-		public override bool CanDropNode (object dataObject, DragOperation operation)
-		{
-			if (dataObject is ProjectPackage)
-				return true;
-			
-			if (dataObject is ValaProject) {
-				ValaProject project = (ValaProject)dataObject;
-				
-				if (((ProjectPackageCollection)CurrentNode.DataItem).Project.Equals (project))
-					return false;
-				
-				ValaProjectConfiguration config = (ValaProjectConfiguration)project.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-				
-				if (config.CompileTarget != ValaBinding.CompileTarget.Bin)
-					return true;
-			}
-			
-			return false;
-		}
-		
-		public override DragOperation CanDragNode ()
-		{
-			return DragOperation.Copy | DragOperation.Move;
-		}
-		
-		public override void OnNodeDrop (object dataObject, DragOperation operation)
-		{
-			if (dataObject is ProjectPackage) {
-				ProjectPackage package = (ProjectPackage)dataObject;
-				ITreeNavigator nav = CurrentNode;
-				
-				ValaProject dest = nav.GetParentDataItem (typeof(ValaProject), true) as ValaProject;
-				nav.MoveToObject (dataObject);
-				ValaProject source = nav.GetParentDataItem (typeof(ValaProject), true) as ValaProject;
-				
-				dest.Packages.Add (package);
-				IdeApp.ProjectOperations.Save (dest);
-				
-				if (operation == DragOperation.Move) {
-					source.Packages.Remove (package);
-					IdeApp.ProjectOperations.Save (source);
-				}
-			} else if (dataObject is ValaProject) {
-				ValaProject draggedProject = (ValaProject)dataObject;
-				ValaProject destProject = (CurrentNode.DataItem as ProjectPackageCollection).Project;
-				
-				draggedProject.WriteMDPkgPackage (IdeApp.Workspace.ActiveConfiguration);
-				
-				ProjectPackage package = new ProjectPackage (draggedProject);
-				
-				if (!destProject.Packages.Contains (package)) {
-					destProject.Packages.Add (package);
-					IdeApp.ProjectOperations.Save (destProject);
-				}
-			}
-		}
-	}
-}
diff --git a/extras/ValaBinding/ProjectPad/ProjectReferencesExtension.cs b/extras/ValaBinding/ProjectPad/ProjectReferencesExtension.cs
deleted file mode 100644
index 1c7545a989..0000000000
--- a/extras/ValaBinding/ProjectPad/ProjectReferencesExtension.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// ProjectReferencesExtension.cs: Hides the ProjectReferencesNode if this is a Vala project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// 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.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace MonoDevelop.ValaBinding.ProjectPad
-{
-	public class ProjectReferencesExtension : NodeBuilderExtension
-	{
-		public override bool CanBuildNode (Type dataType)
-		{
-			return typeof(ProjectReferenceCollection).IsAssignableFrom (dataType);
-		}
-		
-		public override void GetNodeAttributes (ITreeNavigator parentNode, object dataObject, ref NodeAttributes attributes)
-		{
-			Project p = parentNode.DataItem as Project;
-			
-			if (p is ValaProject)
-				attributes |= NodeAttributes.Hidden;
-		}
-	}
-}
diff --git a/extras/ValaBinding/README b/extras/ValaBinding/README
deleted file mode 100644
index f6e0dba21f..0000000000
--- a/extras/ValaBinding/README
+++ /dev/null
@@ -1,8 +0,0 @@
-ValaBinding is a Vala language binding for MonoDevelop.
-
-Current features:
- * Vala project support for executable projects, libraries, and unit test projects (using GTest).
- * Reference other Vala libraries and projects from within the IDE.
- * Class browser.
- * Basic Makefile integration.
- * Context-sensitive code completion using VTG ( http://code.google.com/p/vtg ).
diff --git a/extras/ValaBinding/ValaBinding.addin.xml b/extras/ValaBinding/ValaBinding.addin.xml
deleted file mode 100644
index 295eb75326..0000000000
--- a/extras/ValaBinding/ValaBinding.addin.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<Addin id          = "ValaBinding"
-       namespace   = "MonoDevelop"
-       name		   = "Vala Language Binding"
-       author      = "Levi Bard"
-       copyright   = "MIT/X11"
-       url         = "http://www.monodevelop.com"
-       description = "Vala Language binding"
-       category    = "Language bindings"
-       version     = "4.2.3">
-
-	<Dependencies>
-		<Addin id = "Core" version = "4.2.3"/>
-		<Addin id = "Ide" version = "4.2.3"/>
-		<Addin id = "Deployment" version = "4.2.3"/>
-		<Addin id = "Deployment.Linux" version = "4.2.3"/>
-		<Addin id = "Autotools" version = "4.2.3"/>
-	</Dependencies>
-	
-	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "md-union" resource = "Icons.16x16.Union"/>
-		<StockIcon stockid = "md-protected-union" resource = "Icons.16x16.ProtectedUnion"/>
-		<StockIcon stockid = "md-private-union" resource = "Icons.16x16.PrivateUnion"/>
-		<StockIcon stockid = "md-vala-file" resource = "text-x-vala.16x16.png" />
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/FileFilters">
-		<FileFilter
-			id = "Vala"
-			insertbefore = "AllFiles"
-			_label = "Vala Files"
-			extensions = "*.vala,*.vapi" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/FileTemplates">
-		<FileTemplate id = "EmptyValaSourceFile" resource = "EmptyValaSourceFile.xft.xml"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<ProjectTemplate id = "EmptyValaProject" resource = "EmptyValaProject.xpt.xml"/>
-		<ProjectTemplate id = "ConsoleValaProject" resource = "ConsoleValaProject.xpt.xml"/>
-		<ProjectTemplate id = "SharedLibraryValaProject" resource = "SharedLibraryValaProject.xpt.xml"/>
-		<ProjectTemplate id = "ValaTestFixture" resource = "ValaTestFixture.xpt.xml"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Core/MimeTypes">
-		<MimeType id="text/x-vala" icon="md-vala-file">
-			<File pattern="*.vala" />
-			<File pattern="*.vapi" />
-		</MimeType>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectBindings">
-		<ProjectBinding id = "ValaProject" class = "MonoDevelop.ValaBinding.ValaProjectBinding"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/LanguageBindings">
-		<LanguageBinding
-			id = "Vala"
-		    supportedextensions = ".vala,.vapi"
-		    class = "MonoDevelop.ValaBinding.ValaLanguageBinding"/>
-    </Extension>
-    
-	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/Other">
-		<Section
-			id = "ValaBindingOptions"
-			_label = "Vala"
-			class = "MonoDevelop.ValaBinding.GeneralOptionsPanelBinding"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build">
-		<Condition id = "ItemType" value = "MonoDevelop.ValaBinding.ValaProject">
-			<Section
-				id = "CodeGenerationPanel"
-			    _label = "Code Generation"
-			    insertafter = "Compile"
-			    class = "MonoDevelop.ValaBinding.CodeGenerationPanelBinding"/>
-			<Section
-				id = "OutputOptionsPanel"
-			    _label = "Output"
-			    class = "MonoDevelop.ValaBinding.OutputOptionsPanelBinding"/>
-		</Condition>
-	</Extension>
-
-	<ExtensionPoint path = "/MonoDevelop/ValaBinding/Views/ProjectBrowser/ContextMenu/PackagesFolderNode" name = "Packages folder context menu">
-		<Description>Context menu for packages folder in the solution pad.</Description>
-		<ExtensionNodeSet id = "MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/ValaBinding/Views/ProjectBrowser/ContextMenu/PackageNode" name = "ProjectPackage context menu">
-		<Description>Context menu for a package in the solution pad.</Description>
-		<ExtensionNodeSet id = "MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
-		<NodeBuilder id = "MonoDevelop.ValaBinding.ProjectPad.ProjectReferencesExtension" class = "MonoDevelop.ValaBinding.ProjectPad.ProjectReferencesExtension"/>
-		<NodeBuilder id = "MonoDevelop.ValaBinding.ProjectPad.ProjectPackagesFolderNodeBuilder" class = "MonoDevelop.ValaBinding.ProjectPad.ProjectPackagesFolderNodeBuilder"/>
-		<NodeBuilder id = "MonoDevelop.ValaBinding.ProjectPad.ProjectPackageNodeBuilder" class = "MonoDevelop.ValaBinding.ProjectPad.ProjectPackageNodeBuilder"/>
-		<NodeBuilder id = "MonoDevelop.ValaBinding.ProjectPad.ProjectNodeExtension" class = "MonoDevelop.ValaBinding.ProjectPad.ProjectNodeExtension"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/Pads/ClassPad">
-		<NodeBuilder id = "MonoDevelop.ValaBinding.Navigation.ProjectNodeBuilderExtension" class = "MonoDevelop.ValaBinding.Navigation.ProjectNodeBuilderExtension"/>
-		<NodeBuilder id = "MonoDevelop.ValaBinding.Navigation.LanguageItemNodeBuilder" class = "MonoDevelop.ValaBinding.Navigation.LanguageItemNodeBuilder"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/Commands">
-		<Category _name = "Vala" id = "Vala">
-			<Command id = "MonoDevelop.ValaBinding.ValaProjectCommands.UpdateClassPad" _label = "Update class pad" icon = "res:update" />
-			<Command id = "MonoDevelop.ValaBinding.ValaProjectCommands.AddPackage" _label = "Edit Packages..." />
-			<Command id = "MonoDevelop.ValaBinding.ValaProjectCommands.ShowPackageDetails" _label = "Details..." />
-		</Category>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ValaBinding/Views/ProjectBrowser/ContextMenu/PackagesFolderNode">
-		<CommandItem id = "MonoDevelop.ValaBinding.ValaProjectCommands.AddPackage"/>
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Paste"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/ContextMenu/ClassPad/Project">
-		<CommandItem id = "MonoDevelop.ValaBinding.ValaProjectCommands.UpdateClassPad"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ValaBinding/Views/ProjectBrowser/ContextMenu/PackageNode">
-		<CommandItem id = "MonoDevelop.ValaBinding.ValaProjectCommands.ShowPackageDetails"/>
-		<SeparatorItem id = "Separator1" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy"/>
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
-		<Class fileExtensions = ".vala,.vapi" class = "MonoDevelop.ValaBinding.ValaTextEditorExtension" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
-		<Condition id="ItemType" value="MonoDevelop.ValaBinding.ValaProject">
-			<Class id = "ExtraSteps" class = "MonoDevelop.ValaBinding.ValaProjectServiceExtension"/>
-		</Condition>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-		<DataType class = "MonoDevelop.ValaBinding.ValaCompilationParameters"/>
-		<DataType class = "MonoDevelop.ValaBinding.ValaProjectConfiguration"/>
-		<DataType class = "MonoDevelop.ValaBinding.ValaProject"/>
-		<DataType class = "MonoDevelop.ValaBinding.ValaCompiler"/>
-		<DataType class = "MonoDevelop.ValaBinding.ProjectPackage"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Autotools/MakefileHandlers">
-		<Class class = "MonoDevelop.ValaBinding.MakefileHandler"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/DomParser">
-		<Parser fileExtensions=".vala, .vapi" class = "MonoDevelop.ValaBinding.Parser.ValaDocumentParser"
-			id = "ValaDocumentParser" />
-	</Extension>
-</Addin>
diff --git a/extras/ValaBinding/ValaBinding.csproj b/extras/ValaBinding/ValaBinding.csproj
deleted file mode 100644
index 46a3373882..0000000000
--- a/extras/ValaBinding/ValaBinding.csproj
+++ /dev/null
@@ -1,237 +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>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B94D7749-EA5C-48DD-8849-B3924A860DDC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>MonoDevelop.ValaBinding</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <ApplicationIcon>.</ApplicationIcon>
-    <RootNamespace>MonoDevelop.ValaBinding</RootNamespace>
-    <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <ConsolePause>false</ConsolePause>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>build</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <ConsolePause>false</ConsolePause>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Mono.Posix" />
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <Reference Include="MonoDevelop.VersionControl, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.NUnit, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.XmlEditor, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.AspNet, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Gettext, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Deployment, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Deployment.Linux, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.GtkCore, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.DesignerSupport, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.VBNetBinding, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.CBinding, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.CSharpBinding, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Autotools, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Core, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Ide, Version=1.9.2.0, Culture=neutral">
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="NRefactory, Version=0.0.0.0, Culture=neutral">
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="Mono.Cecil, Version=0.6.8.8607, Culture=neutral">
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="Mono.TextEditor, Version=1.0.0.0, Culture=neutral">
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.SourceEditor2, Version=2.1.0.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Debugger, Version=2.1.0.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Refactoring, Version=2.1.0.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="Mono.Debugger.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="Mono.Debugging.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5e9ce85b0923c84f">
-      <Package>monodevelop-core-addins</Package>
-    </Reference>
-    <Reference Include="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5e9ce85b0923c84f">
-      <Package>monodevelop</Package>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="ChangeLog" />
-    <None Include="README" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="ValaBinding.addin.xml" />
-    <EmbeddedResource Include="templates\EmptyValaProject.xpt.xml">
-      <LogicalName>EmptyValaProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyValaSourceFile.xft.xml">
-      <LogicalName>EmptyValaSourceFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="gtk-gui\gui.stetic">
-      <LogicalName>gui.stetic</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\Icons.16x16.PrivateUnion">
-      <LogicalName>Icons.16x16.PrivateUnion</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\Icons.16x16.ProtectedUnion">
-      <LogicalName>Icons.16x16.ProtectedUnion</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\Icons.16x16.Union">
-      <LogicalName>Icons.16x16.Union</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\Icons.16x16.ProjectReference">
-      <LogicalName>Icons.16x16.ProjectReference</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\ConsoleValaProject.xpt.xml">
-      <LogicalName>ConsoleValaProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="gtk-gui\objects.xml">
-      <LogicalName>objects.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\text-x-vala.16x16.png">
-      <LogicalName>text-x-vala.16x16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\text-x-vala.24x24.png">
-      <LogicalName>text-x-vala.24x24.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\text-x-vala.32x32.png">
-      <LogicalName>text-x-vala.32x32.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\text-x-vala.48x48.png">
-      <LogicalName>text-x-vala.48x48.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\vala-icon-32.png">
-      <LogicalName>vala-icon-32.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\SharedLibraryValaProject.xpt.xml">
-      <LogicalName>SharedLibraryValaProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\ValaTestFixture.xpt.xml">
-      <LogicalName>ValaTestFixture.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\Makefile.am.template">
-      <LogicalName>Makefile.am.template</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\Makefile.template">
-      <LogicalName>Makefile.template</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Project\ValaCompilationParameters.cs" />
-    <Compile Include="Project\ValaProject.cs" />
-    <Compile Include="Project\ValaProjectBinding.cs" />
-    <Compile Include="Project\ValaProjectConfiguration.cs" />
-    <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="Gui\CodeGenerationPanel.cs" />
-    <Compile Include="Compiler\ValaCompiler.cs" />
-    <Compile Include="Gui\AddLibraryDialog.cs" />
-    <Compile Include="Compiler\ICompiler.cs" />
-    <Compile Include="Gui\AddPathDialog.cs" />
-    <Compile Include="Project\ProjectPackageCollection.cs" />
-    <Compile Include="ValaLanguageBinding.cs" />
-    <Compile Include="Project\ProjectPackage.cs" />
-    <Compile Include="Project\ProjectPackageEventArgs.cs" />
-    <Compile Include="Gui\OutputOptionsPanel.cs" />
-    <Compile Include="Project\ValaProjectServiceExtension.cs" />
-    <Compile Include="Gui\GeneralOptionsPanel.cs" />
-    <Compile Include="Parser\ProjectInformation.cs" />
-    <Compile Include="Parser\ProjectInformationManager.cs" />
-    <Compile Include="Gui\ValaTextEditorExtension.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.AddLibraryDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.CodeGenerationPanel.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.AddPathDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.GeneralOptionsPanel.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.OutputOptionsPanel.cs" />
-    <Compile Include="Navigation\ClassPadEventArgs.cs" />
-    <Compile Include="Navigation\LanguageItemCommandHandler.cs" />
-    <Compile Include="Navigation\LanguageItemEventArgs.cs" />
-    <Compile Include="ProjectPad\ProjectReferencesExtension.cs" />
-    <Compile Include="Gui\EditPackagesDialog.cs" />
-    <Compile Include="Gui\PackageDetails.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.EditPackagesDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.ValaBinding.PackageDetails.cs" />
-    <Compile Include="ProjectPad\ProjectPackageNodeBuilder.cs" />
-    <Compile Include="ProjectPad\ProjectPackagesFolderNodeBuilder.cs" />
-    <Compile Include="ProjectPad\ProjectNodeExtension.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Project\MakefileHandler.cs" />
-    <Compile Include="Parser\Afrodite.cs" />
-    <Compile Include="Navigation\LanguageItemNodeBuilder.cs" />
-    <Compile Include="Navigation\ProjectNodeBuilderExtension.cs" />
-    <Compile Include="Parser\ValaDocumentParser.cs" />
-    <Compile Include="Gui\ParameterDataProvider.cs" />
-    <Compile Include="Gui\CompilationUnitDataProvider.cs" />
-    <Compile Include="Gui\DataProvider.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/extras/ValaBinding/ValaBinding.sln b/extras/ValaBinding/ValaBinding.sln
deleted file mode 100644
index 2aeb4d8425..0000000000
--- a/extras/ValaBinding/ValaBinding.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValaBinding", "ValaBinding.csproj", "{B94D7749-EA5C-48DD-8849-B3924A860DDC}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Any CPU = Debug|Any CPU

-		Release|Any CPU = Release|Any CPU

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{B94D7749-EA5C-48DD-8849-B3924A860DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{B94D7749-EA5C-48DD-8849-B3924A860DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{B94D7749-EA5C-48DD-8849-B3924A860DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{B94D7749-EA5C-48DD-8849-B3924A860DDC}.Release|Any CPU.Build.0 = Release|Any CPU

-	EndGlobalSection

-	GlobalSection(MonoDevelopProperties) = preSolution

-		StartupItem = ValaBinding.csproj

-		Policies = $0

-		$0.DotNetNamingPolicy = $1

-		$1.DirectoryNamespaceAssociation = Flat

-		$1.ResourceNamePolicy = FileName

-		$0.StandardHeader = $2

-		$2.Text = @\n${FileName}\n \nAuthor:\n      ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.

-		$2.IncludeInNewFiles = True

-		$0.TextStylePolicy = $3

-		$3.FileWidth = 120

-		$3.TabWidth = 4

-		$3.inheritsSet = Mono

-		$3.inheritsScope = text/plain

-		$0.VersionControlPolicy = $4

-		$4.inheritsSet = Mono

-		$0.ChangeLogPolicy = $5

-		$5.UpdateMode = None

-		$5.VcsIntegration = None

-		$5.inheritsSet = Mono

-		name = ValaBinding

-	EndGlobalSection

-EndGlobal

diff --git a/extras/ValaBinding/ValaLanguageBinding.cs b/extras/ValaBinding/ValaLanguageBinding.cs
deleted file mode 100644
index 21dfcb113b..0000000000
--- a/extras/ValaBinding/ValaLanguageBinding.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// ValaLanguageBinding.cs
-//
-// Authors:
-//  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-//
-// Copyright (C) 2008 Levi Bard
-// Based on CBinding by Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// This source code is licenced under The MIT License:
-//
-// 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.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Projects.Dom.Parser;
-using MonoDevelop.Projects.CodeGeneration;
-
-namespace MonoDevelop.ValaBinding
-{
-	public class ValaLanguageBinding : ILanguageBinding
-	{
-		public string Language {
-			get { return "Vala"; }
-		}
-		
-		public string SingleLineCommentTag { get { return "//"; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public bool IsSourceCodeFile (string fileName)
-		{
-			string ext = Path.GetExtension(fileName);
-			return (ext.Equals(".vala", StringComparison.OrdinalIgnoreCase) ||
-			        ext.Equals(".vapi", StringComparison.OrdinalIgnoreCase));
-		}
-		
-		public IParser Parser {
-			get { return null; }
-		}
-		
-		public IRefactorer Refactorer {
-			get { return null; }
-		}
-		
-		public string GetFileName (string baseName)
-		{
-			return baseName + ".vala";
-		}
-	}
-}
diff --git a/extras/ValaBinding/autogen.sh b/extras/ValaBinding/autogen.sh
deleted file mode 100755
index 4ca0ef19a5..0000000000
--- a/extras/ValaBinding/autogen.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# Ripped off from GNOME macros version
-
-DIE=0
-
-PKG_NAME=ValaBinding
-WANT_AUTOCONF="2.5"
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed to compile ValaBinding."
-  echo "Download the appropriate package for your distribution, or get the "
-  echo "source at ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.61.tar.bz2 "
-  echo "(or a newer version if it is available)"
-  DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed to compile ValaBinding."
-  echo "Download the appropriate package for your distribution, or get the "
-  echo "source at ftp://ftp.gnu.org/pub/gnu/automake/automake-1.10.1.tar.bz2 "
-  echo "(or a newer version if it is available)"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'."
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-echo "Running aclocal $ACLOCAL_FLAGS ..."
-aclocal $ACLOCAL_FLAGS || {
-  echo
-  echo "**Error**: aclocal failed. This may mean that you have not"
-  echo "installed all of the packages you need, or you may need to"
-  echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
-  echo "for the prefix where you installed the packages whose"
-  echo "macros were not found"
-  exit 1
-}
-
-echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu -Wno-portability -Wno-syntax $am_opt ||
-  { echo "**Error**: automake failed."; exit 1; }
-
-echo "Running autoconf ..."
-WANT_AUTOCONF="2.5" autoconf || { echo "**Error**: autoconf failed."; exit 1; }
-
-
-conf_flags="--enable-maintainer-mode --enable-compile-warnings"
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-  echo Skipping configure process.
-fi
diff --git a/extras/ValaBinding/configure.in b/extras/ValaBinding/configure.in
deleted file mode 100644
index f33b7e0e5d..0000000000
--- a/extras/ValaBinding/configure.in
+++ /dev/null
@@ -1,111 +0,0 @@
-AC_INIT([monodevelop-vala], 4.2.3, [taktaktaktaktaktaktaktaktaktak@gmail.com])
-AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(1.9 tar-ustar)
-AM_MAINTAINER_MODE
-
-ASSEMBLY_VERSION=4.0.0.0
-
-AC_PATH_PROG(MONO, mono)
-AC_PATH_PROG(MCS, dmcs)
-
-if test "x$MONO" = "x" ; then
-	AC_MSG_ERROR([Can't find "mono" in your PATH])
-fi
-
-if test "x$MCS" = "x" ; then
-  AC_MSG_ERROR([Can't find "dmcs" in your PATH])
-fi
-AC_SUBST(PATH)
-AC_SUBST(LD_LIBRARY_PATH)
-
-dnl Find pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-        AC_MSG_ERROR([You need to install pkg-config])
-fi
-
-export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:../../local-config/"
-
-MONO_REQUIRED_VERSION=2.4
-PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MONO,mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
-
-if test "x$has_mono" = "xfalse"; then
-      AC_MSG_ERROR([Please install mono version $MONO_REQUIRED_VERSION or later to install ValaBinding.
-Please see http://www.mono-project.org/ to download latest mono sources or packages])
-fi
-
-if test "x$has_mono" = "xtrue"; then
-    if test `uname -s` = "Darwin"; then
-	AC_PATH_PROG(RUNTIME, mono, no)
-	AC_PATH_PROG(CSC, dmcs, no)
-	LIB_PREFIX=
-	LIB_SUFFIX=.dylib
-    else
-	AC_PATH_PROG(RUNTIME, mono, no)
-	AC_PATH_PROG(CSC, dmcs, no)
-	LIB_PREFIX=.so
-	LIB_SUFFIX=
-    fi
-fi
-
-
-dnl hard dependencies
-MONOADDINS_REQUIRED_VERSION=0.3
-GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.2.3
-LIBVALA_REQUIRED_VERSION=0.12.0
-
-PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
-AC_SUBST(MONO_ADDINS_LIBS)
-PKG_CHECK_MODULES(MONO_ADDINS_SETUP, mono-addins-setup >= $MONOADDINS_REQUIRED_VERSION)
-AC_SUBST(MONO_ADDINS_SETUP_LIBS)
-PKG_CHECK_MODULES(MONO_ADDINS_GUI, mono-addins-gui >= $MONOADDINS_REQUIRED_VERSION)
-AC_SUBST(MONO_ADDINS_GUI_LIBS)
-PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
-AC_SUBST(GLIB_SHARP_LIBS)
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
-AC_SUBST(GTK_SHARP_LIBS)
-PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
-AC_SUBST(GLADE_SHARP_LIBS)
-PKG_CHECK_MODULES(MONODEVELOP, monodevelop >= $MONODEVELOP_REQUIRED_VERSION)
-AC_SUBST(MONODEVELOP_LIBS)
-PKG_CHECK_MODULES(MONODEVELOP_CORE_ADDINS, monodevelop-core-addins >= $MONODEVELOP_REQUIRED_VERSION)
-AC_SUBST(MONODEVELOP_CORE_ADDINS_LIBS)
-
-dnl soft dependencies
-PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no])
-AC_SUBST(GNOME_SHARP_LIBS)
-AM_CONDITIONAL(HAVE_GNOME_SHARP, test x$gnome_sharp = xyes)
-PKG_CHECK_MODULES(GNOME_VFS_SHARP, gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_vfs_sharp=yes], [gnome_vfs_sharp=no])
-AC_SUBST(GNOME_VFS_SHARP_LIBS)
-AM_CONDITIONAL(HAVE_GNOME_VFS_SHARP, test x$gnome_vfs_sharp = xyes)
-PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no])
-AC_SUBST(GCONF_SHARP_LIBS)
-AM_CONDITIONAL(HAVE_GCONF_SHARP, test x$gconf_sharp = xyes)
-PKG_CHECK_MODULES(LIBVALA, libvala-0.12 >= $LIBVALA_REQUIRED_VERSION)
-AC_SUBST(LIBVALA_LIBS)
-
-AC_SEARCH_LIBS(afrodite_utils_get_package_paths, afrodite-0.12, [], [
-	echo ""
-	echo "libafrodite is required for Vala code completion."
-	echo "libafrodite is part of the VTG package, available from: "
-	echo "http://code.google.com/p/vtg/"
-	echo ""
-])
-
-gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`"
-AC_SUBST(gtksharp_prefix)
-
-platform_bindings=""
-
-CSC_FLAGS="-debug -codepage:utf8"
-
-AC_SUBST(LIB_SUFFIX)
-AC_SUBST(LIB_PREFIX)
-AC_SUBST(ASSEMBLY_VERSION)
-AC_SUBST(CSC_FLAGS)
-
-AC_OUTPUT([
-Makefile
-monodevelop-vala.spec
-])
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs
deleted file mode 100644
index 1efe82cf84..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class AddLibraryDialog
-	{
-		private global::Gtk.FileChooserWidget file_chooser_widget;
-
-		private global::Gtk.Button buttonCancel;
-
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.AddLibraryDialog
-			this.Name = "MonoDevelop.ValaBinding.AddLibraryDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Add Library");
-			this.Modal = true;
-			// Internal child MonoDevelop.ValaBinding.AddLibraryDialog.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.Spacing = 6;
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.file_chooser_widget = new global::Gtk.FileChooserWidget (((global::Gtk.FileChooserAction)(0)));
-			this.file_chooser_widget.Name = "file_chooser_widget";
-			w1.Add (this.file_chooser_widget);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1[this.file_chooser_widget]));
-			w2.Position = 0;
-			// Internal child MonoDevelop.ValaBinding.AddLibraryDialog.ActionArea
-			global::Gtk.HButtonBox w3 = this.ActionArea;
-			w3.Name = "dialog1_ActionArea";
-			w3.Spacing = 6;
-			w3.BorderWidth = ((uint)(5));
-			w3.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w4 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3[this.buttonCancel]));
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w5 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3[this.buttonOk]));
-			w5.Position = 1;
-			w5.Expand = false;
-			w5.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 648;
-			this.DefaultHeight = 439;
-			this.Show ();
-			this.buttonCancel.Clicked += new global::System.EventHandler (this.OnCancelButtonClick);
-			this.buttonOk.Clicked += new global::System.EventHandler (this.OnOkButtonClick);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs
deleted file mode 100644
index 6155c93ecc..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class AddPathDialog
-	{
-		private global::Gtk.FileChooserWidget file_chooser_widget;
-
-		private global::Gtk.Button buttonCancel;
-
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.AddPathDialog
-			this.Name = "MonoDevelop.ValaBinding.AddPathDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Add Path");
-			this.Modal = true;
-			// Internal child MonoDevelop.ValaBinding.AddPathDialog.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.Spacing = 6;
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.file_chooser_widget = new global::Gtk.FileChooserWidget (((global::Gtk.FileChooserAction)(0)));
-			this.file_chooser_widget.Name = "file_chooser_widget";
-			this.file_chooser_widget.ShowHidden = true;
-			w1.Add (this.file_chooser_widget);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1[this.file_chooser_widget]));
-			w2.Position = 0;
-			// Internal child MonoDevelop.ValaBinding.AddPathDialog.ActionArea
-			global::Gtk.HButtonBox w3 = this.ActionArea;
-			w3.Name = "dialog1_ActionArea";
-			w3.Spacing = 6;
-			w3.BorderWidth = ((uint)(5));
-			w3.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w4 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3[this.buttonCancel]));
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w5 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3[this.buttonOk]));
-			w5.Position = 1;
-			w5.Expand = false;
-			w5.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 649;
-			this.DefaultHeight = 436;
-			this.Show ();
-			this.buttonCancel.Clicked += new global::System.EventHandler (this.OnCancelButtonClick);
-			this.buttonOk.Clicked += new global::System.EventHandler (this.OnOkButtonClick);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs
deleted file mode 100644
index d2597cd314..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs
+++ /dev/null
@@ -1,588 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class CodeGenerationPanel
-	{
-		private global::Gtk.Notebook notebook1;
-
-		private global::Gtk.VBox vbox6;
-
-		private global::Gtk.Table table1;
-
-		private global::Gtk.Label label10;
-
-		private global::Gtk.Label label4;
-
-		private global::Gtk.Label label5;
-
-		private global::Gtk.Label label6;
-
-		private global::Gtk.SpinButton optimizationSpinButton;
-
-		private global::Gtk.ComboBox targetComboBox;
-
-		private global::Gtk.CheckButton threadingCheckbox;
-
-		private global::Gtk.VBox vbox1;
-
-		private global::Gtk.RadioButton noWarningRadio;
-
-		private global::Gtk.RadioButton normalWarningRadio;
-
-		private global::Gtk.RadioButton allWarningRadio;
-
-		private global::Gtk.CheckButton warningsAsErrorsCheckBox;
-
-		private global::Gtk.HBox hbox1;
-
-		private global::Gtk.Label label12;
-
-		private global::Gtk.Entry defineSymbolsTextEntry;
-
-		private global::Gtk.Frame frame2;
-
-		private global::Gtk.Alignment GtkAlignment;
-
-		private global::Gtk.Table table5;
-
-		private global::Gtk.Label label7;
-
-		private global::Gtk.ScrolledWindow scrolledwindow4;
-
-		private global::Gtk.TextView extraCompilerTextView;
-
-		private global::Gtk.Label GtkLabel12;
-
-		private global::Gtk.Label label1;
-
-		private global::Gtk.Table table2;
-
-		private global::Gtk.Button addLibButton;
-
-		private global::Gtk.Label label8;
-
-		private global::Gtk.Entry libAddEntry;
-
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-
-		private global::Gtk.TreeView libTreeView;
-
-		private global::Gtk.VBox vbox4;
-
-		private global::Gtk.Button browseButton;
-
-		private global::Gtk.Button removeLibButton;
-
-		private global::Gtk.Label label2;
-
-		private global::Gtk.VBox vbox7;
-
-		private global::Gtk.Table table3;
-
-		private global::Gtk.Button includePathAddButton;
-
-		private global::Gtk.Entry includePathEntry;
-
-		private global::Gtk.Label label9;
-
-		private global::Gtk.ScrolledWindow scrolledwindow2;
-
-		private global::Gtk.TreeView includePathTreeView;
-
-		private global::Gtk.VBox vbox5;
-
-		private global::Gtk.Button includePathBrowseButton;
-
-		private global::Gtk.Button includePathRemoveButton;
-
-		private global::Gtk.Label label3;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.CodeGenerationPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.ValaBinding.CodeGenerationPanel";
-			// Container child MonoDevelop.ValaBinding.CodeGenerationPanel.Gtk.Container+ContainerChild
-			this.notebook1 = new global::Gtk.Notebook ();
-			this.notebook1.CanFocus = true;
-			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.vbox6 = new global::Gtk.VBox ();
-			this.vbox6.Name = "vbox6";
-			this.vbox6.Spacing = 3;
-			// Container child vbox6.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(5));
-			this.table1.ColumnSpacing = ((uint)(5));
-			this.table1.BorderWidth = ((uint)(2));
-			// Container child table1.Gtk.Table+TableChild
-			this.label10 = new global::Gtk.Label ();
-			this.label10.Name = "label10";
-			this.label10.Xpad = 10;
-			this.label10.Xalign = 0f;
-			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("Warning Level:");
-			this.table1.Add (this.label10);
-			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1[this.label10]));
-			w1.XOptions = ((global::Gtk.AttachOptions)(4));
-			w1.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.Name = "label4";
-			this.label4.Xpad = 10;
-			this.label4.Xalign = 0f;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("Multithreading:");
-			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
-			w2.TopAttach = ((uint)(3));
-			w2.BottomAttach = ((uint)(4));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label5 = new global::Gtk.Label ();
-			this.label5.Name = "label5";
-			this.label5.Xpad = 10;
-			this.label5.Xalign = 0f;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Optimization Level:");
-			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.label5]));
-			w3.TopAttach = ((uint)(1));
-			w3.BottomAttach = ((uint)(2));
-			w3.XOptions = ((global::Gtk.AttachOptions)(4));
-			w3.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label6 = new global::Gtk.Label ();
-			this.label6.Name = "label6";
-			this.label6.Xpad = 10;
-			this.label6.Xalign = 0f;
-			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("Target:");
-			this.table1.Add (this.label6);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.label6]));
-			w4.TopAttach = ((uint)(2));
-			w4.BottomAttach = ((uint)(3));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.optimizationSpinButton = new global::Gtk.SpinButton (0, 3, 1);
-			this.optimizationSpinButton.Sensitive = false;
-			this.optimizationSpinButton.CanFocus = true;
-			this.optimizationSpinButton.Name = "optimizationSpinButton";
-			this.optimizationSpinButton.Adjustment.PageIncrement = 10;
-			this.optimizationSpinButton.ClimbRate = 1;
-			this.optimizationSpinButton.Numeric = true;
-			this.table1.Add (this.optimizationSpinButton);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.optimizationSpinButton]));
-			w5.TopAttach = ((uint)(1));
-			w5.BottomAttach = ((uint)(2));
-			w5.LeftAttach = ((uint)(1));
-			w5.RightAttach = ((uint)(2));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.targetComboBox = global::Gtk.ComboBox.NewText ();
-			this.targetComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Executable"));
-			this.targetComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Static Library"));
-			this.targetComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Shared Object"));
-			this.targetComboBox.Name = "targetComboBox";
-			this.table1.Add (this.targetComboBox);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.targetComboBox]));
-			w6.TopAttach = ((uint)(2));
-			w6.BottomAttach = ((uint)(3));
-			w6.LeftAttach = ((uint)(1));
-			w6.RightAttach = ((uint)(2));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.threadingCheckbox = new global::Gtk.CheckButton ();
-			this.threadingCheckbox.CanFocus = true;
-			this.threadingCheckbox.Name = "threadingCheckbox";
-			this.threadingCheckbox.Label = global::Mono.Unix.Catalog.GetString ("Enable multithreading");
-			this.threadingCheckbox.DrawIndicator = true;
-			this.threadingCheckbox.UseUnderline = true;
-			this.table1.Add (this.threadingCheckbox);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.threadingCheckbox]));
-			w7.TopAttach = ((uint)(3));
-			w7.BottomAttach = ((uint)(4));
-			w7.LeftAttach = ((uint)(1));
-			w7.RightAttach = ((uint)(2));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.vbox1 = new global::Gtk.VBox ();
-			this.vbox1.Name = "vbox1";
-			this.vbox1.Spacing = 1;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.noWarningRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("no warnings"));
-			this.noWarningRadio.CanFocus = true;
-			this.noWarningRadio.Name = "noWarningRadio";
-			this.noWarningRadio.Active = true;
-			this.noWarningRadio.DrawIndicator = true;
-			this.noWarningRadio.UseUnderline = true;
-			this.noWarningRadio.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.vbox1.Add (this.noWarningRadio);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.noWarningRadio]));
-			w8.Position = 0;
-			w8.Expand = false;
-			w8.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.normalWarningRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("normal"));
-			this.normalWarningRadio.CanFocus = true;
-			this.normalWarningRadio.Name = "normalWarningRadio";
-			this.normalWarningRadio.DrawIndicator = true;
-			this.normalWarningRadio.UseUnderline = true;
-			this.normalWarningRadio.Group = this.noWarningRadio.Group;
-			this.vbox1.Add (this.normalWarningRadio);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.normalWarningRadio]));
-			w9.Position = 1;
-			w9.Expand = false;
-			w9.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.allWarningRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("all"));
-			this.allWarningRadio.CanFocus = true;
-			this.allWarningRadio.Name = "allWarningRadio";
-			this.allWarningRadio.DrawIndicator = true;
-			this.allWarningRadio.UseUnderline = true;
-			this.allWarningRadio.Group = this.noWarningRadio.Group;
-			this.vbox1.Add (this.allWarningRadio);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.allWarningRadio]));
-			w10.Position = 2;
-			w10.Expand = false;
-			w10.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.warningsAsErrorsCheckBox = new global::Gtk.CheckButton ();
-			this.warningsAsErrorsCheckBox.Sensitive = false;
-			this.warningsAsErrorsCheckBox.CanFocus = true;
-			this.warningsAsErrorsCheckBox.Name = "warningsAsErrorsCheckBox";
-			this.warningsAsErrorsCheckBox.Label = global::Mono.Unix.Catalog.GetString ("Treat warnings as errors");
-			this.warningsAsErrorsCheckBox.DrawIndicator = true;
-			this.warningsAsErrorsCheckBox.UseUnderline = true;
-			this.vbox1.Add (this.warningsAsErrorsCheckBox);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.warningsAsErrorsCheckBox]));
-			w11.Position = 3;
-			w11.Expand = false;
-			w11.Fill = false;
-			this.table1.Add (this.vbox1);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox1]));
-			w12.LeftAttach = ((uint)(1));
-			w12.RightAttach = ((uint)(2));
-			w12.XOptions = ((global::Gtk.AttachOptions)(4));
-			w12.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox6.Add (this.table1);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.table1]));
-			w13.Position = 0;
-			w13.Expand = false;
-			w13.Fill = false;
-			// Container child vbox6.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label12 = new global::Gtk.Label ();
-			this.label12.Name = "label12";
-			this.label12.Xpad = 13;
-			this.label12.Xalign = 0f;
-			this.label12.LabelProp = global::Mono.Unix.Catalog.GetString ("Define Symbols:");
-			this.hbox1.Add (this.label12);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label12]));
-			w14.Position = 0;
-			w14.Expand = false;
-			w14.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.defineSymbolsTextEntry = new global::Gtk.Entry ();
-			this.defineSymbolsTextEntry.TooltipMarkup = "A space-separated list of symbols to define.";
-			this.defineSymbolsTextEntry.CanFocus = true;
-			this.defineSymbolsTextEntry.Name = "defineSymbolsTextEntry";
-			this.defineSymbolsTextEntry.IsEditable = true;
-			this.defineSymbolsTextEntry.InvisibleChar = '●';
-			this.hbox1.Add (this.defineSymbolsTextEntry);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.defineSymbolsTextEntry]));
-			w15.Position = 1;
-			w15.Padding = ((uint)(14));
-			this.vbox6.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.hbox1]));
-			w16.Position = 1;
-			w16.Expand = false;
-			w16.Fill = false;
-			// Container child vbox6.Gtk.Box+BoxChild
-			this.frame2 = new global::Gtk.Frame ();
-			this.frame2.Name = "frame2";
-			this.frame2.ShadowType = ((global::Gtk.ShadowType)(0));
-			this.frame2.LabelYalign = 0f;
-			// Container child frame2.Gtk.Container+ContainerChild
-			this.GtkAlignment = new global::Gtk.Alignment (0f, 0f, 1f, 1f);
-			this.GtkAlignment.Name = "GtkAlignment";
-			this.GtkAlignment.LeftPadding = ((uint)(12));
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			this.table5 = new global::Gtk.Table (((uint)(2)), ((uint)(1)), false);
-			this.table5.Name = "table5";
-			this.table5.RowSpacing = ((uint)(6));
-			this.table5.ColumnSpacing = ((uint)(9));
-			this.table5.BorderWidth = ((uint)(6));
-			// Container child table5.Gtk.Table+TableChild
-			this.label7 = new global::Gtk.Label ();
-			this.label7.Name = "label7";
-			this.label7.Xalign = 0f;
-			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Extra Compiler Options");
-			this.table5.Add (this.label7);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table5[this.label7]));
-			w17.XOptions = ((global::Gtk.AttachOptions)(4));
-			w17.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table5.Gtk.Table+TableChild
-			this.scrolledwindow4 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow4.CanFocus = true;
-			this.scrolledwindow4.Name = "scrolledwindow4";
-			this.scrolledwindow4.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow4.Gtk.Container+ContainerChild
-			this.extraCompilerTextView = new global::Gtk.TextView ();
-			this.extraCompilerTextView.TooltipMarkup = "A newline-separated list of extra options to send to the compiler.\nOne option can be in more than one line.\nExample:\n\t`--pkg\n\tcairo`";
-			this.extraCompilerTextView.CanFocus = true;
-			this.extraCompilerTextView.Name = "extraCompilerTextView";
-			this.scrolledwindow4.Add (this.extraCompilerTextView);
-			this.table5.Add (this.scrolledwindow4);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table5[this.scrolledwindow4]));
-			w19.TopAttach = ((uint)(1));
-			w19.BottomAttach = ((uint)(2));
-			this.GtkAlignment.Add (this.table5);
-			this.frame2.Add (this.GtkAlignment);
-			this.GtkLabel12 = new global::Gtk.Label ();
-			this.GtkLabel12.Name = "GtkLabel12";
-			this.GtkLabel12.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Extra Options</b>");
-			this.GtkLabel12.UseMarkup = true;
-			this.frame2.LabelWidget = this.GtkLabel12;
-			this.vbox6.Add (this.frame2);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.frame2]));
-			w22.Position = 2;
-			this.notebook1.Add (this.vbox6);
-			// Notebook tab
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Code Generation");
-			this.notebook1.SetTabLabel (this.vbox6, this.label1);
-			this.label1.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.table2 = new global::Gtk.Table (((uint)(2)), ((uint)(3)), false);
-			this.table2.Name = "table2";
-			this.table2.RowSpacing = ((uint)(10));
-			this.table2.ColumnSpacing = ((uint)(10));
-			this.table2.BorderWidth = ((uint)(3));
-			// Container child table2.Gtk.Table+TableChild
-			this.addLibButton = new global::Gtk.Button ();
-			this.addLibButton.Sensitive = false;
-			this.addLibButton.CanFocus = true;
-			this.addLibButton.Name = "addLibButton";
-			this.addLibButton.UseUnderline = true;
-			this.addLibButton.Label = global::Mono.Unix.Catalog.GetString ("Add");
-			this.table2.Add (this.addLibButton);
-			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2[this.addLibButton]));
-			w24.LeftAttach = ((uint)(2));
-			w24.RightAttach = ((uint)(3));
-			w24.XOptions = ((global::Gtk.AttachOptions)(4));
-			w24.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.label8 = new global::Gtk.Label ();
-			this.label8.Name = "label8";
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Library:");
-			this.table2.Add (this.label8);
-			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table2[this.label8]));
-			w25.XOptions = ((global::Gtk.AttachOptions)(4));
-			w25.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.libAddEntry = new global::Gtk.Entry ();
-			this.libAddEntry.CanFocus = true;
-			this.libAddEntry.Name = "libAddEntry";
-			this.libAddEntry.IsEditable = true;
-			this.libAddEntry.InvisibleChar = '●';
-			this.table2.Add (this.libAddEntry);
-			global::Gtk.Table.TableChild w26 = ((global::Gtk.Table.TableChild)(this.table2[this.libAddEntry]));
-			w26.LeftAttach = ((uint)(1));
-			w26.RightAttach = ((uint)(2));
-			w26.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.libTreeView = new global::Gtk.TreeView ();
-			this.libTreeView.CanFocus = true;
-			this.libTreeView.Name = "libTreeView";
-			this.scrolledwindow1.Add (this.libTreeView);
-			this.table2.Add (this.scrolledwindow1);
-			global::Gtk.Table.TableChild w28 = ((global::Gtk.Table.TableChild)(this.table2[this.scrolledwindow1]));
-			w28.TopAttach = ((uint)(1));
-			w28.BottomAttach = ((uint)(2));
-			w28.LeftAttach = ((uint)(1));
-			w28.RightAttach = ((uint)(2));
-			// Container child table2.Gtk.Table+TableChild
-			this.vbox4 = new global::Gtk.VBox ();
-			this.vbox4.Name = "vbox4";
-			this.vbox4.Spacing = 6;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.browseButton = new global::Gtk.Button ();
-			this.browseButton.CanFocus = true;
-			this.browseButton.Name = "browseButton";
-			this.browseButton.UseUnderline = true;
-			this.browseButton.Label = global::Mono.Unix.Catalog.GetString ("Browse...");
-			this.vbox4.Add (this.browseButton);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.browseButton]));
-			w29.Position = 0;
-			w29.Expand = false;
-			w29.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.removeLibButton = new global::Gtk.Button ();
-			this.removeLibButton.Sensitive = false;
-			this.removeLibButton.CanFocus = true;
-			this.removeLibButton.Name = "removeLibButton";
-			this.removeLibButton.UseUnderline = true;
-			this.removeLibButton.Label = global::Mono.Unix.Catalog.GetString ("Remove");
-			this.vbox4.Add (this.removeLibButton);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.removeLibButton]));
-			w30.Position = 1;
-			w30.Expand = false;
-			w30.Fill = false;
-			this.table2.Add (this.vbox4);
-			global::Gtk.Table.TableChild w31 = ((global::Gtk.Table.TableChild)(this.table2[this.vbox4]));
-			w31.TopAttach = ((uint)(1));
-			w31.BottomAttach = ((uint)(2));
-			w31.LeftAttach = ((uint)(2));
-			w31.RightAttach = ((uint)(3));
-			w31.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.notebook1.Add (this.table2);
-			global::Gtk.Notebook.NotebookChild w32 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1[this.table2]));
-			w32.Position = 1;
-			// Notebook tab
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Libraries");
-			this.notebook1.SetTabLabel (this.table2, this.label2);
-			this.label2.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.vbox7 = new global::Gtk.VBox ();
-			this.vbox7.Name = "vbox7";
-			this.vbox7.Spacing = 6;
-			this.vbox7.BorderWidth = ((uint)(3));
-			// Container child vbox7.Gtk.Box+BoxChild
-			this.table3 = new global::Gtk.Table (((uint)(2)), ((uint)(3)), false);
-			this.table3.Name = "table3";
-			this.table3.RowSpacing = ((uint)(10));
-			this.table3.ColumnSpacing = ((uint)(10));
-			// Container child table3.Gtk.Table+TableChild
-			this.includePathAddButton = new global::Gtk.Button ();
-			this.includePathAddButton.Sensitive = false;
-			this.includePathAddButton.CanFocus = true;
-			this.includePathAddButton.Name = "includePathAddButton";
-			this.includePathAddButton.UseUnderline = true;
-			this.includePathAddButton.Label = global::Mono.Unix.Catalog.GetString ("Add");
-			this.table3.Add (this.includePathAddButton);
-			global::Gtk.Table.TableChild w33 = ((global::Gtk.Table.TableChild)(this.table3[this.includePathAddButton]));
-			w33.LeftAttach = ((uint)(2));
-			w33.RightAttach = ((uint)(3));
-			w33.XOptions = ((global::Gtk.AttachOptions)(4));
-			w33.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table3.Gtk.Table+TableChild
-			this.includePathEntry = new global::Gtk.Entry ();
-			this.includePathEntry.CanFocus = true;
-			this.includePathEntry.Name = "includePathEntry";
-			this.includePathEntry.IsEditable = true;
-			this.includePathEntry.InvisibleChar = '●';
-			this.table3.Add (this.includePathEntry);
-			global::Gtk.Table.TableChild w34 = ((global::Gtk.Table.TableChild)(this.table3[this.includePathEntry]));
-			w34.LeftAttach = ((uint)(1));
-			w34.RightAttach = ((uint)(2));
-			w34.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table3.Gtk.Table+TableChild
-			this.label9 = new global::Gtk.Label ();
-			this.label9.Name = "label9";
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Vapi Paths:");
-			this.table3.Add (this.label9);
-			global::Gtk.Table.TableChild w35 = ((global::Gtk.Table.TableChild)(this.table3[this.label9]));
-			w35.XOptions = ((global::Gtk.AttachOptions)(4));
-			w35.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table3.Gtk.Table+TableChild
-			this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow2.CanFocus = true;
-			this.scrolledwindow2.Name = "scrolledwindow2";
-			this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow2.Gtk.Container+ContainerChild
-			this.includePathTreeView = new global::Gtk.TreeView ();
-			this.includePathTreeView.CanFocus = true;
-			this.includePathTreeView.Name = "includePathTreeView";
-			this.scrolledwindow2.Add (this.includePathTreeView);
-			this.table3.Add (this.scrolledwindow2);
-			global::Gtk.Table.TableChild w37 = ((global::Gtk.Table.TableChild)(this.table3[this.scrolledwindow2]));
-			w37.TopAttach = ((uint)(1));
-			w37.BottomAttach = ((uint)(2));
-			w37.LeftAttach = ((uint)(1));
-			w37.RightAttach = ((uint)(2));
-			// Container child table3.Gtk.Table+TableChild
-			this.vbox5 = new global::Gtk.VBox ();
-			this.vbox5.Name = "vbox5";
-			this.vbox5.Spacing = 6;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.includePathBrowseButton = new global::Gtk.Button ();
-			this.includePathBrowseButton.CanFocus = true;
-			this.includePathBrowseButton.Name = "includePathBrowseButton";
-			this.includePathBrowseButton.UseUnderline = true;
-			this.includePathBrowseButton.Label = global::Mono.Unix.Catalog.GetString ("Browse...");
-			this.vbox5.Add (this.includePathBrowseButton);
-			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.includePathBrowseButton]));
-			w38.Position = 0;
-			w38.Expand = false;
-			w38.Fill = false;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.includePathRemoveButton = new global::Gtk.Button ();
-			this.includePathRemoveButton.Sensitive = false;
-			this.includePathRemoveButton.CanFocus = true;
-			this.includePathRemoveButton.Name = "includePathRemoveButton";
-			this.includePathRemoveButton.UseUnderline = true;
-			this.includePathRemoveButton.Label = global::Mono.Unix.Catalog.GetString ("Remove");
-			this.vbox5.Add (this.includePathRemoveButton);
-			global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.includePathRemoveButton]));
-			w39.Position = 1;
-			w39.Expand = false;
-			w39.Fill = false;
-			this.table3.Add (this.vbox5);
-			global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table3[this.vbox5]));
-			w40.TopAttach = ((uint)(1));
-			w40.BottomAttach = ((uint)(2));
-			w40.LeftAttach = ((uint)(2));
-			w40.RightAttach = ((uint)(3));
-			w40.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox7.Add (this.table3);
-			global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox7[this.table3]));
-			w41.Position = 0;
-			this.notebook1.Add (this.vbox7);
-			global::Gtk.Notebook.NotebookChild w42 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox7]));
-			w42.Position = 2;
-			// Notebook tab
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Paths");
-			this.notebook1.SetTabLabel (this.vbox7, this.label3);
-			this.label3.ShowAll ();
-			this.Add (this.notebook1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.targetComboBox.Changed += new global::System.EventHandler (this.OnTargetComboBoxChanged);
-			this.browseButton.Clicked += new global::System.EventHandler (this.OnBrowseButtonClick);
-			this.removeLibButton.Clicked += new global::System.EventHandler (this.OnRemoveLibButtonClicked);
-			this.removeLibButton.Clicked += new global::System.EventHandler (this.OnLibRemoved);
-			this.libTreeView.CursorChanged += new global::System.EventHandler (this.OnLibTreeViewCursorChanged);
-			this.libAddEntry.Changed += new global::System.EventHandler (this.OnLibAddEntryChanged);
-			this.libAddEntry.Activated += new global::System.EventHandler (this.OnLibAddEntryActivated);
-			this.addLibButton.Clicked += new global::System.EventHandler (this.OnLibAdded);
-			this.includePathBrowseButton.Clicked += new global::System.EventHandler (this.OnIncludePathBrowseButtonClick);
-			this.includePathRemoveButton.Clicked += new global::System.EventHandler (this.OnIncludePathRemoveButtonClicked);
-			this.includePathRemoveButton.Clicked += new global::System.EventHandler (this.OnIncludePathRemoved);
-			this.includePathTreeView.CursorChanged += new global::System.EventHandler (this.OnIncludePathTreeViewCursorChanged);
-			this.includePathEntry.Changed += new global::System.EventHandler (this.OnIncludePathEntryChanged);
-			this.includePathEntry.Activated += new global::System.EventHandler (this.OnIncludePathEntryActivated);
-			this.includePathAddButton.Clicked += new global::System.EventHandler (this.OnIncludePathAdded);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs
deleted file mode 100644
index 2487884894..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class EditPackagesDialog
-	{
-		private global::Gtk.VPaned vpaned1;
-
-		private global::Gtk.HBox hbox1;
-
-		private global::Gtk.Notebook notebook1;
-
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-
-		private global::Gtk.TreeView normalPackageTreeView;
-
-		private global::Gtk.Label label1;
-
-		private global::Gtk.ScrolledWindow scrolledwindow3;
-
-		private global::Gtk.TreeView projectPackageTreeView;
-
-		private global::Gtk.Label label2;
-
-		private global::Gtk.VBox vbox3;
-
-		private global::Gtk.Fixed fixed1;
-
-		private global::Gtk.Button detailsButton;
-
-		private global::Gtk.Table table1;
-
-		private global::Gtk.Label label3;
-
-		private global::Gtk.ScrolledWindow scrolledwindow2;
-
-		private global::Gtk.TreeView selectedPackageTreeView;
-
-		private global::Gtk.VBox vbox2;
-
-		private global::Gtk.Button removeButton;
-
-		private global::Gtk.Button buttonCancel;
-
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.EditPackagesDialog
-			this.Name = "MonoDevelop.ValaBinding.EditPackagesDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Edit packages");
-			this.Modal = true;
-			// Internal child MonoDevelop.ValaBinding.EditPackagesDialog.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vpaned1 = new global::Gtk.VPaned ();
-			this.vpaned1.CanFocus = true;
-			this.vpaned1.Name = "vpaned1";
-			this.vpaned1.Position = 183;
-			this.vpaned1.BorderWidth = ((uint)(6));
-			// Container child vpaned1.Gtk.Paned+PanedChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.notebook1 = new global::Gtk.Notebook ();
-			this.notebook1.CanFocus = true;
-			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.normalPackageTreeView = new global::Gtk.TreeView ();
-			this.normalPackageTreeView.CanFocus = true;
-			this.normalPackageTreeView.Name = "normalPackageTreeView";
-			this.scrolledwindow1.Add (this.normalPackageTreeView);
-			this.notebook1.Add (this.scrolledwindow1);
-			// Notebook tab
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("System Packages");
-			this.notebook1.SetTabLabel (this.scrolledwindow1, this.label1);
-			this.label1.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.scrolledwindow3 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow3.CanFocus = true;
-			this.scrolledwindow3.Name = "scrolledwindow3";
-			this.scrolledwindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow3.Gtk.Container+ContainerChild
-			this.projectPackageTreeView = new global::Gtk.TreeView ();
-			this.projectPackageTreeView.CanFocus = true;
-			this.projectPackageTreeView.Name = "projectPackageTreeView";
-			this.scrolledwindow3.Add (this.projectPackageTreeView);
-			this.notebook1.Add (this.scrolledwindow3);
-			global::Gtk.Notebook.NotebookChild w5 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1[this.scrolledwindow3]));
-			w5.Position = 1;
-			// Notebook tab
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Project Packages");
-			this.notebook1.SetTabLabel (this.scrolledwindow3, this.label2);
-			this.label2.ShowAll ();
-			this.hbox1.Add (this.notebook1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.notebook1]));
-			w6.Position = 0;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Fixed ();
-			this.fixed1.HeightRequest = 21;
-			this.fixed1.Name = "fixed1";
-			this.fixed1.HasWindow = false;
-			this.vbox3.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.fixed1]));
-			w7.Position = 0;
-			w7.Expand = false;
-			w7.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.detailsButton = new global::Gtk.Button ();
-			this.detailsButton.WidthRequest = 33;
-			this.detailsButton.HeightRequest = 33;
-			this.detailsButton.Sensitive = false;
-			this.detailsButton.CanFocus = true;
-			this.detailsButton.Name = "detailsButton";
-			this.detailsButton.UseUnderline = true;
-			this.detailsButton.Label = global::Mono.Unix.Catalog.GetString ("...");
-			this.vbox3.Add (this.detailsButton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.detailsButton]));
-			w8.Position = 1;
-			w8.Expand = false;
-			w8.Fill = false;
-			this.hbox1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox3]));
-			w9.Position = 1;
-			w9.Expand = false;
-			w9.Fill = false;
-			this.vpaned1.Add (this.hbox1);
-			global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.vpaned1[this.hbox1]));
-			w10.Resize = false;
-			// Container child vpaned1.Gtk.Paned+PanedChild
-			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xalign = 0f;
-			this.label3.Yalign = 0f;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Selected packages:");
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
-			w11.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow2.CanFocus = true;
-			this.scrolledwindow2.Name = "scrolledwindow2";
-			this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow2.Gtk.Container+ContainerChild
-			this.selectedPackageTreeView = new global::Gtk.TreeView ();
-			this.selectedPackageTreeView.CanFocus = true;
-			this.selectedPackageTreeView.Name = "selectedPackageTreeView";
-			this.scrolledwindow2.Add (this.selectedPackageTreeView);
-			this.table1.Add (this.scrolledwindow2);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.scrolledwindow2]));
-			w13.TopAttach = ((uint)(1));
-			w13.BottomAttach = ((uint)(2));
-			w13.XOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.removeButton = new global::Gtk.Button ();
-			this.removeButton.TooltipMarkup = "Remove selected package from the project.";
-			this.removeButton.WidthRequest = 33;
-			this.removeButton.HeightRequest = 33;
-			this.removeButton.Sensitive = false;
-			this.removeButton.CanFocus = true;
-			this.removeButton.Name = "removeButton";
-			this.removeButton.UseUnderline = true;
-			// Container child removeButton.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w14 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w15 = new global::Gtk.HBox ();
-			w15.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w16 = new global::Gtk.Image ();
-			w16.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Menu);
-			w15.Add (w16);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w18 = new global::Gtk.Label ();
-			w15.Add (w18);
-			w14.Add (w15);
-			this.removeButton.Add (w14);
-			this.vbox2.Add (this.removeButton);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.removeButton]));
-			w22.Position = 0;
-			w22.Expand = false;
-			w22.Fill = false;
-			this.table1.Add (this.vbox2);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox2]));
-			w23.TopAttach = ((uint)(1));
-			w23.BottomAttach = ((uint)(2));
-			w23.LeftAttach = ((uint)(1));
-			w23.RightAttach = ((uint)(2));
-			w23.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.vpaned1.Add (this.table1);
-			w1.Add (this.vpaned1);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(w1[this.vpaned1]));
-			w25.Position = 0;
-			w25.Padding = ((uint)(3));
-			// Internal child MonoDevelop.ValaBinding.EditPackagesDialog.ActionArea
-			global::Gtk.HButtonBox w26 = this.ActionArea;
-			w26.Name = "dialog1_ActionArea";
-			w26.Spacing = 6;
-			w26.BorderWidth = ((uint)(5));
-			w26.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w27 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w26[this.buttonCancel]));
-			w27.Expand = false;
-			w27.Fill = false;
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w28 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w26[this.buttonOk]));
-			w28.Position = 1;
-			w28.Expand = false;
-			w28.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 580;
-			this.DefaultHeight = 449;
-			this.Show ();
-			this.normalPackageTreeView.CursorChanged += new global::System.EventHandler (this.OnNonSelectedPackageCursorChanged);
-			this.projectPackageTreeView.CursorChanged += new global::System.EventHandler (this.OnNonSelectedPackageCursorChanged);
-			this.detailsButton.Clicked += new global::System.EventHandler (this.OnDetailsButtonClicked);
-			this.removeButton.Clicked += new global::System.EventHandler (this.OnRemoveButtonClicked);
-			this.removeButton.Clicked += new global::System.EventHandler (this.OnRemoveButtonClick);
-			this.selectedPackageTreeView.CursorChanged += new global::System.EventHandler (this.OnSelectedPackagesTreeViewCursorChanged);
-			this.buttonCancel.Clicked += new global::System.EventHandler (this.OnCancelButtonClick);
-			this.buttonOk.Clicked += new global::System.EventHandler (this.OnOkButtonClick);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs
deleted file mode 100644
index abad2d4406..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class GeneralOptionsPanel
-	{
-		private global::Gtk.Table table1;
-
-		private global::Gtk.Label label1;
-
-		private global::Gtk.ComboBox valaCombo;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.GeneralOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.ValaBinding.GeneralOptionsPanel";
-			// Container child MonoDevelop.ValaBinding.GeneralOptionsPanel.Gtk.Container+ContainerChild
-			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xpad = 10;
-			this.label1.Xalign = 0f;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Default Vala Compiler:");
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
-			w1.XOptions = ((global::Gtk.AttachOptions)(4));
-			w1.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.valaCombo = global::Gtk.ComboBox.NewText ();
-			this.valaCombo.TooltipMarkup = "Default compiler to use for new C projects.";
-			this.valaCombo.Name = "valaCombo";
-			this.table1.Add (this.valaCombo);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.valaCombo]));
-			w2.LeftAttach = ((uint)(1));
-			w2.RightAttach = ((uint)(2));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.Add (this.table1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.valaCombo.Changed += new global::System.EventHandler (this.OnValaComboChanged);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs
deleted file mode 100644
index 674f5c4fb7..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class OutputOptionsPanel
-	{
-		private global::Gtk.VBox vbox2;
-
-		private global::Gtk.Table table1;
-
-		private global::Gtk.HBox hbox1;
-
-		private global::Gtk.Entry outputPathTextEntry;
-
-		private global::Gtk.Button browseButton;
-
-		private global::Gtk.Label label1;
-
-		private global::Gtk.Label label2;
-
-		private global::Gtk.Label label3;
-
-		private global::Gtk.Label label4;
-
-		private global::Gtk.Entry outputNameTextEntry;
-
-		private global::Gtk.Entry parametersTextEntry;
-
-		private global::Gtk.CheckButton externalConsoleCheckbox;
-
-		private global::Gtk.CheckButton pauseCheckbox;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.OutputOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.ValaBinding.OutputOptionsPanel";
-			// Container child MonoDevelop.ValaBinding.OutputOptionsPanel.Gtk.Container+ContainerChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			this.vbox2.BorderWidth = ((uint)(3));
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			this.table1.BorderWidth = ((uint)(3));
-			// Container child table1.Gtk.Table+TableChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.outputPathTextEntry = new global::Gtk.Entry ();
-			this.outputPathTextEntry.CanFocus = true;
-			this.outputPathTextEntry.Name = "outputPathTextEntry";
-			this.outputPathTextEntry.IsEditable = true;
-			this.outputPathTextEntry.InvisibleChar = '●';
-			this.hbox1.Add (this.outputPathTextEntry);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.outputPathTextEntry]));
-			w1.Position = 0;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.browseButton = new global::Gtk.Button ();
-			this.browseButton.CanFocus = true;
-			this.browseButton.Name = "browseButton";
-			this.browseButton.UseUnderline = true;
-			this.browseButton.Label = global::Mono.Unix.Catalog.GetString ("_Browse");
-			this.hbox1.Add (this.browseButton);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.browseButton]));
-			w2.Position = 1;
-			w2.Expand = false;
-			w2.Fill = false;
-			this.table1.Add (this.hbox1);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox1]));
-			w3.TopAttach = ((uint)(2));
-			w3.BottomAttach = ((uint)(3));
-			w3.LeftAttach = ((uint)(1));
-			w3.RightAttach = ((uint)(2));
-			w3.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0f;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Output</b>");
-			this.label1.UseMarkup = true;
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.Xalign = 0f;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Output Name:");
-			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
-			w5.TopAttach = ((uint)(1));
-			w5.BottomAttach = ((uint)(2));
-			w5.XPadding = ((uint)(15));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xalign = 0f;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Output Path:");
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
-			w6.TopAttach = ((uint)(2));
-			w6.BottomAttach = ((uint)(3));
-			w6.XPadding = ((uint)(15));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.Name = "label4";
-			this.label4.Xalign = 0f;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("Parameters:");
-			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
-			w7.TopAttach = ((uint)(3));
-			w7.BottomAttach = ((uint)(4));
-			w7.XPadding = ((uint)(15));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.outputNameTextEntry = new global::Gtk.Entry ();
-			this.outputNameTextEntry.CanFocus = true;
-			this.outputNameTextEntry.Name = "outputNameTextEntry";
-			this.outputNameTextEntry.IsEditable = true;
-			this.outputNameTextEntry.InvisibleChar = '●';
-			this.table1.Add (this.outputNameTextEntry);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.outputNameTextEntry]));
-			w8.TopAttach = ((uint)(1));
-			w8.BottomAttach = ((uint)(2));
-			w8.LeftAttach = ((uint)(1));
-			w8.RightAttach = ((uint)(2));
-			w8.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.parametersTextEntry = new global::Gtk.Entry ();
-			this.parametersTextEntry.CanFocus = true;
-			this.parametersTextEntry.Name = "parametersTextEntry";
-			this.parametersTextEntry.IsEditable = true;
-			this.parametersTextEntry.InvisibleChar = '●';
-			this.table1.Add (this.parametersTextEntry);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.parametersTextEntry]));
-			w9.TopAttach = ((uint)(3));
-			w9.BottomAttach = ((uint)(4));
-			w9.LeftAttach = ((uint)(1));
-			w9.RightAttach = ((uint)(2));
-			w9.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox2.Add (this.table1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.table1]));
-			w10.Position = 0;
-			w10.Expand = false;
-			w10.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.externalConsoleCheckbox = new global::Gtk.CheckButton ();
-			this.externalConsoleCheckbox.CanFocus = true;
-			this.externalConsoleCheckbox.Name = "externalConsoleCheckbox";
-			this.externalConsoleCheckbox.Label = global::Mono.Unix.Catalog.GetString ("Run on e_xternal console");
-			this.externalConsoleCheckbox.Active = true;
-			this.externalConsoleCheckbox.DrawIndicator = true;
-			this.externalConsoleCheckbox.UseUnderline = true;
-			this.vbox2.Add (this.externalConsoleCheckbox);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.externalConsoleCheckbox]));
-			w11.Position = 1;
-			w11.Expand = false;
-			w11.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.pauseCheckbox = new global::Gtk.CheckButton ();
-			this.pauseCheckbox.Sensitive = false;
-			this.pauseCheckbox.CanFocus = true;
-			this.pauseCheckbox.Name = "pauseCheckbox";
-			this.pauseCheckbox.Label = global::Mono.Unix.Catalog.GetString ("Pause _console output");
-			this.pauseCheckbox.DrawIndicator = true;
-			this.pauseCheckbox.UseUnderline = true;
-			this.vbox2.Add (this.pauseCheckbox);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.pauseCheckbox]));
-			w12.Position = 2;
-			w12.Expand = false;
-			w12.Fill = false;
-			this.Add (this.vbox2);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.browseButton.Clicked += new global::System.EventHandler (this.OnBrowseButtonClick);
-			this.externalConsoleCheckbox.Clicked += new global::System.EventHandler (this.OnExternalConsoleCheckboxClicked);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs b/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs
deleted file mode 100644
index 1ebf59fcac..0000000000
--- a/extras/ValaBinding/gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.ValaBinding
-{
-	public partial class PackageDetails
-	{
-		private global::Gtk.VBox vbox3;
-
-		private global::Gtk.Table table1;
-
-		private global::Gtk.Label descriptionLabel;
-
-		private global::Gtk.Label label7;
-
-		private global::Gtk.Label label8;
-
-		private global::Gtk.Label label9;
-
-		private global::Gtk.Label nameLabel;
-
-		private global::Gtk.Label versionLabel;
-
-		private global::Gtk.VBox vbox4;
-
-		private global::Gtk.Label label13;
-
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-
-		private global::Gtk.TreeView requiresTreeView;
-
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.ValaBinding.PackageDetails
-			this.Name = "MonoDevelop.ValaBinding.PackageDetails";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Package Details");
-			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
-			// Internal child MonoDevelop.ValaBinding.PackageDetails.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			this.vbox3.BorderWidth = ((uint)(3));
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.descriptionLabel = new global::Gtk.Label ();
-			this.descriptionLabel.Name = "descriptionLabel";
-			this.descriptionLabel.Xalign = 0f;
-			this.descriptionLabel.Yalign = 0f;
-			this.descriptionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("label12");
-			this.table1.Add (this.descriptionLabel);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.descriptionLabel]));
-			w2.TopAttach = ((uint)(2));
-			w2.BottomAttach = ((uint)(3));
-			w2.LeftAttach = ((uint)(1));
-			w2.RightAttach = ((uint)(2));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label7 = new global::Gtk.Label ();
-			this.label7.Name = "label7";
-			this.label7.Xalign = 0f;
-			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Name:");
-			this.table1.Add (this.label7);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.label7]));
-			w3.XOptions = ((global::Gtk.AttachOptions)(4));
-			w3.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label8 = new global::Gtk.Label ();
-			this.label8.Name = "label8";
-			this.label8.Xalign = 0f;
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Version:");
-			this.table1.Add (this.label8);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.label8]));
-			w4.TopAttach = ((uint)(1));
-			w4.BottomAttach = ((uint)(2));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label9 = new global::Gtk.Label ();
-			this.label9.Name = "label9";
-			this.label9.Xalign = 0f;
-			this.label9.Yalign = 0f;
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Description:");
-			this.table1.Add (this.label9);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label9]));
-			w5.TopAttach = ((uint)(2));
-			w5.BottomAttach = ((uint)(3));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.nameLabel = new global::Gtk.Label ();
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Xalign = 0f;
-			this.nameLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("label10");
-			this.table1.Add (this.nameLabel);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.nameLabel]));
-			w6.LeftAttach = ((uint)(1));
-			w6.RightAttach = ((uint)(2));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.versionLabel = new global::Gtk.Label ();
-			this.versionLabel.Name = "versionLabel";
-			this.versionLabel.Xalign = 0f;
-			this.versionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("label11");
-			this.table1.Add (this.versionLabel);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.versionLabel]));
-			w7.TopAttach = ((uint)(1));
-			w7.BottomAttach = ((uint)(2));
-			w7.LeftAttach = ((uint)(1));
-			w7.RightAttach = ((uint)(2));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox3.Add (this.table1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.table1]));
-			w8.Position = 0;
-			w8.Expand = false;
-			w8.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.vbox4 = new global::Gtk.VBox ();
-			this.vbox4.Name = "vbox4";
-			this.vbox4.Spacing = 6;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.label13 = new global::Gtk.Label ();
-			this.label13.Name = "label13";
-			this.label13.Xalign = 0f;
-			this.label13.LabelProp = global::Mono.Unix.Catalog.GetString ("Requires:");
-			this.vbox4.Add (this.label13);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.label13]));
-			w9.Position = 0;
-			w9.Expand = false;
-			w9.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w10 = new global::Gtk.Viewport ();
-			w10.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child GtkViewport.Gtk.Container+ContainerChild
-			this.requiresTreeView = new global::Gtk.TreeView ();
-			this.requiresTreeView.CanFocus = true;
-			this.requiresTreeView.Name = "requiresTreeView";
-			w10.Add (this.requiresTreeView);
-			this.scrolledwindow1.Add (w10);
-			this.vbox4.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.scrolledwindow1]));
-			w13.Position = 1;
-			this.vbox3.Add (this.vbox4);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.vbox4]));
-			w14.Position = 1;
-			w1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1[this.vbox3]));
-			w15.Position = 0;
-			// Internal child MonoDevelop.ValaBinding.PackageDetails.ActionArea
-			global::Gtk.HButtonBox w16 = this.ActionArea;
-			w16.Name = "dialog1_ActionArea";
-			w16.Spacing = 6;
-			w16.BorderWidth = ((uint)(5));
-			w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonOk]));
-			w17.Expand = false;
-			w17.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 608;
-			this.DefaultHeight = 518;
-			this.Show ();
-			this.buttonOk.Clicked += new global::System.EventHandler (this.OnButtonOkClicked);
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/generated.cs b/extras/ValaBinding/gtk-gui/generated.cs
deleted file mode 100644
index 559a39ec59..0000000000
--- a/extras/ValaBinding/gtk-gui/generated.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace Stetic
-{
-	internal class Gui
-	{
-		private static bool initialized;
-
-		static internal void Initialize (Gtk.Widget iconRenderer)
-		{
-			if ((Stetic.Gui.initialized == false)) {
-				Stetic.Gui.initialized = true;
-			}
-		}
-	}
-
-	internal class BinContainer
-	{
-		private Gtk.Widget child;
-
-		private Gtk.UIManager uimanager;
-
-		public static BinContainer Attach (Gtk.Bin bin)
-		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
-			return bc;
-		}
-
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
-		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
-			}
-		}
-
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
-		{
-			if ((this.child != null)) {
-				this.child.Allocation = args.Allocation;
-			}
-		}
-
-		private void OnAdded (object sender, Gtk.AddedArgs args)
-		{
-			this.child = args.Widget;
-		}
-
-		public void SetUiManager (Gtk.UIManager uim)
-		{
-			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
-		}
-
-		private void OnRealized (object sender, System.EventArgs args)
-		{
-			if ((this.uimanager != null)) {
-				Gtk.Widget w;
-				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
-					this.uimanager = null;
-				}
-			}
-		}
-	}
-
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out sz, out sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
-	internal class ActionGroups
-	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
-		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
-		}
-
-		public static Gtk.ActionGroup GetActionGroup (string name)
-		{
-			return null;
-		}
-	}
-}
diff --git a/extras/ValaBinding/gtk-gui/gui.stetic b/extras/ValaBinding/gtk-gui/gui.stetic
deleted file mode 100644
index a7a8be850d..0000000000
--- a/extras/ValaBinding/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,1791 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
-  <configuration>
-    <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12</target-gtk-version>
-  </configuration>
-  <import>
-    <widget-library name="MonoDevelop.VersionControl, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.NUnit, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.XmlEditor, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Gettext, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Deployment, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Deployment.Linux, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.GtkCore, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.DesignerSupport, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.VBNetBinding, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.CBinding, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.CSharpBinding, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Autotools, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Ide, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.SourceEditor2, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Debugger, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Refactoring, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral" />
-    <widget-library name="../build/MonoDevelop.ValaBinding.dll" internal="true" />
-  </import>
-  <widget class="Gtk.Bin" id="MonoDevelop.ValaBinding.CodeGenerationPanel" design-size="611 396">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.Notebook" id="notebook1">
-        <property name="MemberName" />
-        <property name="CanFocus">True</property>
-        <property name="CurrentPage">0</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox6">
-            <property name="MemberName" />
-            <property name="Spacing">3</property>
-            <child>
-              <widget class="Gtk.Table" id="table1">
-                <property name="MemberName" />
-                <property name="NRows">4</property>
-                <property name="NColumns">2</property>
-                <property name="RowSpacing">5</property>
-                <property name="ColumnSpacing">5</property>
-                <property name="BorderWidth">2</property>
-                <child>
-                  <widget class="Gtk.Label" id="label10">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Warning Level:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label4">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Multithreading:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">3</property>
-                    <property name="BottomAttach">4</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label5">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Optimization Level:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label6">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Target:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.SpinButton" id="optimizationSpinButton">
-                    <property name="MemberName" />
-                    <property name="Sensitive">False</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Upper">3</property>
-                    <property name="PageIncrement">10</property>
-                    <property name="StepIncrement">1</property>
-                    <property name="ClimbRate">1</property>
-                    <property name="Numeric">True</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ComboBox" id="targetComboBox">
-                    <property name="MemberName" />
-                    <property name="IsTextCombo">True</property>
-                    <property name="Items" translatable="yes">Executable
-Static Library
-Shared Object</property>
-                    <signal name="Changed" handler="OnTargetComboBoxChanged" />
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.CheckButton" id="threadingCheckbox">
-                    <property name="MemberName">threadingCheckbox</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Label" translatable="yes">Enable multithreading</property>
-                    <property name="DrawIndicator">True</property>
-                    <property name="HasLabel">True</property>
-                    <property name="UseUnderline">True</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">3</property>
-                    <property name="BottomAttach">4</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox1">
-                    <property name="MemberName" />
-                    <property name="Spacing">1</property>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="noWarningRadio">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">no warnings</property>
-                        <property name="Active">True</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">group1</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="normalWarningRadio">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">normal</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">group1</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="allWarningRadio">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">all</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">group1</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">2</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.CheckButton" id="warningsAsErrorsCheckBox">
-                        <property name="MemberName" />
-                        <property name="Sensitive">False</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">Treat warnings as errors</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">3</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.HBox" id="hbox1">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="label12">
-                    <property name="MemberName" />
-                    <property name="Xpad">13</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Define Symbols:</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Entry" id="defineSymbolsTextEntry">
-                    <property name="MemberName" />
-                    <property name="Tooltip" translatable="yes">A space-separated list of symbols to define.</property>
-                    <property name="CanFocus">True</property>
-                    <property name="IsEditable">True</property>
-                    <property name="InvisibleChar">●</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Padding">14</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Frame" id="frame2">
-                <property name="MemberName" />
-                <property name="ShadowType">None</property>
-                <property name="LabelYalign">0</property>
-                <child>
-                  <widget class="Gtk.Alignment" id="GtkAlignment">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LeftPadding">12</property>
-                    <child>
-                      <widget class="Gtk.Table" id="table5">
-                        <property name="MemberName" />
-                        <property name="NRows">2</property>
-                        <property name="RowSpacing">6</property>
-                        <property name="ColumnSpacing">9</property>
-                        <property name="BorderWidth">6</property>
-                        <child>
-                          <widget class="Gtk.Label" id="label7">
-                            <property name="MemberName" />
-                            <property name="Xalign">0</property>
-                            <property name="LabelProp" translatable="yes">Extra Compiler Options</property>
-                          </widget>
-                          <packing>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ScrolledWindow" id="scrolledwindow4">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="ShadowType">In</property>
-                            <child>
-                              <widget class="Gtk.TextView" id="extraCompilerTextView">
-                                <property name="MemberName" />
-                                <property name="Tooltip" translatable="yes">A newline-separated list of extra options to send to the compiler.
-One option can be in more than one line.
-Example:
-	`--pkg
-	cairo`</property>
-                                <property name="CanFocus">True</property>
-                                <property name="Text" translatable="yes" />
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">True</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="GtkLabel12">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">&lt;b&gt;Extra Options&lt;/b&gt;</property>
-                    <property name="UseMarkup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label1">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Code Generation</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Table" id="table2">
-            <property name="MemberName" />
-            <property name="NRows">2</property>
-            <property name="NColumns">3</property>
-            <property name="RowSpacing">10</property>
-            <property name="ColumnSpacing">10</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.Button" id="addLibButton">
-                <property name="MemberName" />
-                <property name="Sensitive">False</property>
-                <property name="CanFocus">True</property>
-                <property name="Type">TextOnly</property>
-                <property name="Label" translatable="yes">Add</property>
-                <property name="UseUnderline">True</property>
-                <signal name="Clicked" handler="OnLibAdded" />
-              </widget>
-              <packing>
-                <property name="LeftAttach">2</property>
-                <property name="RightAttach">3</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label8">
-                <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">Library:</property>
-              </widget>
-              <packing>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Entry" id="libAddEntry">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="IsEditable">True</property>
-                <property name="InvisibleChar">●</property>
-                <signal name="Changed" handler="OnLibAddEntryChanged" />
-                <signal name="Activated" handler="OnLibAddEntryActivated" />
-              </widget>
-              <packing>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="ShadowType">In</property>
-                <child>
-                  <widget class="Gtk.TreeView" id="libTreeView">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <signal name="CursorChanged" handler="OnLibTreeViewCursorChanged" />
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">True</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox4">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Button" id="browseButton">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Browse...</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnBrowseButtonClick" />
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="removeLibButton">
-                    <property name="MemberName" />
-                    <property name="Sensitive">False</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Remove</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnRemoveLibButtonClicked" />
-                    <signal name="Clicked" handler="OnLibRemoved" />
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="LeftAttach">2</property>
-                <property name="RightAttach">3</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">True</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label2">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Libraries</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.VBox" id="vbox7">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <widget class="Gtk.Table" id="table3">
-                <property name="MemberName" />
-                <property name="NRows">2</property>
-                <property name="NColumns">3</property>
-                <property name="RowSpacing">10</property>
-                <property name="ColumnSpacing">10</property>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="includePathAddButton">
-                    <property name="MemberName" />
-                    <property name="Sensitive">False</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Add</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnIncludePathAdded" />
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">2</property>
-                    <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Entry" id="includePathEntry">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="IsEditable">True</property>
-                    <property name="InvisibleChar">●</property>
-                    <signal name="Changed" handler="OnIncludePathEntryChanged" />
-                    <signal name="Activated" handler="OnIncludePathEntryActivated" />
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label9">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">Vapi Paths:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="includePathTreeView">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <signal name="CursorChanged" handler="OnIncludePathTreeViewCursorChanged" />
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox5">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Button" id="includePathBrowseButton">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">Browse...</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnIncludePathBrowseButtonClick" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="includePathRemoveButton">
-                        <property name="MemberName" />
-                        <property name="Sensitive">False</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">Remove</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnIncludePathRemoveButtonClicked" />
-                        <signal name="Clicked" handler="OnIncludePathRemoved" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">2</property>
-                    <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label3">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Paths</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.ValaBinding.AddLibraryDialog" design-size="648 439">
-    <property name="MemberName" />
-    <property name="Title" translatable="yes">Add Library</property>
-    <property name="Modal">True</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.FileChooserWidget" id="file_chooser_widget">
-            <property name="MemberName" />
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonCancel">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
-            <property name="ResponseId">-6</property>
-            <signal name="Clicked" handler="OnCancelButtonClick" />
-            <property name="label">gtk-cancel</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <signal name="Clicked" handler="OnOkButtonClick" />
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.ValaBinding.AddPathDialog" design-size="649 436">
-    <property name="MemberName" />
-    <property name="Title" translatable="yes">Add Path</property>
-    <property name="Modal">True</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.FileChooserWidget" id="file_chooser_widget">
-            <property name="MemberName" />
-            <property name="ShowHidden">True</property>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonCancel">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
-            <property name="ResponseId">-6</property>
-            <signal name="Clicked" handler="OnCancelButtonClick" />
-            <property name="label">gtk-cancel</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <signal name="Clicked" handler="OnOkButtonClick" />
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.ValaBinding.OutputOptionsPanel" design-size="412 273">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.VBox" id="vbox2">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">3</property>
-        <child>
-          <widget class="Gtk.Table" id="table1">
-            <property name="MemberName" />
-            <property name="NRows">4</property>
-            <property name="NColumns">2</property>
-            <property name="RowSpacing">6</property>
-            <property name="ColumnSpacing">6</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.HBox" id="hbox1">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Entry" id="outputPathTextEntry">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="IsEditable">True</property>
-                    <property name="InvisibleChar">●</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="browseButton">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">_Browse</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnBrowseButtonClick" />
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="TopAttach">2</property>
-                <property name="BottomAttach">3</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label1">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">&lt;b&gt;Output&lt;/b&gt;</property>
-                <property name="UseMarkup">True</property>
-              </widget>
-              <packing>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label2">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Output Name:</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="XPadding">15</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label3">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Output Path:</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">2</property>
-                <property name="BottomAttach">3</property>
-                <property name="XPadding">15</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label4">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Parameters:</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">3</property>
-                <property name="BottomAttach">4</property>
-                <property name="XPadding">15</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Entry" id="outputNameTextEntry">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="IsEditable">True</property>
-                <property name="InvisibleChar">●</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Entry" id="parametersTextEntry">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="IsEditable">True</property>
-                <property name="InvisibleChar">●</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">3</property>
-                <property name="BottomAttach">4</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="externalConsoleCheckbox">
-            <property name="MemberName" />
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Run on e_xternal console</property>
-            <property name="Active">True</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-            <signal name="Clicked" handler="OnExternalConsoleCheckboxClicked" />
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="pauseCheckbox">
-            <property name="MemberName" />
-            <property name="Sensitive">False</property>
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Pause _console output</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.ValaBinding.GeneralOptionsPanel" design-size="457 300">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.Table" id="table1">
-        <property name="MemberName" />
-        <property name="NRows">3</property>
-        <property name="NColumns">3</property>
-        <property name="RowSpacing">6</property>
-        <property name="ColumnSpacing">6</property>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label1">
-            <property name="MemberName" />
-            <property name="Xpad">10</property>
-            <property name="Xalign">0</property>
-            <property name="LabelProp" translatable="yes">Default Vala Compiler:</property>
-          </widget>
-          <packing>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.ComboBox" id="valaCombo">
-            <property name="MemberName" />
-            <property name="Tooltip" translatable="yes">Default compiler to use for new C projects.</property>
-            <property name="IsTextCombo">True</property>
-            <property name="Items" translatable="yes" />
-            <signal name="Changed" handler="OnValaComboChanged" />
-          </widget>
-          <packing>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.ValaBinding.EditPackagesDialog" design-size="580 449">
-    <property name="MemberName" />
-    <property name="Title" translatable="yes">Edit packages</property>
-    <property name="Modal">True</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VPaned" id="vpaned1">
-            <property name="MemberName" />
-            <property name="CanFocus">True</property>
-            <property name="Position">183</property>
-            <property name="BorderWidth">6</property>
-            <child>
-              <widget class="Gtk.HBox" id="hbox1">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Notebook" id="notebook1">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="CurrentPage">0</property>
-                    <child>
-                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShadowType">In</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="normalPackageTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <signal name="CursorChanged" handler="OnNonSelectedPackageCursorChanged" />
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="label1">
-                        <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">System Packages</property>
-                      </widget>
-                      <packing>
-                        <property name="type">tab</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow3">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShadowType">In</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="projectPackageTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <signal name="CursorChanged" handler="OnNonSelectedPackageCursorChanged" />
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="label2">
-                        <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">Project Packages</property>
-                      </widget>
-                      <packing>
-                        <property name="type">tab</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox3">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Fixed" id="fixed1">
-                        <property name="MemberName" />
-                        <property name="HeightRequest">21</property>
-                        <property name="HasWindow">False</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="detailsButton">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">33</property>
-                        <property name="HeightRequest">33</property>
-                        <property name="Sensitive">False</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">...</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnDetailsButtonClicked" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Resize">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Table" id="table1">
-                <property name="MemberName" />
-                <property name="NRows">2</property>
-                <property name="NColumns">2</property>
-                <property name="RowSpacing">6</property>
-                <property name="ColumnSpacing">6</property>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label3">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LabelProp" translatable="yes">Selected packages:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">False</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="selectedPackageTreeView">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <signal name="CursorChanged" handler="OnSelectedPackagesTreeViewCursorChanged" />
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox2">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Button" id="removeButton">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">33</property>
-                        <property name="HeightRequest">33</property>
-                        <property name="Sensitive">False</property>
-                        <property name="Tooltip">Remove selected package from the project.</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextAndIcon</property>
-                        <property name="Icon">stock:gtk-remove Menu</property>
-                        <property name="Label" />
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnRemoveButtonClicked" />
-                        <signal name="Clicked" handler="OnRemoveButtonClick" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Padding">3</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonCancel">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
-            <property name="ResponseId">-6</property>
-            <signal name="Clicked" handler="OnCancelButtonClick" />
-            <property name="label">gtk-cancel</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <signal name="Clicked" handler="OnOkButtonClick" />
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.ValaBinding.PackageDetails" design-size="608 518">
-    <property name="MemberName" />
-    <property name="Title" translatable="yes">Package Details</property>
-    <property name="WindowPosition">CenterOnParent</property>
-    <property name="Buttons">1</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox3">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <widget class="Gtk.Table" id="table1">
-                <property name="MemberName" />
-                <property name="NRows">3</property>
-                <property name="NColumns">2</property>
-                <property name="RowSpacing">6</property>
-                <property name="ColumnSpacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="descriptionLabel">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LabelProp" translatable="yes">label12</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label7">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Name:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label8">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Version:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label9">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LabelProp" translatable="yes">Description:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="nameLabel">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">label10</property>
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="versionLabel">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">label11</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox4">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="label13">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Requires:</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.Viewport" id="GtkViewport">
-                        <property name="MemberName" />
-                        <property name="ShadowType">None</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="requiresTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="ShowScrollbars">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">1</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <signal name="Clicked" handler="OnButtonOkClicked" />
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</stetic-interface>
diff --git a/extras/ValaBinding/gtk-gui/objects.xml b/extras/ValaBinding/gtk-gui/objects.xml
deleted file mode 100644
index 2c33b19d32..0000000000
--- a/extras/ValaBinding/gtk-gui/objects.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<objects attr-sync="on">
-</objects>
\ No newline at end of file
diff --git a/extras/ValaBinding/icons/Icons.16x16.PrivateUnion b/extras/ValaBinding/icons/Icons.16x16.PrivateUnion
deleted file mode 100644
index cc32f48cb7..0000000000
--- a/extras/ValaBinding/icons/Icons.16x16.PrivateUnion
+++ /dev/null
diff --git a/extras/ValaBinding/icons/Icons.16x16.ProjectReference b/extras/ValaBinding/icons/Icons.16x16.ProjectReference
deleted file mode 100644
index 1a80ef91f0..0000000000
--- a/extras/ValaBinding/icons/Icons.16x16.ProjectReference
+++ /dev/null
diff --git a/extras/ValaBinding/icons/Icons.16x16.ProtectedUnion b/extras/ValaBinding/icons/Icons.16x16.ProtectedUnion
deleted file mode 100644
index df75b65512..0000000000
--- a/extras/ValaBinding/icons/Icons.16x16.ProtectedUnion
+++ /dev/null
diff --git a/extras/ValaBinding/icons/Icons.16x16.Union b/extras/ValaBinding/icons/Icons.16x16.Union
deleted file mode 100644
index 40aae0f994..0000000000
--- a/extras/ValaBinding/icons/Icons.16x16.Union
+++ /dev/null
diff --git a/extras/ValaBinding/icons/text-x-vala.16x16.png b/extras/ValaBinding/icons/text-x-vala.16x16.png
deleted file mode 100644
index 0fe1f50178..0000000000
--- a/extras/ValaBinding/icons/text-x-vala.16x16.png
+++ /dev/null
diff --git a/extras/ValaBinding/icons/text-x-vala.24x24.png b/extras/ValaBinding/icons/text-x-vala.24x24.png
deleted file mode 100644
index daa22b6130..0000000000
--- a/extras/ValaBinding/icons/text-x-vala.24x24.png
+++ /dev/null
diff --git a/extras/ValaBinding/icons/text-x-vala.32x32.png b/extras/ValaBinding/icons/text-x-vala.32x32.png
deleted file mode 100644
index d2e90a000e..0000000000
--- a/extras/ValaBinding/icons/text-x-vala.32x32.png
+++ /dev/null
diff --git a/extras/ValaBinding/icons/text-x-vala.48x48.png b/extras/ValaBinding/icons/text-x-vala.48x48.png
deleted file mode 100644
index b7def393e4..0000000000
--- a/extras/ValaBinding/icons/text-x-vala.48x48.png
+++ /dev/null
diff --git a/extras/ValaBinding/icons/vala-icon-32.png b/extras/ValaBinding/icons/vala-icon-32.png
deleted file mode 100644
index 528a7e6bdb..0000000000
--- a/extras/ValaBinding/icons/vala-icon-32.png
+++ /dev/null
diff --git a/extras/ValaBinding/icons/vala-icon-base.xcf b/extras/ValaBinding/icons/vala-icon-base.xcf
deleted file mode 100644
index 5e6ca0898c..0000000000
--- a/extras/ValaBinding/icons/vala-icon-base.xcf
+++ /dev/null
diff --git a/extras/ValaBinding/monodevelop-vala.spec.in b/extras/ValaBinding/monodevelop-vala.spec.in
deleted file mode 100644
index e51917240b..0000000000
--- a/extras/ValaBinding/monodevelop-vala.spec.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# spec file for package monodevelop-vala
-#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-
-Name:           monodevelop-vala
-Version:        @VERSION@
-Release:        1
-License:        MIT/X11
-AutoReqProv:    on
-BuildArch:      noarch
-Url:            http://www.monodevelop.com
-Source:         %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  mono-devel monodevelop >= %{version}
-Requires:       vala
-Summary:        Monodevelop Vala Addin
-Group:          Development/Tools
-
-%if 0%{?fedora_version}
-%define env_options export MONO_SHARED_DIR=/tmp
-%endif
-
-%description
-Vala language support for MonoDevelop.
-
-%files
-%defattr(-, root, root)
-%_prefix/lib/monodevelop/AddIns/BackendBindings/MonoDevelop.ValaBinding.dll
-
-%prep
-%setup -q
-
-%build
-%{?env_options}
-./configure --prefix=%_prefix
-make
-
-%install
-%{?env_options}
-make install DESTDIR=${RPM_BUILD_ROOT}
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-%if 0%{?fedora_version} || 0%{?rhel_version}
-# Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros)
-%define _use_internal_dependency_generator 0
-%endif
-%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq'
-%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq'
-
-%changelog
diff --git a/extras/ValaBinding/templates/ConsoleValaProject.xpt.xml b/extras/ValaBinding/templates/ConsoleValaProject.xpt.xml
deleted file mode 100644
index 8b9cd20406..0000000000
--- a/extras/ValaBinding/templates/ConsoleValaProject.xpt.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Levi Bard"
-    created      = "03/11/2008"
-    lastModified = "03/11/2008">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Console Project</_Name>
-		<_Category>Vala</_Category>
-		<Icon>md-project-console|res:vala-icon-32.png</Icon>
-		<LanguageName>Vala</LanguageName>
-		<_Description>Creates a simple hello world Vala project.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "Vala">
-			<Options
-				Target = "Bin"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""
-				Packages = "glib-2.0"
-				/>
-			
-			<Files>
-				<File name = "main.vala" AddStandardHeader ="True"><![CDATA[using GLib;
-
-public class HelloVala: GLib.Object {
-	public static int main (string[] args) {
-		stdout.printf ("Hello world!\n");
-		
-		return 0;
-	}
-}]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/extras/ValaBinding/templates/EmptyValaProject.xpt.xml b/extras/ValaBinding/templates/EmptyValaProject.xpt.xml
deleted file mode 100644
index 7b0a347694..0000000000
--- a/extras/ValaBinding/templates/EmptyValaProject.xpt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Levi Bard"
-    created      = "03/11/2008"
-    lastModified = "03/11/2008">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Empty Vala Project</_Name>
-		<_Category>Vala</_Category>
-		<Icon>md-project|res:vala-icon-32.png</Icon>
-		<LanguageName>Vala</LanguageName>
-		<_Description>Creates an empty Vala solution.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "Vala">
-			<Options
-				Target = "Bin"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""
-				Packages = "glib-2.0"
-				/>
-		</Project>
-	</Combine>
-</Template>
diff --git a/extras/ValaBinding/templates/EmptyValaSourceFile.xft.xml b/extras/ValaBinding/templates/EmptyValaSourceFile.xft.xml
deleted file mode 100644
index 2165c056ca..0000000000
--- a/extras/ValaBinding/templates/EmptyValaSourceFile.xft.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Levi Bard"
-	Language="Vala"
-	Created="03/11/2008"
-	LastModified="03/11/2008">
-	
-	<TemplateConfiguration>
-		<_Name>Empty Vala Source File</_Name>
-		<Icon>res:text-x-vala.32x32.png</Icon>
-		<_Category>General</_Category>
-		<LanguageName>Vala</LanguageName>
-		<_Description>Creates an empty Vala source file.</_Description>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".vala" DefaultName="EmptyValaSourceFile" AddStandardHeader ="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/extras/ValaBinding/templates/Makefile.am.template b/extras/ValaBinding/templates/Makefile.am.template
deleted file mode 100644
index 77af3a283d..0000000000
--- a/extras/ValaBinding/templates/Makefile.am.template
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Warning: This is an automatically generated file, do not edit!
-
-VTARGET = %%VTARGET%%
-CLEANFILES = $(VTARGET)
-
-include $(top_srcdir)/Makefile.include
-
-PACKAGE = @PACKAGE@
-BUILD_DIR = %%BUILD_DIR%%
-INSTALL_DIR = %%INSTALL_DIR%%
-
-FILES = %%FILES%%
-VFLAGS = %%VFLAGS%%
-
-install:
-
-uninstall:
-
-all:
-	mkdir -p $(BUILD_DIR)
-	valac $(VFLAGS) -o $(VTARGET) $(FILES)
-    
diff --git a/extras/ValaBinding/templates/Makefile.template b/extras/ValaBinding/templates/Makefile.template
deleted file mode 100644
index b8f2b25a37..0000000000
--- a/extras/ValaBinding/templates/Makefile.template
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Warning: This is an automatically generated file, do not edit!
-
-srcdir=.
-top_srcdir=%%TOP_SRCDIR%%
-
-include $(top_srcdir)/Makefile.include
-include $(top_srcdir)/config.make
-
-BUILD_DIR = %%BUILD_DIR%%
-INSTALL_DIR = %%INSTALL_DIR%%
-
-FILES = %%FILES%%
-VFLAGS = %%VFLAGS%%
-VTARGET = %%VTARGET%%
-
-all: $(VTARGET)
-
-install:
-
-uninstall:
-
-$(VTARGET):
-	mkdir -p $(BUILD_DIR)
-	valac $(VFLAGS) -o $(VTARGET) $(FILES)
-    
diff --git a/extras/ValaBinding/templates/SharedLibraryValaProject.xpt.xml b/extras/ValaBinding/templates/SharedLibraryValaProject.xpt.xml
deleted file mode 100644
index 2b49bf95b0..0000000000
--- a/extras/ValaBinding/templates/SharedLibraryValaProject.xpt.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Levi Bard" 
-    created      = "03/12/2008"
-    lastModified = "03/12/2008">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Shared Library</_Name>
-		<_Category>Vala</_Category>
-		<Icon>md-project-library|res:vala-icon-32.png</Icon>
-		<LanguageName>Vala</LanguageName>
-		<_Description>Creates a simple shared library Vala project.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "Vala">
-			<Options
-				Target = "SharedLibrary"
-				PauseConsoleOutput = "True"
-				CompilerArgs = "" 
-				Packages = "glib-2.0"
-				/>
-			
-			<Files>
-				<File name = "main.vala" AddStandardHeader ="True"><![CDATA[// Library content goes here
-
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/extras/ValaBinding/templates/ValaTestFixture.xpt.xml b/extras/ValaBinding/templates/ValaTestFixture.xpt.xml
deleted file mode 100644
index 6b802ffd5f..0000000000
--- a/extras/ValaBinding/templates/ValaTestFixture.xpt.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Levi Bard"
-    created      = "08/12/2008"
-    lastModified = "08/12/2008">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Test Fixture</_Name>
-		<_Category>Vala</_Category>
-		<Icon>md-project-console|res:vala-icon-32.png</Icon>
-		<LanguageName>Vala</LanguageName>
-		<_Description>Creates a Vala test fixture.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "Vala">
-			<Options
-				Target = "Bin"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""
-				Packages = "glib-2.0"
-				/>
-			
-			<Files>
-				<File name = "main.vala" AddStandardHeader ="True"><![CDATA[using GLib;
-
-public class MyValaTest: GLib.Object {
-	public static void doTest() {
-		// Test code goes here
-	}
-	
-	public static int main (string[] args) {
-		Test.init(ref args);
-		
-		Test.add_func ("/MyValaTest/MyTest", doTest);
-		
-		Test.run();
-		
-		return 0;
-	}
-}]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>