* configure, profiles, profiles/all, profiles/core, profiles/stable,

  main/monodevelop-core-addins.pc.in, main/configure.in,
  main/src/tools/Tools.mds, main/src/tools/mdrun/mdrun.mdp,
  main/src/tools/mdrun/Makefile.am,
  main/src/tools/mdhost/Makefile.am,
  main/src/tools/mdhost/mdhost.mdp,
  main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.mdp,
  main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic,
  main/src/addins/MonoDevelop.Autotools/Makefile.am,
  main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.mdp,
  main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am,
  main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml,
  main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.mdp,
  main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic,
  main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am,
  main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp,
  main/src/addins/MonoDevelop.DesignerSupport/Makefile.am,
  main/src/addins/Addins.mds,
  main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp,
  main/src/addins/MonoDevelop.GtkCore/lib/libsteticui.mdp,
  main/src/addins/MonoDevelop.GtkCore/lib/libstetic.mdp,
  main/src/addins/MonoDevelop.GtkCore/Makefile.am,
  main/src/addins/VersionControl/Diff/Diff.mdp,
  main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am,
  main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
  main/src/addins/VersionControl/DiffWidget/DiffWidget.mdp,
  main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
  main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml,
  main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am,
  main/src/addins/ChangeLogAddIn/ChangeLogAddIn.mdp,
  main/src/addins/ChangeLogAddIn/Makefile.am,
  main/src/addins/WelcomePage/WelcomePage.mdp,
  main/src/addins/Extras.mds,
  main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml,
  main/src/addins/prj2make-sharp-lib/Makefile.am,
  main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp,
  main/src/addins/AspNetAddIn/gtk-gui/objects.xml,
  main/src/addins/AspNetAddIn/AspNetAddIn.addin.xml,
  main/src/addins/AspNetAddIn/AspNetAddIn.mdp,
  main/src/addins/AspNetAddIn/Makefile.am,
  main/src/addins/GeckoWebBrowser/GeckoWebBrowser.mdp,
  main/src/addins/GeckoWebBrowser/Makefile.am,
  main/src/addins/NUnit/MonoDevelop.NUnit.mdp,
  main/src/addins/NUnit/Makefile.am,
  main/src/addins/MonoDevelop.SourceEditor/Makefile.am,
  main/src/addins/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp,
  main/src/addins/MonoDeveloperExtensions/Makefile.am,
  main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.mdp,
  main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.mdp,
  main/src/addins/ILAsmBinding/ILAsmBinding.mdp,
  main/src/addins/ILAsmBinding/Makefile.am,
  main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.mdp,
  main/src/addins/MonoDevelop.WebReferences/Makefile.am,
  main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp,
  main/src/addins/MonoDevelop.RegexToolkit/Makefile.am,
  main/src/addins/VBNetBinding/VBNetBinding.addin.xml,
  main/src/addins/VBNetBinding/VBNetBinding.mdp,
  main/src/addins/VBNetBinding/VBNetBinding.mds,
  main/src/addins/VBNetBinding/Makefile.am,
  main/src/addins/Makefile.am,
  main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.mdp,
  main/src/addins/MonoDevelop.Gettext/Makefile.am,
  main/src/addins/CSharpBinding/CSharpBinding.addin.xml,
  main/src/addins/CSharpBinding/Autotools/Autotools.mdp,
  main/src/addins/CSharpBinding/Autotools/Makefile.am,
  main/src/addins/CSharpBinding/CSharpBinding.mdp,
  main/src/addins/CSharpBinding/CSharpBinding.mds,
  main/src/addins/CSharpBinding/gtk-gui/gui.stetic,
  main/src/addins/CSharpBinding/Makefile.am,
  main/src/addins/CBinding/CBinding.addin.xml,
  main/src/addins/CBinding/CBinding.mdp,
  main/src/addins/CBinding/CBinding.mds,
  main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.mdp,
  main/src/addins/CBinding/Makefile.am,
  main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.mdp,
  main/src/core/MonoDevelop.Projects/Makefile.am,
  main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp,
  main/src/core/MonoDevelop.Core.Gui/Makefile.am,
  main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp,
  main/src/core/MonoDevelop.Projects.Gui/Makefile.am,
  main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp,
  main/src/core/MonoDevelop.Ide/Makefile.am,
  main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.mdp,
  main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins,
  main/src/core/MonoDevelop.Startup/Makefile.am,
  main/src/core/Makefile.am, main/src/core/Core.mds,
  main/src/core/MonoDevelop.Components/gtk-gui/generated.cs,
  main/src/core/MonoDevelop.Components/Makefile.am,
  main/src/core/MonoDevelop.Components/MonoDevelop.Components.mdp,
  main/src/core/MonoDevelop.Core/Makefile.am,
  main/src/core/MonoDevelop.Core/MonoDevelop.Core.mdp,
  main/src/Makefile.am, main/monodevelop.pc.in,
  main/contrib/Mono.Addins/Mono.Addins.mdp, main/contrib/Makefile.am,
  main/MonoDevelop.mds, main/Makefile.am, main/po/po.mdse,
  extras/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp,
  extras/AspNetEdit/AspNetEdit.mdp, extras/AspNetEdit/configure,
  extras/AspNetEdit/AspNetEdit.mds,
  extras/AspNetEdit/Makefile.include, extras/AspNetEdit/rules.make,
  extras/AspNetEdit/Makefile.am, extras/AspNetEdit/AspNetEdit.make,
  extras/AspNetEdit/Makefile, extras/extras.mds,
  extras/BooBinding/configure, extras/BooBinding/BooBinding.make,
  extras/BooBinding/BooBinding.addin.xml,
  extras/BooBinding/BooBinding.mdp, extras/BooBinding/BooBinding.mds,
  extras/BooBinding/Makefile.include, extras/BooBinding/rules.make,
  extras/BooBinding/BooShell/BooShell.mdp,
  extras/BooBinding/BooShell/Makefile.am,
  extras/BooBinding/Makefile.am,
  extras/BooBinding/monodevelop-boo.pc.in,
  extras/BooBinding/Makefile, extras/BooBinding/po,
  extras/BooBinding/po/gl.po, extras/BooBinding/po/cs.po,
  extras/BooBinding/po/pt_BR.po, extras/BooBinding/po/fr.po,
  extras/BooBinding/po/es.po, extras/BooBinding/po/sl_SI.po,
  extras/BooBinding/po/pl.po, extras/BooBinding/po/it.po,
  extras/BooBinding/po/pt.po, extras/BooBinding/po/ca.po,
  extras/BooBinding/po/da.po, extras/BooBinding/po/tr.po,
  extras/BooBinding/po/ru.po, extras/BooBinding/po/sv.po,
  extras/BooBinding/po/de.po, extras/BooBinding/po/po.mdse,
  extras/BooBinding/po/ja.po, extras/BooBinding/po/zh_TW.po,
  extras/BooBinding/po/Makefile, extras/BooBinding/po/zh_CN.po,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/UsersNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ParametersNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ConnectionContextNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TypesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/LanguagesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ConstraintsNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/AggregatesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TablesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ViewNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ProceduresNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/OperatorsNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/UserNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/GroupsNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ParameterNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ConnectionContextCollectionNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ColumnsNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/RolesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ConstraintNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TriggersNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TableNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ProcedureNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/RulesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/SequencesNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ColumnNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/ViewsNodeBuilder.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Makefile.am,
  extras/MonoDevelop.Database/AUTHORS,
  extras/MonoDevelop.Database/configure.in,
  extras/MonoDevelop.Database/ChangeLog,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ConnectionContextService.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql/QueryService.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/SqliteGuiProvider.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Dialogs/TableEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Dialogs/ProcedureEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Dialogs/ViewEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Dialogs/UserEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/ColumnsEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/PrimaryKeyConstraintEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/CheckConstraintEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/TriggersEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/ConstraintsEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/ForeignKeyConstraintEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Widgets/UniqueConstraintEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.CheckConstraintEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.ViewEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.TriggersEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.PreviewDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.UserEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.CreateDatabaseDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.TableEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.ProcedureEditorDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/MonoDevelop.Database.Designer.ForeignKeyConstraintEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/gtk-gui/gui.stetic,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Tests/MonoDevelop.Database.Sql.Tests.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.mdp,
  extras/MonoDevelop.Database/README,
  extras/MonoDevelop.Database/MonoDevelop.Database.Query/SqlQueryView.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Query/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.mdp,
  extras/MonoDevelop.Database/Makefile.include,
  extras/MonoDevelop.Database/monodevelop-database.pc.in,
  extras/MonoDevelop.Database/Makefile.am,
  extras/MonoDevelop.Database/autogen.sh,
  extras/MonoDevelop.Database/MonoDevelop.Database.mds,
  extras/MonoDevelop.Database/NEWS,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.mdp,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Dialogs/WaitDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Dialogs/DatabaseConnectionSettingsDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/Renderers/BooleanContentRenderer.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/ColumnMappingWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/SelectColumnWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/SqlEditorWidget.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/MonoDevelop.Database.Components.DataGrid.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/MonoDevelop.Database.Components.ShowImageDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/MonoDevelop.Database.Components.WaitDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/MonoDevelop.Database.Components.DatabaseConnectionSettingsDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/MonoDevelop.Database.Components.ShowTextDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/MonoDevelop.Database.Components.SelectColumnDialog.cs,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/gtk-gui/gui.stetic,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/Makefile.am,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml,
  extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.mdp,
  extras/MonoDevelop.Database/po,
  extras/MonoDevelop.Database/po/gl.po,
  extras/MonoDevelop.Database/po/cs.po,
  extras/MonoDevelop.Database/po/pt_BR.po,
  extras/MonoDevelop.Database/po/es.po,
  extras/MonoDevelop.Database/po/fr.po,
  extras/MonoDevelop.Database/po/sl_SI.po,
  extras/MonoDevelop.Database/po/pl.po,
  extras/MonoDevelop.Database/po/it.po,
  extras/MonoDevelop.Database/po/ca.po,
  extras/MonoDevelop.Database/po/pt.po,
  extras/MonoDevelop.Database/po/da.po,
  extras/MonoDevelop.Database/po/tr.po,
  extras/MonoDevelop.Database/po/ru.po,
  extras/MonoDevelop.Database/po/de.po,
  extras/MonoDevelop.Database/po/sv.po,
  extras/MonoDevelop.Database/po/po.mdse,
  extras/MonoDevelop.Database/po/ja.po,
  extras/MonoDevelop.Database/po/zh_TW.po,
  extras/MonoDevelop.Database/po/Makefile.am,
  extras/MonoDevelop.Database/po/zh_CN.po,
  extras/JavaBinding/configure, extras/JavaBinding/JavaBinding.make,
  extras/JavaBinding/JavaBinding.addin.xml,
  extras/JavaBinding/JavaBinding.mdp,
  extras/JavaBinding/JavaBinding.mds,
  extras/JavaBinding/Makefile.include, extras/JavaBinding/rules.make,
  extras/JavaBinding/gtk-gui/JavaBinding.GlobalOptionsPanelWidget.cs,
  extras/JavaBinding/gtk-gui/JavaBinding.CodeGenerationPanelWidget.cs,
  extras/JavaBinding/gtk-gui/gui.stetic,
  extras/JavaBinding/monodevelop-java.pc.in,
  extras/JavaBinding/Makefile, extras/JavaBinding/po,
  extras/JavaBinding/po/gl.po, extras/JavaBinding/po/cs.po,
  extras/JavaBinding/po/pt_BR.po, extras/JavaBinding/po/es.po,
  extras/JavaBinding/po/fr.po, extras/JavaBinding/po/sl_SI.po,
  extras/JavaBinding/po/pl.po, extras/JavaBinding/po/it.po,
  extras/JavaBinding/po/ca.po, extras/JavaBinding/po/pt.po,
  extras/JavaBinding/po/da.po, extras/JavaBinding/po/tr.po,
  extras/JavaBinding/po/ru.po, extras/JavaBinding/po/sv.po,
  extras/JavaBinding/po/de.po, extras/JavaBinding/po/po.mdse,
  extras/JavaBinding/po/ja.po, extras/JavaBinding/po/zh_TW.po,
  extras/JavaBinding/po/Makefile, extras/JavaBinding/po/zh_CN.po,
  MonoDevelop.mds, Makefile: Directory reorganization.

svn path=/branches/monodevelop/reorg/; revision=90661

132 files changed, 636 insertions, 686 deletions

diff --git a/main/ChangeLog b/main/ChangeLog
index 7bad0012f2..4776a949ea 100644
--- a/main/ChangeLog
+++ b/main/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* monodevelop-core-addins.pc.in, configure.in, src/tools/Tools.mds,
+	  src/addins/Addins.mds, src/addins/Extras.mds, src/addins/Makefile.am,
+	  src/core/Makefile.am, src/core/Core.mds, src/Makefile.am,
+	  monodevelop.pc.in, contrib/Mono.Addins/Mono.Addins.mdp,
+	  contrib/Makefile.am, MonoDevelop.mds, Makefile.am: Directory
+	  reorganization.
+
 2007-12-03  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* configure.in: Remove GtkHtml dependency.
diff --git a/main/Makefile.am b/main/Makefile.am
index b5ebe0edcd..f70f675eb8 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = contrib Core build po Extras man
+SUBDIRS = contrib src build po man
 
 bin_SCRIPTS = monodevelop mdtool
 
@@ -13,7 +13,7 @@ pixmap_DATA = monodevelop.png
 xdgmimedir = $(datadir)/mime/packages
 xdgmime_DATA = monodevelop.xml
 
-pkgconfig_in_files = monodevelop.pc.in
+pkgconfig_in_files = monodevelop.pc.in monodevelop-core-addins.pc.in
 
 pkgconfigdir= $(prefix)/lib/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
@@ -103,16 +103,7 @@ check-addins:
 # we can't use the variables that are conditionally defined
 EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
 	monodevelop.xml mkinstalldirs intltool-extract.in \
-	intltool-merge.in intltool-update.in monodevelop.pc.in
+	intltool-merge.in intltool-update.in $(pkgconfig_in_files)
 
 DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \
-	monodevelop.pc
-
-# fixup automake-1.9.6 distuninstallcheck:-rule reporting files created by update-mime-database
-# From BEAST (LGPL license): http://svn.gnome.org/viewvc/beast/trunk/Makefile.am
-filter_stale_uninstalled      = | egrep -v '^.*/share/mime/(subclasses|globs|magic|XMLnamespaces|aliases)$$'
-filter_stale_buildfiles       = | egrep -v '^./report.out$$'
-distuninstallcheck_listfiles  = find . -type f -print 		# automake-1.9 setting
-distuninstallcheck_listfiles += $(filter_stale_uninstalled)	# amend by required filtering
-distcleancheck_listfiles      = find . -type f -print		# automake-1.9 setting
-distcleancheck_listfiles     += $(filter_stale_buildfiles)	# amend by required filtering
+	$(pkgconfig_DATA) 
diff --git a/main/MonoDevelop.mds b/main/MonoDevelop.mds
index b3e0147bd1..ab7bb5b735 100644
--- a/main/MonoDevelop.mds
+++ b/main/MonoDevelop.mds
@@ -1,16 +1,18 @@
-<Combine name="MonoDevelop" fileversion="2.0" outputpath="build/bin/" MakePkgConfig="False" MakeLibPC="True">
+<Combine name="Main" fileversion="2.0" outputpath="build/bin/" MakePkgConfig="False" MakeLibPC="True">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
       <Entry build="True" name="Core" configuration="Debug" />
-      <Entry build="True" name="Extras" configuration="Debug" />
-      <Entry build="True" name="po" configuration="Debug" />
+      <Entry build="True" name="Addins" configuration="Debug" />
       <Entry build="True" name="contrib" configuration="Debug" />
+      <Entry build="True" name="po" configuration="Debug" />
+      <Entry build="True" name="Tools" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
       <Entry build="True" name="Core" configuration="Release" />
-      <Entry build="True" name="Extras" configuration="Release" />
-      <Entry build="True" name="po" configuration="Release" />
+      <Entry build="True" name="Addins" configuration="Release" />
       <Entry build="True" name="contrib" configuration="Release" />
+      <Entry build="True" name="po" configuration="Release" />
+      <Entry build="True" name="Tools" configuration="Release" />
     </Configuration>
   </Configurations>
   <StartMode startupentry="Core" single="True">
@@ -19,12 +21,15 @@
     <Execute type="None" entry="contrib" />
     <Execute type="None" entry="po" />
     <Execute type="None" entry="contrib" />
+    <Execute type="None" entry="po" />
+    <Execute type="None" entry="Tools" />
   </StartMode>
   <DeployTargets />
   <Entries>
-    <Entry filename="Core/src/Core.mds" />
-    <Entry filename="Extras/Extras.mds" />
-    <Entry filename="po/po.mdp" />
+    <Entry filename="src/core/Core.mds" />
+    <Entry filename="src/addins/Addins.mds" />
     <Entry filename="contrib/contrib.mds" />
+    <Entry filename="po/po.mdse" />
+    <Entry filename="src/tools/Tools.mds" />
   </Entries>
 </Combine>
\ No newline at end of file
diff --git a/main/configure.in b/main/configure.in
index 5e891fed2c..7671ef8f75 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -73,12 +73,18 @@ fi
 
 
 dnl hard dependencies
+MONOADDINS_REQUIRED_VERSION=0.3
 GTKSHARP_REQUIRED_VERSION=2.8.0
 GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.10
-GTKSOURCEVIEW2SHARP_REQUIRED_VERSION=1.9.1
 GECKOSHARP_REQUIRED_VERSION=0.10
 MONODOC_REQUIRED_VERSION=1.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)
@@ -91,6 +97,10 @@ PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 AC_SUBST(GLADE_SHARP_LIBS)
 PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 AC_SUBST(GCONF_SHARP_LIBS)
+PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(GTKHTML_SHARP_LIBS)
+PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION)
+AC_SUBST(GECKO_SHARP_LIBS)
 PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED_VERSION)
 AC_SUBST(MONODOC_LIBS)
 PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= 1.2)
@@ -115,60 +125,6 @@ fi
 
 AM_CONDITIONAL(ENABLE_GTKSOURCEVIEW2, test x$enable_gtksourceview2 = xyes)
 
-dnl deal with the mono debugger
-MONO_DEBUGGER_REQUIRED_VERSION=0.9
-AC_ARG_ENABLE(debugger,
-   AC_HELP_STRING([--enable-debugger],
-                   [enable support for the Mono Debugger [default=no]]),
-   [PKG_CHECK_MODULES(MONO_DEBUGGER, mono-debugger >= $MONO_DEBUGGER_REQUIRED_VERSION,
-				     enable_debugger=yes, enable_debugger=no)],
-   enable_debugger=no)
- AM_CONDITIONAL(ENABLE_DEBUGGER, test x$enable_debugger = xyes)
- AC_SUBST(MONO_DEBUGGER_LIBS) 
-
-if test "x$enable_debugger" = "xyes"; then
-	AC_MSG_ERROR([The debugger add-in is not currently supported due to the API changes being done in the Mono debugger.])
-fi
-
-
-dnl java binding
-dnl need to test for a java source to bytecode compiler
-dnl and for ikvm
-IKVM_REQUIRED_VERSION=0.10
-AC_ARG_ENABLE(java,
-	AC_HELP_STRING([--enable-java],
-		[enable support for Java via ikvm [default=no]]),
-		[PKG_CHECK_MODULES(IKVM, ikvm >= $IKVM_REQUIRED_VERSION, enable_java=yes, enable_java=no)],
-		enable_java=no)
-AM_CONDITIONAL(ENABLE_JAVA, test x$enable_java = xyes)
-
-BOO_REQUIRED_VERSION=0.7.9.2659
-AC_ARG_ENABLE(boo,
-	AC_HELP_STRING([--enable-boo],
-		[enable support for boo [default=no]]),
-		[PKG_CHECK_MODULES(BOO, boo >= $BOO_REQUIRED_VERSION, enable_boo=yes, enable_boo=no)],
-		enable_boo=no)
-
-AM_CONDITIONAL(ENABLE_BOO, test x$enable_boo = xyes)
-AC_SUBST(BOO_LIBS)
-
-if test "x$enable_boo" = "xyes" ; then
-	AC_PATH_PROG(BOOC, booc)
-fi
-
-NEMERLE_REQUIRED_VERSION=0.9.3.99
-AC_ARG_ENABLE(nemerle,
-	AC_HELP_STRING([--enable-nemerle],
-		[enable support for Nemerle [default=no]]),
-		[PKG_CHECK_MODULES(NEMERLE, nemerle >= $NEMERLE_REQUIRED_VERSION, enable_nemerle=yes, enable_nemerle=no)],
-		enable_nemerle=no)
-
-AM_CONDITIONAL(ENABLE_NEMERLE, test x$enable_nemerle = xyes)
-AC_SUBST(NEMERLE_LIBS)
-
-if test "x$enable_nemerle" = "xyes" ; then
-	AC_PATH_PROG(NCC, ncc)
-fi
 
 AC_ARG_ENABLE(monoextensions,
 	AC_HELP_STRING([--enable-monoextensions],
@@ -186,64 +142,18 @@ AM_CONDITIONAL(ENABLE_VERSIONCONTROL, test x$enable_versioncontrol = xyes)
 
 AC_ARG_ENABLE(subversion,
 	AC_HELP_STRING([--enable-subversion],
-		[enable Subversion support [default=no]]),
-		enable_versioncontrol=yes, enable_subversion=no)
+		[enable Subversion support [default=yes]]),
+		enable_versioncontrol=${enableval}, enable_subversion=yes)
 
 AM_CONDITIONAL(ENABLE_SUBVERSION, test x$enable_subversion = xyes)
 
-dnl *************************************************************
-dnl *** The following hunk of script-fu is to detect the      ***
-dnl *** available MonoDevelop.Database database providers...  ***
-dnl *************************************************************
-AC_ARG_ENABLE(database,
-	AC_HELP_STRING([--enable-database],
-		[enable MonoDevelop.Database support [default=auto]]),
-		enable_database=${enableval}, enable_database=yes)
-
-AM_CONDITIONAL(ENABLE_DATABASE, [test x$enable_database = xyes])
-
-test_sqlite=$(gacutil -l | grep "Mono.Data.SqliteClient, Version=2")
-test_sqlserver=$(gacutil -l | grep "System.Data, Version=2")
-test_postgres=$(gacutil -l | grep "Npgsql, Version=2")
-test_mysql=$(gacutil -l | grep "MySql.Data")
-
-if test "x$test_sqlite" != "x"; then
-	enable_sqlite="yes"
-else
-	enable_sqlite="no (missing Mono.Data.SqliteClient)"
-fi
-
-if test "x$test_sqlserver" != "x"; then
-	enable_sqlserver="yes"
-else
-	enable_sqlserver="no (missing System.Data, Version 2)"
-fi
-
-if test "x$test_postgres" != "x"; then
-	enable_postgres="yes"
-else
-	enable_postgres="no (missing Npgsql, Version 2)"
-fi
-
-if test "x$test_mysql" != "x"; then
-	enable_mysql="yes"
-else
-	enable_mysql="no (missing MySql.Data)"
-fi
-
-AM_CONDITIONAL(ENABLE_POSTGRES, [test "x$enable_postgres" = "xyes"])
-AM_CONDITIONAL(ENABLE_MYSQL, [test "x$enable_mysql" = "xyes"])
-AM_CONDITIONAL(ENABLE_SQLITE, [test "x$enable_sqlite" = "xyes"])
-AM_CONDITIONAL(ENABLE_SQLSERVER, [test "x$enable_sqlserver" = "xyes"])
-
 # ASP.NET project addin
 AC_ARG_ENABLE(aspnet,
 	AC_HELP_STRING([--enable-aspnet],
 		[enable ASP.NET project support [default=yes]]),
 		enable_aspnet=${enableval}, enable_aspnet=yes)
 
-AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes])
-
+AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes]) 
 
 # Optional Mozilla dependency
 AC_ARG_ENABLE(geckosharp,
@@ -258,7 +168,6 @@ fi
 
 AM_CONDITIONAL(ENABLE_GECKOSHARP, [test x$enable_geckosharp = xyes])
 
-
 #We need to know where Mozilla is for launch scripts and possible for AspNetEdit
 #Check pkg-config first
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
@@ -301,58 +210,11 @@ fi
 
 if test -z "$MOZILLA_HOME"; then
 	MOZILLA_HOME=
-	if test "x$enable_aspnetedit" = "xyes"; then
-		AC_MSG_ERROR([Cannot detect Mozilla library directory. AspNetEdit addin cannot be built.])
-	fi
-	if test "x$enable_geckosharp" = "xyes"; then
-		AC_MSG_WARN([Cannot detect Mozilla library directory. Some features may not be available.])
-	fi
+	AC_MSG_WARN([Cannot detect Mozilla library directory. WelcomePage addin may not be able to function.])
 fi
 	
 AC_SUBST(MOZILLA_HOME)
 
-# ASP.NET visual designer addin
-AC_ARG_ENABLE(aspnetedit,
-	AC_HELP_STRING([--enable-aspnetedit],
-		[enable ASP.NET visual designer support [default=no]]),
-		enable_aspnetedit=yes, enable_aspnetedit=no)
-
-if test "x$enable_aspnetedit" = "xyes"; then
-	if test "x$enable_aspnet" = "xno"; then
-		enable_aspnetedit=no
-		AC_MSG_WARN([Cannot enable AspNetEdit without ASP.NET project support.])
-	fi
-	if test "x$enable_geckosharp" = "xno"; then
-		enable_aspnetedit=no
-		AC_MSG_WARN([Cannot enable AspNetEdit without GeckoSharp support.])
-	fi
-fi
-
-if test "x$enable_aspnetedit" = "xyes"; then
-
-	### Find out how we need to install the chrome -- the installation mechanism 
-	### changed from FF 1.0 to FF 1.5
-	AC_MSG_CHECKING([method of Mozilla extension installation])
-	if test -f "$MOZILLA_HOME/chrome/installed-chrome.txt"; then
-		MOZILLA_EXTENSION_TYPE="installedchrome"
-		AC_MSG_RESULT([installed-chrome.txt])
-	else
-		MOZILLA_EXTENSION_TYPE="manifest"
-		AC_MSG_RESULT([manifest file])
-	fi
-	
-	AC_SUBST(MOZILLA_EXTENSION_TYPE)
-	
-	# get zip to create jar/xpi for chrome
-	AC_PATH_PROG(ZIP, zip)
-	if test "x$ZIP" = "x" ; then
-		AC_MSG_ERROR([Can't find "zip" in your PATH])
-	fi
-fi
-
-AM_CONDITIONAL(MOZILLA_EXTENSION_TYPE_TEXTFILE, test -f "$MOZILLA_HOME/chrome/installed-chrome.txt")
-AM_CONDITIONAL(ENABLE_ASPNETEDIT, test x$enable_aspnetedit = xyes)
-
 # C/C++ project addin
 AC_ARG_ENABLE(c, AC_HELP_STRING([--enable-c], [enable C/C++ project support [default=yes]]), enable_c=${enableval}, enable_c=yes)
 AM_CONDITIONAL(ENABLE_C, [test x$enable_c = xyes])
@@ -399,93 +261,70 @@ build/data/resources/css/Makefile
 build/data/resources/Makefile
 build/Makefile
 contrib/Makefile
-contrib/Firebird/Makefile
-contrib/Mono.Addins/Makefile
 contrib/Mono.Cecil/Makefile
-Core/Makefile
-Core/src/NRefactory/Makefile
-Core/src/Makefile
-Core/src/MonoDevelop.Core/AssemblyInfo.cs
-Core/src/MonoDevelop.Core/Makefile
-Core/src/MonoDevelop.Core/MonoDevelop.Core/GettextCatalog.cs
-Core/src/MonoDevelop.Core.Gui/AssemblyInfo.cs
-Core/src/MonoDevelop.Core.Gui/Makefile
-Core/src/MonoDevelop.Projects/AssemblyInfo.cs
-Core/src/MonoDevelop.Projects/MonoDevelop.Projects.dll.config
-Core/src/MonoDevelop.Projects/Makefile
-Core/src/MonoDevelop.Projects.Gui/AssemblyInfo.cs
-Core/src/MonoDevelop.Projects.Gui/Makefile
-Core/src/MonoDevelop.Documentation/AssemblyInfo.cs
-Core/src/MonoDevelop.Documentation/Makefile
-Core/src/MonoDevelop.Ide/AssemblyInfo.cs
-Core/src/MonoDevelop.Ide/Makefile
-Core/src/MonoDevelop.Dock/Makefile
-Core/src/MonoDevelop.Components/AssemblyInfo.cs
-Core/src/MonoDevelop.Components/Makefile
-Core/src/MonoDevelop.Startup/AssemblyInfo.cs
-Core/src/MonoDevelop.Startup/Makefile
-Core/src/Tools/Makefile
-Core/src/Tools/mdhost/Makefile
-Core/src/Tools/mdrun/Makefile
-Core/src/Tools/SharpCoco/Makefile
-Extras/BooBinding/Makefile
-Extras/BooBinding/BooShell/Makefile
-Extras/JavaBinding/Makefile
-Extras/Makefile
-Extras/MonoDeveloperExtensions/Makefile
-Extras/MonoDeveloperExtensions/NUnit/Makefile
-Extras/MonoDevelop.Database/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Components/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Query/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.Designer/Makefile
-Extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Makefile
-Extras/NUnit/Makefile
-Extras/VersionControl/Diff/Makefile
-Extras/VersionControl/DiffWidget/Makefile
-Extras/VersionControl/MonoDevelop.VersionControl/Makefile
-Extras/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile
-Extras/VersionControl/Makefile
-Extras/CSharpBinding/Makefile
-Extras/CSharpBinding/Autotools/Makefile
-Extras/ILAsmBinding/Makefile
-Extras/NemerleBinding/Makefile
-Extras/VBNetBinding/Makefile
-Extras/DebuggerAddIn/AssemblyInfo.cs
-Extras/DebuggerAddIn/Makefile
-Extras/DebuggerAddIn/DebuggerPaths.cs
-Extras/MonoDevelop.SourceEditor/AssemblyInfo.cs
-Extras/MonoDevelop.SourceEditor/Makefile
-Extras/MonoDevelop.SourceEditor2/AssemblyInfo.cs
-Extras/MonoDevelop.SourceEditor2/Makefile
-Extras/prj2make-sharp-lib/AssemblyInfo.cs
-Extras/prj2make-sharp-lib/Makefile
-Extras/WelcomePage/Makefile
-Extras/ChangeLogAddIn/Makefile
-Extras/MonoDevelop.GtkCore/Makefile
-Extras/MonoDevelop.GtkCore/lib/Makefile
-Extras/AspNetAddIn/Makefile
-Extras/MonoDevelop.Autotools/Makefile
-Extras/MonoDevelop.DesignerSupport/Makefile
-Extras/AspNetEdit/Makefile
-Extras/AspNetEdit/chrome/Makefile
-Extras/AspNetEdit/chrome/aspdesigner.manifest
-Extras/MonoDevelop.WebReferences/Makefile
-Extras/Deployment/Makefile
-Extras/Deployment/MonoDevelop.Deployment/Makefile
-Extras/Deployment/MonoDevelop.Deployment.Linux/Makefile
-Extras/MonoDevelop.Gettext/Makefile
-Extras/MonoDevelop.RegexToolkit/Makefile
-Extras/CBinding/Makefile
-Extras/GeckoWebBrowser/Makefile
+src/Makefile
+src/core/Makefile
+src/core/NRefactory/Makefile
+src/core/MonoDevelop.Core/AssemblyInfo.cs
+src/core/MonoDevelop.Core/Makefile
+src/core/MonoDevelop.Core/MonoDevelop.Core/GettextCatalog.cs
+src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs
+src/core/MonoDevelop.Core.Gui/Makefile
+src/core/MonoDevelop.Projects/AssemblyInfo.cs
+src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config
+src/core/MonoDevelop.Projects/Makefile
+src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs
+src/core/MonoDevelop.Projects.Gui/Makefile
+src/core/MonoDevelop.Documentation/AssemblyInfo.cs
+src/core/MonoDevelop.Documentation/Makefile
+src/core/MonoDevelop.Ide/AssemblyInfo.cs
+src/core/MonoDevelop.Ide/Makefile
+src/core/MonoDevelop.Dock/Makefile
+src/core/MonoDevelop.Components/AssemblyInfo.cs
+src/core/MonoDevelop.Components/Makefile
+src/core/MonoDevelop.Startup/AssemblyInfo.cs
+src/core/MonoDevelop.Startup/Makefile
+src/tools/Makefile
+src/tools/mdhost/Makefile
+src/tools/mdrun/Makefile
+src/tools/SharpCoco/Makefile
+src/addins/Makefile
+src/addins/MonoDeveloperExtensions/Makefile
+src/addins/MonoDeveloperExtensions/NUnit/Makefile
+src/addins/NUnit/Makefile
+src/addins/VersionControl/Diff/Makefile
+src/addins/VersionControl/DiffWidget/Makefile
+src/addins/VersionControl/MonoDevelop.VersionControl/Makefile
+src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile
+src/addins/VersionControl/Makefile
+src/addins/CSharpBinding/Makefile
+src/addins/CSharpBinding/Autotools/Makefile
+src/addins/ILAsmBinding/Makefile
+src/addins/VBNetBinding/Makefile
+src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs
+src/addins/MonoDevelop.SourceEditor/Makefile
+src/addins/prj2make-sharp-lib/AssemblyInfo.cs
+src/addins/prj2make-sharp-lib/Makefile
+src/addins/WelcomePage/Makefile
+src/addins/ChangeLogAddIn/Makefile
+src/addins/MonoDevelop.GtkCore/Makefile
+src/addins/MonoDevelop.GtkCore/lib/Makefile
+src/addins/AspNetAddIn/Makefile
+src/addins/MonoDevelop.Autotools/Makefile
+src/addins/MonoDevelop.DesignerSupport/Makefile
+src/addins/MonoDevelop.WebReferences/Makefile
+src/addins/Deployment/Makefile
+src/addins/Deployment/MonoDevelop.Deployment/Makefile
+src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile
+src/addins/MonoDevelop.Gettext/Makefile
+src/addins/MonoDevelop.RegexToolkit/Makefile
+src/addins/CBinding/Makefile
+src/addins/GeckoWebBrowser/Makefile
 Makefile
 monodevelop
 mdtool
 monodevelop.pc
+monodevelop-core-addins.pc
 po/Makefile.in
 man/Makefile
 ])
@@ -496,28 +335,11 @@ echo ""
 echo "   * Installation prefix = $prefix"
 echo "   * C# compiler = $CSC"
 echo "   * Mozilla home: $MOZILLA_HOME"
-echo "   * mono-debugger: $enable_debugger"
-echo "   * MonoDevelop.Database support: $enable_database"
-
-if test "x$enable_database" = "xyes"; then
-echo "   *   Providers:"
-echo "   *     PostgreSQL:   $enable_postgres"
-echo "   *     MySQL:        $enable_mysql"
-echo "   *     SQLite:       $enable_sqlite"
-echo "   *     SQL Server:   $enable_sqlserver"
-fi
-
-echo "   * java support: $enable_java"
-echo "   * boo support: $enable_boo"
-echo "   * Nemerle support: $enable_nemerle"
 echo "   * Mono class library development extensions: $enable_monoextensions"
 echo "   * Version control support: $enable_versioncontrol"
 echo "   *   Providers:"
 echo "   *     Subversion: $enable_subversion"
 echo "   * ASP.NET project support: $enable_aspnet"
-echo "   * ASP.NET Visual Designer: $enable_aspnetedit"
 echo "   * Web References: yes"
 echo "   * C/C++ project support: $enable_c"
-echo "   * GtkSourceView2: $enable_gtksourceview2"
-echo "   * GeckoSharp:     $enable_geckosharp"
 echo ""
diff --git a/main/contrib/Makefile.am b/main/contrib/Makefile.am
index d1eb316a46..bea319193c 100644
--- a/main/contrib/Makefile.am
+++ b/main/contrib/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = Mono.Addins Mono.Cecil Firebird
+SUBDIRS = Mono.Cecil
 
 EXTRA_DIST =  $(srcdir)/extract_makefile_variable.sh
diff --git a/main/contrib/Mono.Addins/Mono.Addins.mdp b/main/contrib/Mono.Addins/Mono.Addins.mdp
index 25801ae03d..98c3e31b3e 100644
--- a/main/contrib/Mono.Addins/Mono.Addins.mdp
+++ b/main/contrib/Mono.Addins/Mono.Addins.mdp
@@ -95,6 +95,14 @@
     <File name="src/Mono.Addins/Mono.Addins/TypeExtensionNode.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Mono.Addins/Mono.Addins/TypeExtensionPointAttribute.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Mono.Addins/Mono.Addins.dll.config" subtype="Code" buildaction="FileCopy" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/IAddinLocalizer.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/IAddinLocalizerFactory.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/NullLocalizer.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/StringResourceLocalizer.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins.Localization/StringTableLocalizer.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Mono.Addins/Mono.Addins/AddinLocalizer.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
diff --git a/main/monodevelop-core-addins.pc.in b/main/monodevelop-core-addins.pc.in
new file mode 100644
index 0000000000..9bdfef0fec
--- /dev/null
+++ b/main/monodevelop-core-addins.pc.in
@@ -0,0 +1,8 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/monodevelop
+                                                                                
+Name: MonoDevelop Core Add-ins
+Description: MonoDevelop Core Add-ins
+Version: @VERSION@
+Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/AspNetAddIn/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll  -r:${libdir}/AddIns/MonoDevelop.MsVisualStudio/MonoDevelop.MsVisualStudio.dll
diff --git a/main/monodevelop.pc.in b/main/monodevelop.pc.in
index 0f3874575c..a6395ad0c0 100644
--- a/main/monodevelop.pc.in
+++ b/main/monodevelop.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib/monodevelop
                                                                                 
 Name: MonoDevelop
 Description: Free .NET Development Environment
 Version: @VERSION@
-Libs: -r:${libdir}/monodevelop/bin/MonoDevelop.Core.dll -r:${libdir}/monodevelop/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/monodevelop/bin/MonoDevelop.Projects.dll -r:${libdir}/monodevelop/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/monodevelop/bin/MonoDevelop.Ide.dll -r:${libdir}/monodevelop/bin/MonoDevelop.Components.dll -r:${libdir}/monodevelop/bin/NRefactory.dll
+Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll
diff --git a/main/po/ChangeLog b/main/po/ChangeLog
index 262ed93e18..be52e314da 100644
--- a/main/po/ChangeLog
+++ b/main/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* po.mdse: Directory reorganization.
+
 2007-12-03  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* it.po: Updated italizan translation by Milo Casagrande.
diff --git a/main/po/po.mdse b/main/po/po.mdse
new file mode 100644
index 0000000000..fba10c902b
--- /dev/null
+++ b/main/po/po.mdse
@@ -0,0 +1,26 @@
+<CombineEntry name="po" fileversion="2.0" outputType="RelativeToOutput" ctype="TranslationProject">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="TranslationProjectConfiguration" />
+    <Configuration name="Release" ctype="TranslationProjectConfiguration" />
+  </Configurations>
+  <translations>
+    <Translation isoCode="ca" />
+    <Translation isoCode="cs" />
+    <Translation isoCode="da" />
+    <Translation isoCode="de" />
+    <Translation isoCode="es" />
+    <Translation isoCode="fr" />
+    <Translation isoCode="gl" />
+    <Translation isoCode="it" />
+    <Translation isoCode="ja" />
+    <Translation isoCode="pl" />
+    <Translation isoCode="pt" />
+    <Translation isoCode="pt_BR" />
+    <Translation isoCode="ru" />
+    <Translation isoCode="sl_SI" />
+    <Translation isoCode="sv" />
+    <Translation isoCode="tr" />
+    <Translation isoCode="zh_CN" />
+    <Translation isoCode="zh_TW" />
+  </translations>
+</CombineEntry>
\ No newline at end of file
diff --git a/main/src/Makefile.am b/main/src/Makefile.am
new file mode 100644
index 0000000000..5991896f3d
--- /dev/null
+++ b/main/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = core addins tools
diff --git a/main/src/addins/Extras.mds b/main/src/addins/Addins.mds
index 66da021196..73a8132448 100644
--- a/main/src/addins/Extras.mds
+++ b/main/src/addins/Addins.mds
@@ -1,59 +1,47 @@
-<Combine name="Extras" fileversion="2.0">
+<Combine name="Addins" fileversion="2.0">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
       <Entry build="True" name="MonoDevelop.NUnit" configuration="Debug" />
       <Entry build="True" name="ILAsmBinding" configuration="Debug" />
       <Entry build="True" name="VersionControl" configuration="Debug" />
-      <Entry build="True" name="JavaBinding" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.SourceEditor" configuration="Debug" />
-      <Entry build="False" name="NemerleBinding" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.GtkCore" configuration="Debug" />
       <Entry build="True" name="WelcomePage" configuration="Debug" />
-      <Entry build="True" name="prj2make-sharp-lib" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.MsVisualStudio" configuration="Debug" />
       <Entry build="True" name="VBNetBinding" configuration="Debug" />
-      <Entry build="False" name="MonoDevelop.Debugger" configuration="Debug" />
-      <Entry build="True" name="ChangeLogAddIn" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.ChangeLogAddIn" configuration="Debug" />
       <Entry build="True" name="MonoDeveloperExtensions" configuration="Debug" />
-      <Entry build="True" name="AspNetAddIn" configuration="Debug" />
-      <Entry build="False" name="AspNetEdit" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.AspNet" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.DesignerSupport" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.Autotools" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.WebReferences" configuration="Debug" />
       <Entry build="True" name="Deployment" configuration="" />
-      <Entry build="True" name="MonoDevelop.Database" configuration="Debug" />
       <Entry build="True" name="CSharpBinding" configuration="" />
       <Entry build="True" name="MonoDevelop.Gettext" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.RegexToolkit" configuration="Debug" />
       <Entry build="True" name="CBinding" configuration="Debug" />
-      <Entry build="True" name="BooBinding" configuration="Debug" />
       <Entry build="True" name="GeckoWebBrowser" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
       <Entry build="True" name="MonoDevelop.NUnit" configuration="Debug" />
       <Entry build="True" name="ILAsmBinding" configuration="Debug" />
       <Entry build="True" name="VersionControl" configuration="Debug" />
-      <Entry build="True" name="JavaBinding" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.SourceEditor" configuration="Debug" />
-      <Entry build="True" name="NemerleBinding" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.GtkCore" configuration="Debug" />
       <Entry build="True" name="WelcomePage" configuration="Debug" />
-      <Entry build="True" name="prj2make-sharp-lib" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.MsVisualStudio" configuration="Debug" />
       <Entry build="True" name="VBNetBinding" configuration="" />
-      <Entry build="True" name="MonoDevelop.Debugger" configuration="Debug" />
-      <Entry build="True" name="ChangeLogAddIn" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.ChangeLogAddIn" configuration="Debug" />
       <Entry build="True" name="MonoDeveloperExtensions" configuration="" />
-      <Entry build="True" name="AspNetAddIn" configuration="Debug" />
-      <Entry build="True" name="AspNetEdit" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.AspNet" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.DesignerSupport" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.Autotools" configuration="Release" />
       <Entry build="True" name="MonoDevelop.WebReferences" configuration="Release" />
       <Entry build="True" name="Deployment" configuration="" />
-      <Entry build="True" name="MonoDevelop.Database" configuration="Release" />
       <Entry build="True" name="CSharpBinding" configuration="" />
       <Entry build="True" name="MonoDevelop.Gettext" configuration="Release" />
       <Entry build="True" name="MonoDevelop.RegexToolkit" configuration="Release" />
       <Entry build="True" name="CBinding" configuration="Release" />
-      <Entry build="True" name="BooBinding" configuration="Release" />
       <Entry build="True" name="GeckoWebBrowser" configuration="Release" />
     </Configuration>
   </Configurations>
@@ -62,25 +50,20 @@
     <Execute type="None" entry="CSharpBinding" />
     <Execute type="None" entry="ILAsmBinding" />
     <Execute type="None" entry="VersionControl" />
-    <Execute type="None" entry="JavaBinding" />
     <Execute type="None" entry="MonoDevelop.SourceEditor" />
-    <Execute type="None" entry="NemerleBinding" />
     <Execute type="None" entry="MonoDevelop.GtkCore" />
     <Execute type="None" entry="WelcomePage" />
-    <Execute type="None" entry="prj2make-sharp-lib" />
+    <Execute type="None" entry="MonoDevelop.MsVisualStudio" />
     <Execute type="None" entry="VBNetBinding" />
-    <Execute type="None" entry="MonoDevelop.Debugger" />
-    <Execute type="None" entry="ChangeLogAddIn" />
+    <Execute type="None" entry="MonoDevelop.ChangeLogAddIn" />
     <Execute type="None" entry="MonoDeveloperExtensions" />
-    <Execute type="None" entry="AspNetAddIn" />
+    <Execute type="None" entry="MonoDevelop.AspNet" />
     <Execute type="None" entry="AspNetEdit" />
     <Execute type="None" entry="MonoDevelop.DesignerSupport" />
     <Execute type="None" entry="MonoDevelop.Autotools" />
     <Execute type="None" entry="MonoDevelop.WebReferences" />
     <Execute type="None" entry="Deployment" />
     <Execute type="None" entry="MonoDevelop.Database" />
-    <Execute type="None" entry="BooBinding" />
-    <Execute type="None" entry="MonoDevelop.Database" />
     <Execute type="None" entry="CSharpBinding" />
     <Execute type="None" entry="MonoDevelop.Gettext" />
     <Execute type="None" entry="MonoDevelop.RegexToolkit" />
@@ -92,28 +75,22 @@
     <Entry filename="NUnit/MonoDevelop.NUnit.mdp" />
     <Entry filename="ILAsmBinding/ILAsmBinding.mdp" />
     <Entry filename="VersionControl/VersionControl.mds" />
-    <Entry filename="JavaBinding/JavaBinding.mdp" />
     <Entry filename="MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp" />
-    <Entry filename="NemerleBinding/NemerleBinding.mdp" />
     <Entry filename="MonoDevelop.GtkCore/MonoDevelop.GtkCore.mds" />
     <Entry filename="WelcomePage/WelcomePage.mdp" />
     <Entry filename="prj2make-sharp-lib/prj2make-sharp-lib.mdp" />
     <Entry filename="VBNetBinding/VBNetBinding.mds" />
-    <Entry filename="DebuggerAddIn/MonoDevelop.Debugger.mdp" />
     <Entry filename="ChangeLogAddIn/ChangeLogAddIn.mdp" />
     <Entry filename="MonoDeveloperExtensions/MonoDeveloperExtensions.mds" />
     <Entry filename="AspNetAddIn/AspNetAddIn.mdp" />
-    <Entry filename="AspNetEdit/AspNetEdit.mdp" />
     <Entry filename="MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp" />
     <Entry filename="MonoDevelop.Autotools/MonoDevelop.Autotools.mdp" />
     <Entry filename="MonoDevelop.WebReferences/MonoDevelop.WebReferences.mdp" />
     <Entry filename="Deployment/Deployment.mds" />
-    <Entry filename="MonoDevelop.Database/MonoDevelop.Database.mds" />
     <Entry filename="CSharpBinding/CSharpBinding.mds" />
     <Entry filename="MonoDevelop.Gettext/MonoDevelop.Gettext.mdp" />
     <Entry filename="MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp" />
     <Entry filename="CBinding/CBinding.mds" />
-    <Entry filename="BooBinding/BooBinding.mds" />
     <Entry filename="GeckoWebBrowser/GeckoWebBrowser.mdp" />
   </Entries>
-</Combine>
+</Combine>
\ No newline at end of file
diff --git a/main/src/addins/AspNetAddIn/AspNetAddIn.addin.xml b/main/src/addins/AspNetAddIn/AspNetAddIn.addin.xml
index 65b540d8f3..4cf4548d80 100644
--- a/main/src/addins/AspNetAddIn/AspNetAddIn.addin.xml
+++ b/main/src/addins/AspNetAddIn/AspNetAddIn.addin.xml
@@ -8,10 +8,6 @@
 	   category    = "IDE extensions"
        version     = "0.17.0">
 	
-	<Runtime>
-		<Import assembly = "AspNetAddIn.dll"/>
-	</Runtime>
-
 	<Dependencies>
 	    <Addin id="Core" version="0.17.0"/>
 	    <Addin id="Core.Gui" version="0.17.0"/>
diff --git a/main/src/addins/AspNetAddIn/AspNetAddIn.mdp b/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
index f3a1182b8b..615014532e 100644
--- a/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
+++ b/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
@@ -1,13 +1,13 @@
-<Project name="AspNetAddIn" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.AspNet" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/AspNetAddIn" assembly="AspNetAddIn" />
+      <Output directory="../../../build/AddIns/AspNetAddIn" assembly="MonoDevelop.AspNet" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="AspNetAddIn" />
+      <Output directory="../../../build/AddIns/AspNetAddIn" assembly="AspNetAddIn" />
       <Build debugmode="False" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -112,18 +112,18 @@
     <ProjectReference type="Gac" localcopy="False" refto="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.DesignerSupport" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Project" localcopy="False" refto="prj2make-sharp-lib" />
+    <ProjectReference type="Gac" localcopy="True" refto="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.MsVisualStudio" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/AspNetAddIn/ChangeLog b/main/src/addins/AspNetAddIn/ChangeLog
index 826871e0d1..fb674aa5ac 100644
--- a/main/src/addins/AspNetAddIn/ChangeLog
+++ b/main/src/addins/AspNetAddIn/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* gtk-gui/objects.xml, AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am:
+	  Directory reorganization.
+
 2007-11-20  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* Project/AspNetAppProject.cs: Don't try to compile if no files are set to
diff --git a/main/src/addins/AspNetAddIn/Makefile.am b/main/src/addins/AspNetAddIn/Makefile.am
index 80fab1e5a7..1a9354854b 100644
--- a/main/src/addins/AspNetAddIn/Makefile.am
+++ b/main/src/addins/AspNetAddIn/Makefile.am
@@ -1,15 +1,15 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns/AspNetAddIn
-ASSEMBLY = $(ADDIN_BUILD)/AspNetAddIn.dll
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.AspNet.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GNOME_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.MsVisualStudio/MonoDevelop.MsVisualStudio.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.SourceEditor.dll \
-	-r:$(top_builddir)/build/AddIns/prj2makesharp/prj2make-sharp-lib.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/AspNetAddIn/gtk-gui/objects.xml b/main/src/addins/AspNetAddIn/gtk-gui/objects.xml
index 1709edf75f..a64407275b 100644
--- a/main/src/addins/AspNetAddIn/gtk-gui/objects.xml
+++ b/main/src/addins/AspNetAddIn/gtk-gui/objects.xml
@@ -1,5 +1,5 @@
 <objects>
-  <object type="MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget" palette-category="AspNetAddIn" allow-children="false" base-type="Gtk.Bin">
+  <object type="MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget" allow-children="false" base-type="Gtk.Bin" palette-category="MonoDevelop.AspNet">
     <itemgroups />
     <signals />
   </object>
diff --git a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.mdp b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.mdp
index 96206fd315..6eb7f48a2c 100644
--- a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.mdp
+++ b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.mdp
@@ -1,13 +1,13 @@
-<Project name="CBinding.Autotools" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.CBinding.Autotools" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/BackendBindings/" assembly="CBinding.Autotools" />
+      <Output directory="../../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CBinding.Autotools" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/BackendBindings/" assembly="CBinding.Autotools" />
+      <Output directory="../../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CBinding.Autotools" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -18,9 +18,9 @@
     <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
-    <ProjectReference type="Project" localcopy="True" refto="CBinding" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Autotools" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.CBinding" />
   </References>
 </Project>
\ No newline at end of file
diff --git a/main/src/addins/CBinding/CBinding.addin.xml b/main/src/addins/CBinding/CBinding.addin.xml
index bbaa4e8ef4..73d2fc7616 100644
--- a/main/src/addins/CBinding/CBinding.addin.xml
+++ b/main/src/addins/CBinding/CBinding.addin.xml
@@ -8,10 +8,6 @@
        category    = "Language bindings"
        version     = "0.17.0">
 
-	<Runtime>
-		<Import assembly = "CBinding.dll"/>
-	</Runtime>
-	
 	<Dependencies>
 		<Addin id = "Core" version = "0.17.0"/>
 		<Addin id = "Core.Gui" version = "0.17.0"/>
diff --git a/main/src/addins/CBinding/CBinding.mdp b/main/src/addins/CBinding/CBinding.mdp
index 71f3f16ab2..dd4b4cc219 100644
--- a/main/src/addins/CBinding/CBinding.mdp
+++ b/main/src/addins/CBinding/CBinding.mdp
@@ -1,13 +1,13 @@
-<Project name="CBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.CBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assemblyKeyFile="." assembly="CBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assemblyKeyFile="." assembly="MonoDevelop.CBinding" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="CBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CBinding" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
@@ -134,16 +134,15 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment.Linux" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/CBinding/CBinding.mds b/main/src/addins/CBinding/CBinding.mds
index edca8d3d6e..9303c8e0c8 100644
--- a/main/src/addins/CBinding/CBinding.mds
+++ b/main/src/addins/CBinding/CBinding.mds
@@ -1,17 +1,17 @@
 <Combine name="CBinding" fileversion="2.0">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry build="True" name="CBinding" configuration="Debug" />
-      <Entry build="True" name="CBinding.Autotools" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.CBinding" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.CBinding.Autotools" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
-      <Entry build="True" name="CBinding" configuration="Release" />
-      <Entry build="True" name="CBinding.Autotools" configuration="Release" />
+      <Entry build="True" name="MonoDevelop.CBinding" configuration="Release" />
+      <Entry build="True" name="MonoDevelop.CBinding.Autotools" configuration="Release" />
     </Configuration>
   </Configurations>
-  <StartMode startupentry="CBinding" single="True">
-    <Execute type="None" entry="CBinding" />
-    <Execute type="None" entry="CBinding.Autotools" />
+  <StartMode startupentry="MonoDevelop.CBinding" single="True">
+    <Execute type="None" entry="MonoDevelop.CBinding" />
+    <Execute type="None" entry="MonoDevelop.CBinding.Autotools" />
   </StartMode>
   <Entries>
     <Entry filename="CBinding.mdp" />
diff --git a/main/src/addins/CBinding/ChangeLog b/main/src/addins/CBinding/ChangeLog
index d56a08f640..99475c20cc 100644
--- a/main/src/addins/CBinding/ChangeLog
+++ b/main/src/addins/CBinding/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* CBinding.addin.xml, CBinding.mdp, CBinding.mds,
+	  CBinding.Autotools/CBinding.Autotools.mdp, Makefile.am: Directory
+	  reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* CBinding.mdp, gtk-gui/gui.stetic: Updated paths.
diff --git a/main/src/addins/CBinding/Makefile.am b/main/src/addins/CBinding/Makefile.am
index befc7d0fc6..65e07de40b 100644
--- a/main/src/addins/CBinding/Makefile.am
+++ b/main/src/addins/CBinding/Makefile.am
@@ -1,14 +1,13 @@
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
-ASSEMBLY = $(ADDIN_BUILD)/CBinding.dll
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.CBinding.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.Linux.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.SourceEditor.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/CSharpBinding/Autotools/Autotools.mdp b/main/src/addins/CSharpBinding/Autotools/Autotools.mdp
index 277bd7398e..2c546e63fe 100644
--- a/main/src/addins/CSharpBinding/Autotools/Autotools.mdp
+++ b/main/src/addins/CSharpBinding/Autotools/Autotools.mdp
@@ -1,13 +1,13 @@
-<Project name="CSharpBinding.Autotools" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.CSharpBinding.Autotools" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/BackendBindings" assembly="CSharpBinding.Autotools" />
+      <Output directory="../../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CSharpBinding.Autotools" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="Autotools" />
+      <Output directory="../../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CSharpBinding.Autotools" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -19,12 +19,12 @@
   <References>
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Autotools" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="CSharpBinding" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.CSharpBinding" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Name="REFS" />
diff --git a/main/src/addins/CSharpBinding/Autotools/Makefile.am b/main/src/addins/CSharpBinding/Autotools/Makefile.am
index 794f3e41a5..5da0e4b8dc 100644
--- a/main/src/addins/CSharpBinding/Autotools/Makefile.am
+++ b/main/src/addins/CSharpBinding/Autotools/Makefile.am
@@ -1,7 +1,7 @@
 FILES = CSharpAutotoolsSetup.cs
 
 REFS =  \
-	-r:$(top_builddir)/build/AddIns/BackendBindings/CSharpBinding.dll \
+	-r:$(top_builddir)/build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
@@ -9,7 +9,7 @@ REFS =  \
 	-r:System
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
-ASSEMBLY = $(ADDIN_BUILD)/CSharpBinding.Autotools.dll
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.CSharpBinding.Autotools.dll
 
 all: $(ASSEMBLY)
 
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
index 8d7602a06f..7c1e2400be 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
+++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
@@ -8,10 +8,6 @@
 	   category    = "Language bindings"
        version     = "0.17.0">
 	
-	<Runtime>
-		<Import assembly = "CSharpBinding.dll"/>
-	</Runtime>
-
 	<Dependencies>
 	    <Addin id="Core" version="0.17.0"/>
 	    <Addin id="Core.Gui" version="0.17.0"/>
@@ -127,7 +123,7 @@
 	
 	<Module>
 	    <Runtime>
-	        <Import assembly="CSharpBinding.Autotools.dll"/>
+	        <Import assembly="MonoDevelop.CSharpBinding.Autotools.dll"/>
 	    </Runtime>
 		<Dependencies>
 			<Addin id="Autotools" version="0.17.0"/>
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.mdp b/main/src/addins/CSharpBinding/CSharpBinding.mdp
index 0368dfee8e..02cb9a5f1f 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.mdp
+++ b/main/src/addins/CSharpBinding/CSharpBinding.mdp
@@ -1,13 +1,13 @@
-<Project name="CSharpBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.CSharpBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="CSharpBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CSharpBinding" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="3" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="CSharpBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.CSharpBinding" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -79,15 +79,15 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Project" localcopy="False" refto="NRefactory" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.mds b/main/src/addins/CSharpBinding/CSharpBinding.mds
index 03d512d08f..60cdbe41c9 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.mds
+++ b/main/src/addins/CSharpBinding/CSharpBinding.mds
@@ -1,17 +1,17 @@
 <Combine name="CSharpBinding" fileversion="2.0">
   <Configurations>
     <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry build="True" name="CSharpBinding" configuration="Debug" />
-      <Entry build="True" name="CSharpBinding.Autotools" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.CSharpBinding" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.CSharpBinding.Autotools" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
-      <Entry build="True" name="CSharpBinding" configuration="Release" />
-      <Entry build="True" name="CSharpBinding.Autotools" configuration="Release" />
+      <Entry build="True" name="MonoDevelop.CSharpBinding" configuration="Release" />
+      <Entry build="True" name="MonoDevelop.CSharpBinding.Autotools" configuration="Release" />
     </Configuration>
   </Configurations>
-  <StartMode startupentry="CSharpBinding" single="True">
-    <Execute type="None" entry="CSharpBinding" />
-    <Execute type="None" entry="CSharpBinding.Autotools" />
+  <StartMode startupentry="MonoDevelop.CSharpBinding" single="True">
+    <Execute type="None" entry="MonoDevelop.CSharpBinding" />
+    <Execute type="None" entry="MonoDevelop.CSharpBinding.Autotools" />
   </StartMode>
   <Entries>
     <Entry filename="CSharpBinding.mdp" />
diff --git a/main/src/addins/CSharpBinding/ChangeLog b/main/src/addins/CSharpBinding/ChangeLog
index 9ff31e4284..cb7d3ab538 100644
--- a/main/src/addins/CSharpBinding/ChangeLog
+++ b/main/src/addins/CSharpBinding/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* CSharpBinding.addin.xml, Autotools/Autotools.mdp, Autotools/Makefile.am,
+	  CSharpBinding.mdp, CSharpBinding.mds, gtk-gui/gui.stetic, Makefile.am:
+	  Directory reorganization.
+
 2007-12-03  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* Gui/CSharpTextEditorExtension.cs: Fix for "Bug 345774 - "override"
diff --git a/main/src/addins/CSharpBinding/Makefile.am b/main/src/addins/CSharpBinding/Makefile.am
index 49118ec8bd..21e15c8576 100644
--- a/main/src/addins/CSharpBinding/Makefile.am
+++ b/main/src/addins/CSharpBinding/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . Autotools
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
-ASSEMBLY = $(ADDIN_BUILD)/CSharpBinding.dll
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.CSharpBinding.dll
 
 PARSE = parse.exe
 
@@ -9,8 +9,8 @@ REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.SourceEditor.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
index 56b09233e9..88aa72f172 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
+++ b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
@@ -5,9 +5,9 @@
     <target-gtk-version>2.8.3</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../build/bin/MonoDevelop.Components.dll" />
-    <widget-library name="../../../build/bin/MonoDevelop.Projects.Gui.dll" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" />
   </import>
   <widget class="Gtk.Bin" id="CSharpBinding.CodeGenerationPanelWidget" design-size="365 448">
     <property name="MemberName" />
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLog b/main/src/addins/ChangeLogAddIn/ChangeLog
index 27ed5acf6c..82c68e44be 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLog
+++ b/main/src/addins/ChangeLogAddIn/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* ChangeLogAddIn.mdp, Makefile.am: Directory reorganization.
+
 2007-11-12  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* ChangeLogAddIn.cs: If no file is open but one is selected in the tree, use
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.mdp b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.mdp
index 47e1187735..36a546ebfa 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.mdp
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.mdp
@@ -1,13 +1,13 @@
-<Project name="ChangeLogAddIn" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.ChangeLogAddIn" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/ChangeLogAddIn/" assembly="ChangeLogAddIn" />
+      <Output directory="../../../build/AddIns/ChangeLogAddIn/" assembly="ChangeLogAddIn" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/ChangeLogAddIn/" assembly="ChangeLogAddIn" />
+      <Output directory="../../../build/AddIns/ChangeLogAddIn/" assembly="ChangeLogAddIn" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -45,9 +45,9 @@
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/ChangeLogAddIn/Makefile.am b/main/src/addins/ChangeLogAddIn/Makefile.am
index 400258c6db..9367077f06 100644
--- a/main/src/addins/ChangeLogAddIn/Makefile.am
+++ b/main/src/addins/ChangeLogAddIn/Makefile.am
@@ -3,8 +3,8 @@ ASSEMBLY = $(ADDIN_BUILD)/ChangeLogAddIn.dll
 
 REFS =  \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/VersionControl/VersionControlAddIn.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/VersionControl/MonoDevelop.VersionControl.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
index 37c63dce5a..505db8f9e9 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Deployment.Linux.mdp, Makefile.am: Directory reorganization.
+
 2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.Deployment.Linux/LinuxDeploymentSetup.cs,
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am
index b257656764..8f89a3ffab 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am
@@ -1,13 +1,13 @@
 
-ADDIN_BUILD = $(top_builddir)/build/AddIns
+ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.Deployment
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Deployment.Linux.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GNOME_VFS_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.mdp b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.mdp
index 25fbc48635..0f7ea3e376 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.mdp
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.Deployment.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns" assembly="MonoDevelop.Deployment.Linux" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.Deployment" assembly="MonoDevelop.Deployment.Linux" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="MonoDevelop.Deployment.Linux" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.Deployment" assembly="MonoDevelop.Deployment.Linux" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -51,16 +51,16 @@
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar Sync="True" Name="DATA_FILES" />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog b/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
index 43cb0018a4..928d86c1d7 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
+	  gtk-gui/gui.stetic, Makefile.am: Directory reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.Deployment/DeployDirectoryNodeType.cs,
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am b/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am
index 73bd792f69..721101bfef 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am
@@ -1,13 +1,13 @@
 
-ADDIN_BUILD = $(top_builddir)/build/AddIns
+ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.Deployment
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Deployment.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
index 48b7ef706e..1385905df1 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
@@ -9,10 +9,6 @@
        version     = "0.17.0"
        compatVersion = "0.17.0">
 
-	<Runtime>
-		<Import assembly="MonoDevelop.Deployment.dll"/>
-	</Runtime>
-
 	<Dependencies>
 		<Addin id="Core" version="0.17.0"/>
 		<Addin id="Core.Gui" version="0.17.0"/>
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.mdp b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.mdp
index 352a9bd680..a6f5645f08 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.mdp
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.Deployment" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns" assembly="MonoDevelop.Deployment" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.Deployment" assembly="MonoDevelop.Deployment" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="MonoDevelop.Deployment" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.Deployment" assembly="MonoDevelop.Deployment" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -111,15 +111,15 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.DesignerSupport" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar Sync="True" Name="DATA_FILES" />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic
index 23fb97cd83..55084a01e0 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic
@@ -5,10 +5,10 @@
     <target-gtk-version>2.8.3</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" />
-    <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" />
-    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.Deployment.dll" internal="true" />
+    <widget-library name="../../../../../build/bin/MonoDevelop.Components.dll" />
+    <widget-library name="../../../../../build/bin/MonoDevelop.Projects.Gui.dll" />
+    <widget-library name="../../../../../build/bin/MonoDevelop.Ide.dll" />
+    <widget-library name="../../../../../build/AddIns/MonoDevelop.Deployment.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget" design-size="348 50">
     <property name="MemberName" />
diff --git a/main/src/addins/GeckoWebBrowser/ChangeLog b/main/src/addins/GeckoWebBrowser/ChangeLog
index 428b01fd98..b0aa771ee2 100644
--- a/main/src/addins/GeckoWebBrowser/ChangeLog
+++ b/main/src/addins/GeckoWebBrowser/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* GeckoWebBrowser.mdp, Makefile.am: Directory reorganization.
+
 2007-12-03  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* GeckoWebBrowser.cs: Implement LinkClicked event.
diff --git a/main/src/addins/GeckoWebBrowser/GeckoWebBrowser.mdp b/main/src/addins/GeckoWebBrowser/GeckoWebBrowser.mdp
index dbf049a88b..db2f03fdcb 100644
--- a/main/src/addins/GeckoWebBrowser/GeckoWebBrowser.mdp
+++ b/main/src/addins/GeckoWebBrowser/GeckoWebBrowser.mdp
@@ -1,13 +1,13 @@
 <Project name="GeckoWebBrowser" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/GeckoWebBrowser" assembly="GeckoWebBrowser" />
+      <Output directory="../../../build/AddIns/MonoDevelop.GeckoWebBrowser/GeckoWebBrowser" assembly="MonoDevelop.GeckoWebBrowser" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/GeckoWebBrowser" assembly="GeckoWebBrowser" />
+      <Output directory="../../../build/AddIns/MonoDevelop.GeckoWebBrowser/GeckoWebBrowser" assembly="MonoDevelop.GeckoWebBrowser" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -23,18 +23,17 @@
     <File name="Makefile.am" subtype="Code" buildaction="Nothing" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="True" refto="gecko-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gecko-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
-  <GtkDesignInfo gtkVersion="2.8.3" />
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../..">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
@@ -43,4 +42,5 @@
     <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
     <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
   </MonoDevelop.Autotools.MakefileInfo>
+  <GtkDesignInfo gtkVersion="2.8.3" />
 </Project>
\ No newline at end of file
diff --git a/main/src/addins/GeckoWebBrowser/Makefile.am b/main/src/addins/GeckoWebBrowser/Makefile.am
index bd9ebb71a4..4279e48f94 100644
--- a/main/src/addins/GeckoWebBrowser/Makefile.am
+++ b/main/src/addins/GeckoWebBrowser/Makefile.am
@@ -1,5 +1,5 @@
-ADDIN_BUILD = $(top_builddir)/build/AddIns/GeckoWebBrowser
-ASSEMBLY = $(ADDIN_BUILD)/GeckoWebBrowser.dll
+ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.GeckoWebBrowser/GeckoWebBrowser
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.GeckoWebBrowser.dll
 
 REFS =  \
 	$(GECKO_SHARP_LIBS) \
diff --git a/main/src/addins/ILAsmBinding/ChangeLog b/main/src/addins/ILAsmBinding/ChangeLog
index 20a816ced2..6c32ffe247 100644
--- a/main/src/addins/ILAsmBinding/ChangeLog
+++ b/main/src/addins/ILAsmBinding/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* ILAsmBinding.mdp, Makefile.am: Directory reorganization.
+
 2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* ILAsmBinding.addin.xml: Bump MD version.
diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.mdp b/main/src/addins/ILAsmBinding/ILAsmBinding.mdp
index c0729253b0..16c5e92ff4 100644
--- a/main/src/addins/ILAsmBinding/ILAsmBinding.mdp
+++ b/main/src/addins/ILAsmBinding/ILAsmBinding.mdp
@@ -1,13 +1,13 @@
 <Project name="ILAsmBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="ILAsmBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="ILAsmBinding" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="ILAsmBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="ILAsmBinding" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -34,9 +34,9 @@
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/ILAsmBinding/Makefile.am b/main/src/addins/ILAsmBinding/Makefile.am
index 4512646565..9ca2302a23 100644
--- a/main/src/addins/ILAsmBinding/Makefile.am
+++ b/main/src/addins/ILAsmBinding/Makefile.am
@@ -3,7 +3,7 @@ ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
 ASSEMBLY = $(ADDIN_BUILD)/ILAsmBinding.dll
 REFS =  \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am
index ce185742df..6c06d54dcc 100644
--- a/main/src/addins/Makefile.am
+++ b/main/src/addins/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor MonoDevelop.SourceEditor2 MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding DebuggerAddIn ILAsmBinding JavaBinding BooBinding NemerleBinding NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn MonoDevelop.GtkCore GeckoWebBrowser AspNetAddIn AspNetEdit MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding MonoDevelop.Database
+SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding ILAsmBinding NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn MonoDevelop.GtkCore AspNetAddIn MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding GeckoWebBrowser
diff --git a/main/src/addins/MonoDevelop.Autotools/ChangeLog b/main/src/addins/MonoDevelop.Autotools/ChangeLog
index 70abf55cdd..3964c21f1e 100644
--- a/main/src/addins/MonoDevelop.Autotools/ChangeLog
+++ b/main/src/addins/MonoDevelop.Autotools/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Autotools.mdp, gtk-gui/gui.stetic, Makefile.am: Directory
+	  reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* SimpleProjectMakefileHandler.cs: Fix warnings.
diff --git a/main/src/addins/MonoDevelop.Autotools/Makefile.am b/main/src/addins/MonoDevelop.Autotools/Makefile.am
index 899c346a49..85cb8535f3 100644
--- a/main/src/addins/MonoDevelop.Autotools/Makefile.am
+++ b/main/src/addins/MonoDevelop.Autotools/Makefile.am
@@ -5,9 +5,9 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Autotools.dll
 REFS =  \
 	$(GNOME_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.mdp b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.mdp
index ddfdf13701..6199315260 100644
--- a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.mdp
+++ b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.Autotools" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.Autotools/" assembly="MonoDevelop.Autotools" />
+      <Output directory="../../../build/AddIns/MonoDevelop.Autotools/" assembly="MonoDevelop.Autotools" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="MonoDevelop.Autotools" />
+      <Output directory="../../../build/AddIns/MonoDevelop.Autotools/" assembly="MonoDevelop.Autotools" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -73,17 +73,17 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.DesignerSupport" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar Sync="True" Name="DATA_FILES" />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic
index d91d34aa1f..acc5a1259d 100644
--- a/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic
@@ -5,11 +5,11 @@
     <target-gtk-version>2.8.3</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../build/bin/MonoDevelop.Components.dll" />
-    <widget-library name="../../../build/bin/MonoDevelop.Projects.Gui.dll" />
-    <widget-library name="../../../build/AddIns/MonoDevelop.Deployment.dll" />
-    <widget-library name="../../../build/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll" internal="true" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.Autotools.MakefileOptionPanelWidget" design-size="589 368">
     <property name="MemberName" />
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog b/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
index 6a7a0f4326..291097917a 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
+++ b/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Directory reorganization.
+
 2007-11-19  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.DesignerSupport.addin.xml, MonoDevelop.DesignerSupport.mdp,
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am b/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am
index 5bbea83054..a6e61b5353 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am
+++ b/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am
@@ -5,7 +5,7 @@ REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
index c09fa6c40d..68083bde48 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.DesignerSupport" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.DesignerSupport" assembly="MonoDevelop.DesignerSupport" />
+      <Output directory="../../../build/AddIns/MonoDevelop.DesignerSupport" assembly="MonoDevelop.DesignerSupport" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="MonoDevelop.DesignerSupport" />
+      <Output directory="../../../build/AddIns/MonoDevelop.DesignerSupport" assembly="MonoDevelop.DesignerSupport" />
       <Build debugmode="False" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -115,15 +115,15 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/MonoDevelop.Gettext/ChangeLog b/main/src/addins/MonoDevelop.Gettext/ChangeLog
index 1fc4134c73..b8599360c9 100644
--- a/main/src/addins/MonoDevelop.Gettext/ChangeLog
+++ b/main/src/addins/MonoDevelop.Gettext/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Gettext.mdp, Makefile.am: Directory reorganization.
+
 2007-12-02  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.Gettext/Catalog.cs: Fix build.
diff --git a/main/src/addins/MonoDevelop.Gettext/Makefile.am b/main/src/addins/MonoDevelop.Gettext/Makefile.am
index a2147e0e89..5c0217a527 100644
--- a/main/src/addins/MonoDevelop.Gettext/Makefile.am
+++ b/main/src/addins/MonoDevelop.Gettext/Makefile.am
@@ -6,10 +6,10 @@ REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GNOME_VFS_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.mdp b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.mdp
index f38af20ddc..6e3aa73d6f 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.mdp
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.Gettext" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.Gettext" assembly="MonoDevelop.Gettext" />
+      <Output directory="../../../build/AddIns/MonoDevelop.Gettext" assembly="MonoDevelop.Gettext" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." codepage="65001" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.Gettext" assembly="MonoDevelop.Gettext" />
+      <Output directory="../../../build/AddIns/MonoDevelop.Gettext" assembly="MonoDevelop.Gettext" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." codepage="65001" ctype="CSharpCompilerParameters" />
@@ -79,17 +79,17 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.DesignerSupport" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Autotools" />
+    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Autotools" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/MonoDevelop.GtkCore/ChangeLog b/main/src/addins/MonoDevelop.GtkCore/ChangeLog
index 22d33b1fbf..63a1fb5b20 100644
--- a/main/src/addins/MonoDevelop.GtkCore/ChangeLog
+++ b/main/src/addins/MonoDevelop.GtkCore/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
+	  Makefile.am: Directory reorganization.
+
 2007-11-20  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* gui.glade, MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Removed
diff --git a/main/src/addins/MonoDevelop.GtkCore/Makefile.am b/main/src/addins/MonoDevelop.GtkCore/Makefile.am
index fdd648557b..d22394d54c 100644
--- a/main/src/addins/MonoDevelop.GtkCore/Makefile.am
+++ b/main/src/addins/MonoDevelop.GtkCore/Makefile.am
@@ -8,18 +8,17 @@ REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/Mono.Cecil.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Xml
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp
index 23112f5688..b3aab310c6 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.GtkCore" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.GtkCore" assembly="MonoDevelop.GtkCore" />
+      <Output directory="../../../build/AddIns/MonoDevelop.GtkCore" assembly="MonoDevelop.GtkCore" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="MonoDevelop.GtkCore" />
+      <Output directory="../../../build/AddIns/MonoDevelop.GtkCore" assembly="MonoDevelop.GtkCore" />
       <Build debugmode="False" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -65,31 +65,30 @@
     <File name="MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
-    <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="False" refto="gconf-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gconf-sharp-peditors, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.DesignerSupport" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Project" localcopy="False" refto="libstetic" />
+    <ProjectReference type="Project" localcopy="False" refto="libsteticui" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.DesignerSupport" />
     <ProjectReference type="Project" localcopy="False" refto="Mono.Cecil" />
-    <ProjectReference type="Project" localcopy="False" refto="libstetic" />
-    <ProjectReference type="Project" localcopy="False" refto="libsteticui" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/MonoDevelop.GtkCore/lib/libstetic.mdp b/main/src/addins/MonoDevelop.GtkCore/lib/libstetic.mdp
index b843b27bde..797d6889c5 100644
--- a/main/src/addins/MonoDevelop.GtkCore/lib/libstetic.mdp
+++ b/main/src/addins/MonoDevelop.GtkCore/lib/libstetic.mdp
@@ -4,7 +4,7 @@
       <CustomCommands>
         <Command type="Build" command="make libstetic" workingdir="${ProjectDir}" />
       </CustomCommands>
-      <Output directory="../../../build/AddIns/MonoDevelop.GtkCore" assemblyKeyFile="." assembly="libstetic" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.GtkCore" assemblyKeyFile="." assembly="libstetic" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -13,7 +13,7 @@
       <CustomCommands>
         <Command type="Build" command="make libstetic" workingdir="${ProjectDir}" />
       </CustomCommands>
-      <Output directory="../../../build/AddIns/MonoDevelop.GtkCore" assembly="libstetic" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.GtkCore" assembly="libstetic" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
diff --git a/main/src/addins/MonoDevelop.GtkCore/lib/libsteticui.mdp b/main/src/addins/MonoDevelop.GtkCore/lib/libsteticui.mdp
index 5d9965bb85..4e3ee326fd 100644
--- a/main/src/addins/MonoDevelop.GtkCore/lib/libsteticui.mdp
+++ b/main/src/addins/MonoDevelop.GtkCore/lib/libsteticui.mdp
@@ -4,7 +4,7 @@
       <CustomCommands>
         <Command type="Build" command="make libsteticui" workingdir="${ProjectDir}" />
       </CustomCommands>
-      <Output directory="../../../build/AddIns/MonoDevelop.GtkCore" assembly="libsteticui" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.GtkCore" assembly="libsteticui" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -13,7 +13,7 @@
       <CustomCommands>
         <Command type="Build" command="make libsteticui" workingdir="${ProjectDir}" />
       </CustomCommands>
-      <Output directory="../../../build/AddIns/MonoDevelop.GtkCore" assembly="libsteticui" />
+      <Output directory="../../../../build/AddIns/MonoDevelop.GtkCore" assembly="libsteticui" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_1_1" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog b/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
index 6cc470ca4d..634d3bac16 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
+++ b/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.RegexToolkit.mdp, Makefile.am: Directory reorganization.
+
 2007-12-02  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* AssemblyInfo.cs: Sync assembly and add-in versions.
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am b/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
index 6539c051fa..ed42bcbc62 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
+++ b/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
@@ -5,9 +5,8 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.RegexToolkit.dll
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp
index 6a0ad56bb3..31d25d57ca 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.RegexToolkit" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.RegexToolkit" assembly="MonoDevelop.RegexToolkit" />
+      <Output directory="../../../build/AddIns/MonoDevelop.RegexToolkit" assembly="MonoDevelop.RegexToolkit" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.RegexToolkit" assembly="MonoDevelop.RegexToolkit" />
+      <Output directory="../../../build/AddIns/MonoDevelop.RegexToolkit" assembly="MonoDevelop.RegexToolkit" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -31,11 +31,6 @@
     <File name="gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="False" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -49,11 +44,14 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Deployment" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <GtkDesignInfo />
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
@@ -62,4 +60,5 @@
     <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
     <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
   </MonoDevelop.Autotools.MakefileInfo>
+  <GtkDesignInfo />
 </Project>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor/ChangeLog b/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
index 23242c206f..8c2f9c5533 100644
--- a/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
+++ b/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* Makefile.am, MonoDevelop.SourceEditor.mdp: Directory reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: Removed
diff --git a/main/src/addins/MonoDevelop.SourceEditor/Makefile.am b/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
index ae341dc346..afad90ea53 100644
--- a/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
+++ b/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
@@ -40,7 +40,7 @@ REFS =  \
 	$(GNOME_VFS_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(GTKSOURCEVIEW_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp b/main/src/addins/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
index fd810e7e7e..6e0cc68a62 100644
--- a/main/src/addins/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
+++ b/main/src/addins/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.SourceEditor" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/" assembly="MonoDevelop.SourceEditor" />
+      <Output directory="../../../build/AddIns/" assembly="MonoDevelop.SourceEditor" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="3" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/" assembly="MonoDevelop.SourceEditor" />
+      <Output directory="../../../build/AddIns/" assembly="MonoDevelop.SourceEditor" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -35,12 +35,12 @@
     <File name="ChangeLog" subtype="Code" buildaction="Nothing" />
     <File name="MonoDevelop.SourceEditor.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="bookmark.png" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.SourceEditor.FormattingStrategy/IFormattingStrategy.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.SourceEditor.FormattingStrategy/DefaultFormattingStrategy.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.SourceEditor.Gui.OptionPanels/BehaviorTextEditorPanel.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.SourceEditor.Gui.OptionPanels/GeneralTextEditorPanel.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs" subtype="Code" buildaction="Compile" />
+    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
@@ -49,23 +49,23 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtksourceview-sharp, Version=1.0.0.2, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtksourceview-sharp, Version=1.0.0.2, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../..">
     <ExcludedFiles>
       <File>AssemblyInfo.cs</File>
     </ExcludedFiles>
diff --git a/main/src/addins/MonoDevelop.WebReferences/ChangeLog b/main/src/addins/MonoDevelop.WebReferences/ChangeLog
index e84287e4e7..b302c155a1 100644
--- a/main/src/addins/MonoDevelop.WebReferences/ChangeLog
+++ b/main/src/addins/MonoDevelop.WebReferences/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.WebReferences.mdp, Makefile.am: Directory reorganization.
+
 2007-11-30  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.WebReferences.mdp,
diff --git a/main/src/addins/MonoDevelop.WebReferences/Makefile.am b/main/src/addins/MonoDevelop.WebReferences/Makefile.am
index eae26d12cf..7a9be1d699 100644
--- a/main/src/addins/MonoDevelop.WebReferences/Makefile.am
+++ b/main/src/addins/MonoDevelop.WebReferences/Makefile.am
@@ -4,7 +4,7 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.WebReferences.dll
 
 REFS =  \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.mdp b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.mdp
index 42da76aedf..260b87066f 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.mdp
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.WebReferences" fileversion="2.0" language="C#" clr-version="Net_2_0" UsePartialTypes="False" defaultDeployTarget="Make" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDevelop.WebReferences" assembly="MonoDevelop.WebReferences" />
+      <Output directory="../../../build/AddIns/MonoDevelop.WebReferences" assembly="MonoDevelop.WebReferences" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="MonoDevelop.WebReferences" />
+      <Output directory="../../../build/AddIns/MonoDevelop.WebReferences" assembly="MonoDevelop.WebReferences" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -54,13 +54,13 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/MonoDeveloperExtensions/ChangeLog b/main/src/addins/MonoDeveloperExtensions/ChangeLog
index ff996af25b..d3d2a26d72 100644
--- a/main/src/addins/MonoDeveloperExtensions/ChangeLog
+++ b/main/src/addins/MonoDeveloperExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* Makefile.am, NUnit/NUnit.mdp, MonoDeveloperExtensions.mdp: Directory
+	  reorganization.
+
 2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoProject.cs: Use RootCombine instead of CurrentOpenCombine when
diff --git a/main/src/addins/MonoDeveloperExtensions/Makefile.am b/main/src/addins/MonoDeveloperExtensions/Makefile.am
index 12a6b6054c..dded774ad8 100644
--- a/main/src/addins/MonoDeveloperExtensions/Makefile.am
+++ b/main/src/addins/MonoDeveloperExtensions/Makefile.am
@@ -14,7 +14,7 @@ REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(GTKSOURCEVIEW_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.mdp b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.mdp
index e33843c10c..cd2e9eeff3 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.mdp
+++ b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDeveloperExtensions" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDeveloperExtensions/" assembly="MonoDeveloperExtensions" />
+      <Output directory="../../../build/AddIns/MonoDeveloperExtensions/" assembly="MonoDeveloperExtensions" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/MonoDeveloperExtensions/" assembly="MonoDeveloperExtensions" />
+      <Output directory="../../../build/AddIns/MonoDeveloperExtensions/" assembly="MonoDeveloperExtensions" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -30,19 +30,19 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
-    <ProjectReference type="Gac" localcopy="False" refto="gtksourceview-sharp, Version=1.0.0.2, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gconf-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gconf-sharp-peditors, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtksourceview-sharp, Version=1.0.0.2, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.mdp b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.mdp
index 1ca16a4d0e..7f84b86e90 100644
--- a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.mdp
+++ b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDeveloperExtensions_nunit" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/MonoDeveloperExtensions/" assembly="MonoDeveloperExtensions_nunit" />
+      <Output directory="../../../../build/AddIns/MonoDeveloperExtensions/" assembly="MonoDeveloperExtensions_nunit" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="NUnit" />
+      <Output directory="../../../../build/AddIns/MonoDeveloperExtensions/" assembly="NUnit" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -18,13 +18,13 @@
     <File name="Makefile.am" subtype="Code" buildaction="Nothing" />
   </Contents>
   <References>
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.NUnit" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDeveloperExtensions" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.NUnit" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar />
diff --git a/main/src/addins/NUnit/ChangeLog b/main/src/addins/NUnit/ChangeLog
index caf7ca464d..c292e19643 100644
--- a/main/src/addins/NUnit/ChangeLog
+++ b/main/src/addins/NUnit/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.NUnit.mdp, Makefile.am: Directory reorganization.
+
 2007-11-13  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelopNUnit.addin.xml, Services/NUnitService.cs: Reuse the results
diff --git a/main/src/addins/NUnit/Makefile.am b/main/src/addins/NUnit/Makefile.am
index ed5200e059..b16e7affcf 100644
--- a/main/src/addins/NUnit/Makefile.am
+++ b/main/src/addins/NUnit/Makefile.am
@@ -4,15 +4,14 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.NUnit.dll
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll \
-	-r:$(top_srcdir)/Extras/NUnit/lib/nunit.core.dll \
-	-r:$(top_srcdir)/Extras/NUnit/lib/nunit.framework.dll \
+	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
 	-r:System \
 	-r:System.Xml
 
diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.mdp b/main/src/addins/NUnit/MonoDevelop.NUnit.mdp
index 92136de6bd..eae54610c2 100644
--- a/main/src/addins/NUnit/MonoDevelop.NUnit.mdp
+++ b/main/src/addins/NUnit/MonoDevelop.NUnit.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.NUnit" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/NUnit/" assembly="MonoDevelop.NUnit" />
+      <Output directory="../../../build/AddIns/NUnit/" assembly="MonoDevelop.NUnit" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="3" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/NUnit/" assembly="MonoDevelop.NUnit" />
+      <Output directory="../../../build/AddIns/NUnit/" assembly="MonoDevelop.NUnit" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -69,24 +69,23 @@
     <File name="Gui/nunit-overlay-32.png" subtype="Code" buildaction="EmbedAsResource" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Assembly" localcopy="True" refto="lib/nunit.core.dll" />
     <ProjectReference type="Assembly" localcopy="True" refto="lib/nunit.framework.dll" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/VBNetBinding/ChangeLog b/main/src/addins/VBNetBinding/ChangeLog
index 779f88a3be..80044c0e46 100644
--- a/main/src/addins/VBNetBinding/ChangeLog
+++ b/main/src/addins/VBNetBinding/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* VBNetBinding.addin.xml, VBNetBinding.mdp, VBNetBinding.mds, Makefile.am:
+	  Directory reorganization.
+
 2007-11-21  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* Project/VBCompilerParameters.cs: Removed some obsolete attributes.
diff --git a/main/src/addins/VBNetBinding/Makefile.am b/main/src/addins/VBNetBinding/Makefile.am
index 03fa2ad628..63e9781327 100644
--- a/main/src/addins/VBNetBinding/Makefile.am
+++ b/main/src/addins/VBNetBinding/Makefile.am
@@ -1,11 +1,11 @@
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
-ASSEMBLY = $(ADDIN_BUILD)/VBNetBinding.dll
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.VBNetBinding.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
index 05f6076b91..e5dd55a0d2 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
+++ b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
@@ -8,10 +8,6 @@
 	   category    = "Language bindings"
        version     = "0.17.0">
 
-  <Runtime>
-    <Import assembly = "VBNetBinding.dll"/>
-  </Runtime>
-
 	<Dependencies>
 	    <Addin id="Core" version="0.17.0"/>
 	    <Addin id="Core.Gui" version="0.17.0"/>
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.mdp b/main/src/addins/VBNetBinding/VBNetBinding.mdp
index 38df87306b..f34ef3adba 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.mdp
+++ b/main/src/addins/VBNetBinding/VBNetBinding.mdp
@@ -1,13 +1,13 @@
-<Project name="VBNetBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.VBNetBinding" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="VBNetBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.VBNetBinding" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="3" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/BackendBindings/" assembly="VBNetBinding" />
+      <Output directory="../../../build/AddIns/BackendBindings/" assembly="MonoDevelop.VBNetBinding" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -29,7 +29,6 @@
     <File name="Parser/SharpDevelopTree/Constructor.cs" subtype="Code" buildaction="Compile" />
     <File name="Parser/SharpDevelopTree/ReturnType.cs" subtype="Code" buildaction="Compile" />
     <File name="Project/VBCompilerParameters.cs" subtype="Code" buildaction="Compile" />
-    <File name="Makefile.am" subtype="Code" buildaction="Nothing" />
     <File name="VB.glade" subtype="Code" buildaction="EmbedAsResource" />
     <File name="templates/EmptyVBFile.xft.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="templates/EmptyVBProject.xpt.xml" subtype="Code" buildaction="EmbedAsResource" />
@@ -48,16 +47,16 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="False" refto="NRefactory" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.mds b/main/src/addins/VBNetBinding/VBNetBinding.mds
index 447f89c5ff..585bc865e4 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.mds
+++ b/main/src/addins/VBNetBinding/VBNetBinding.mds
@@ -1,14 +1,14 @@
 <Combine name="VBNetBinding" fileversion="2.0">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry build="True" name="VBNetBinding" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.VBNetBinding" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
-      <Entry build="True" name="VBNetBinding" configuration="Debug" />
+      <Entry build="True" name="MonoDevelop.VBNetBinding" configuration="Debug" />
     </Configuration>
   </Configurations>
-  <StartMode startupentry="VBNetBinding" single="True">
-    <Execute type="None" entry="VBNetBinding" />
+  <StartMode startupentry="MonoDevelop.VBNetBinding" single="True">
+    <Execute type="None" entry="MonoDevelop.VBNetBinding" />
   </StartMode>
   <Entries>
     <Entry filename="VBNetBinding.mdp" />
diff --git a/main/src/addins/VersionControl/ChangeLog b/main/src/addins/VersionControl/ChangeLog
index ca11fd17d4..08364cd02c 100644
--- a/main/src/addins/VersionControl/ChangeLog
+++ b/main/src/addins/VersionControl/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* Diff/Diff.mdp, MonoDevelop.VersionControl.Subversion/Makefile.am,
+	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
+	  DiffWidget/DiffWidget.mdp: Directory reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
diff --git a/main/src/addins/VersionControl/Diff/Diff.mdp b/main/src/addins/VersionControl/Diff/Diff.mdp
index 920b5215bd..da2755b333 100644
--- a/main/src/addins/VersionControl/Diff/Diff.mdp
+++ b/main/src/addins/VersionControl/Diff/Diff.mdp
@@ -1,13 +1,13 @@
 <Project name="Diff" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl/" assembly="Diff" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="Diff" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl/" assembly="Diff" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="Diff" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -24,7 +24,7 @@
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar />
diff --git a/main/src/addins/VersionControl/DiffWidget/DiffWidget.mdp b/main/src/addins/VersionControl/DiffWidget/DiffWidget.mdp
index ee20b31cac..1a886dbb4d 100644
--- a/main/src/addins/VersionControl/DiffWidget/DiffWidget.mdp
+++ b/main/src/addins/VersionControl/DiffWidget/DiffWidget.mdp
@@ -1,13 +1,13 @@
 <Project name="DiffWidget" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl/" assembly="DiffWidget" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="DiffWidget" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl/" assembly="DiffWidget" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="DiffWidget" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -23,7 +23,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am
index 08cba66806..9dcb5c1984 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.VersionControl.Subversion.dll
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/VersionControl/VersionControlAddIn.dll \
+	-r:$(top_builddir)/build/AddIns/VersionControl/MonoDevelop.VersionControl.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp
index 9809ec8768..4477bb21ce 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.VersionControl.Subversion" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl" assembly="MonoDevelop.VersionControl.Subversion" />
+      <Output directory="../../../../build/AddIns/VersionControl" assembly="MonoDevelop.VersionControl.Subversion" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="3" optimize="False" unsafecodeallowed="True" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl" assembly="MonoDevelop.VersionControl.Subversion" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="MonoDevelop.VersionControl.Subversion" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -36,17 +36,17 @@
   <References>
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.VersionControl" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.VersionControl" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
index 7a93350f86..7af42f9d6e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.VersionControl.mdp, VersionControl.addin.xml, Makefile.am:
+	  Directory reorganization.
+
 2007-12-02  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.VersionControl/VersionControlProjectService.cs: Save comments
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
index 8e22d7ad1f..59036bbea6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
@@ -42,9 +42,9 @@ FILES =  \
 REFS =  \
 	$(GCONF_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/AddIns/VersionControl/Diff.dll \
 	-r:$(top_builddir)/build/AddIns/VersionControl/DiffWidget.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
@@ -80,7 +80,7 @@ RES =  \
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/VersionControl
 
-DLL = $(ADDIN_BUILD)/VersionControlAddIn.dll
+DLL = $(ADDIN_BUILD)/MonoDevelop.VersionControl.dll
 
 if ENABLE_VERSIONCONTROL
 all: $(DLL)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp
index 4a93e3508b..8cdfe5e75a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp
@@ -1,13 +1,13 @@
 <Project name="MonoDevelop.VersionControl" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl" assembly="VersionControlAddIn" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="MonoDevelop.VersionControl" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../../build/AddIns/VersionControl" assembly="VersionControlAddIn" />
+      <Output directory="../../../../build/AddIns/VersionControl/" assembly="MonoDevelop.VersionControl" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -79,24 +79,24 @@
   <References>
     <ProjectReference type="Project" localcopy="False" refto="Diff" />
     <ProjectReference type="Project" localcopy="False" refto="DiffWidget" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="False" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gconf-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="gconf-sharp-peditors, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../..">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
index 14595f6e40..974bbc2864 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
@@ -11,7 +11,6 @@
 	<Runtime>

 		<Import assembly="Diff.dll"/>

 		<Import assembly="DiffWidget.dll"/>

-		<Import assembly="VersionControlAddIn.dll"/>

 	</Runtime>

 

 	<Dependencies>

diff --git a/main/src/addins/WelcomePage/ChangeLog b/main/src/addins/WelcomePage/ChangeLog
index aaa446bfd8..e2dd1807fb 100644
--- a/main/src/addins/WelcomePage/ChangeLog
+++ b/main/src/addins/WelcomePage/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* WelcomePage.mdp: Directory reorganization.
+
 2007-12-03  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* WelcomePageView.cs: Use new LinkClicked event.
diff --git a/main/src/addins/WelcomePage/WelcomePage.mdp b/main/src/addins/WelcomePage/WelcomePage.mdp
index fc151361d3..8ab7d457e8 100644
--- a/main/src/addins/WelcomePage/WelcomePage.mdp
+++ b/main/src/addins/WelcomePage/WelcomePage.mdp
@@ -1,13 +1,13 @@
 <Project name="WelcomePage" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/WelcomePage/" assembly="WelcomePage" />
+      <Output directory="../../../build/AddIns/WelcomePage/" assembly="WelcomePage" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/WelcomePage/" assembly="WelcomePage" />
+      <Output directory="../../../build/AddIns/WelcomePage/" assembly="WelcomePage" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -29,7 +29,6 @@
     <File name="Makefile.am" subtype="Code" buildaction="Nothing" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="False" refto="gecko-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
@@ -44,9 +43,9 @@
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gecko-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
   </References>
-  <GtkDesignInfo gtkVersion="2.8.3" />
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar Sync="True" Name="DATA_FILES" />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/addins/prj2make-sharp-lib/ChangeLog b/main/src/addins/prj2make-sharp-lib/ChangeLog
index d0914a2f7f..f6d7aabd69 100644
--- a/main/src/addins/prj2make-sharp-lib/ChangeLog
+++ b/main/src/addins/prj2make-sharp-lib/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* prj2make-sharp-lib.addin.xml, Makefile.am, prj2make-sharp-lib.mdp:
+	  Directory reorganization.
+
 2007-11-24  David Makovský (Yakeen) <yakeen@sanyas-on.net> 
 
 	* MSBuildProjectServiceExtension.cs: corected translatable string to
diff --git a/main/src/addins/prj2make-sharp-lib/Makefile.am b/main/src/addins/prj2make-sharp-lib/Makefile.am
index 1bdf1b80d7..ddca161984 100644
--- a/main/src/addins/prj2make-sharp-lib/Makefile.am
+++ b/main/src/addins/prj2make-sharp-lib/Makefile.am
@@ -1,13 +1,12 @@
 
-ADDIN_BUILD = $(top_builddir)/build/AddIns/prj2makesharp
-ASSEMBLY = $(ADDIN_BUILD)/prj2make-sharp-lib.dll
+ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.MsVisualStudio
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.MsVisualStudio.dll
 
 REFS =  \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/AddIns/BackendBindings/CSharpBinding.dll \
-	-r:$(top_builddir)/build/AddIns/BackendBindings/VBNetBinding.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
+	$(MONO_ADDINS_LIBS) \
+	-r:$(top_builddir)/build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll \
+	-r:$(top_builddir)/build/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
@@ -55,7 +54,7 @@ $(ASSEMBLY): $(build_sources) $(build_resources)
 	mkdir -p $(ADDIN_BUILD)
 	$(CSC) $(CSC_FLAGS) -out:$@ -target:library $(build_resources:%=/resource:%) $(build_sources) $(REFS)
 
-assemblydir = $(MD_ADDIN_DIR)
+assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.MsVisualStudio
 assembly_DATA = $(ASSEMBLY)
 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
diff --git a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml b/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml
index 2fa4eb604c..a0ed9fea5d 100644
--- a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml
+++ b/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml
@@ -8,10 +8,6 @@
 	   category    = "IDE extensions"
        version   = "0.17.0">
 
-	<Runtime>
-		<Import assembly="prj2make-sharp-lib.dll"/>
-	</Runtime>
-	
 	<Dependencies>
 	    <Addin id="Core" version="0.17.0"/>
 	    <Addin id="Core.Gui" version="0.17.0"/>
diff --git a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp b/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
index d262e60015..f268cd5434 100644
--- a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
+++ b/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
@@ -1,13 +1,13 @@
-<Project name="prj2make-sharp-lib" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="MonoDevelop.MsVisualStudio" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/prj2makesharp/" assembly="prj2make-sharp-lib" />
+      <Output directory="../../../build/AddIns/MonoDevelop.MsVisualStudio" assembly="MonoDevelop.MsVisualStudio" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../../build/AddIns/prj2makesharp/" assembly="prj2make-sharp-lib" />
+      <Output directory="../../../build/AddIns/MonoDevelop.MsVisualStudio" assembly="prj2make-sharp-lib" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -46,20 +46,19 @@
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Project" localcopy="False" refto="VBNetBinding" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
-    <ProjectReference type="Project" localcopy="False" refto="CSharpBinding" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.VBNetBinding" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.CSharpBinding" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
diff --git a/main/src/core/Core.mds b/main/src/core/Core.mds
index 0e5a13c367..3be006799c 100644
--- a/main/src/core/Core.mds
+++ b/main/src/core/Core.mds
@@ -9,7 +9,6 @@
       <Entry build="True" name="MonoDevelop.Ide" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.Projects" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.Projects.Gui" configuration="Debug" />
-      <Entry build="True" name="Tools" configuration="" />
       <Entry build="True" name="MonoDevelop.Startup" configuration="Debug" />
       <Entry build="True" name="NRefactory" configuration="Debug" />
     </Configuration>
@@ -22,7 +21,6 @@
       <Entry build="True" name="MonoDevelop.Ide" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.Projects" configuration="Debug" />
       <Entry build="True" name="MonoDevelop.Projects.Gui" configuration="Debug" />
-      <Entry build="True" name="Tools" configuration="" />
       <Entry build="True" name="MonoDevelop.Startup" configuration="Debug" />
       <Entry build="True" name="NRefactory" configuration="Release" />
     </Configuration>
@@ -49,7 +47,6 @@
     <Entry filename="MonoDevelop.Ide/MonoDevelop.Ide.mdp" />
     <Entry filename="MonoDevelop.Projects/MonoDevelop.Projects.mdp" />
     <Entry filename="MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp" />
-    <Entry filename="Tools/Tools.mds" />
     <Entry filename="MonoDevelop.Startup/MonoDevelop.Startup.mdp" />
     <Entry filename="NRefactory/NRefactory.mdp" />
   </Entries>
diff --git a/main/src/core/Makefile.am b/main/src/core/Makefile.am
index 2942cb6c2a..75bb94e57b 100644
--- a/main/src/core/Makefile.am
+++ b/main/src/core/Makefile.am
@@ -1 +1 @@
-SUBDIRS = MonoDevelop.Dock NRefactory MonoDevelop.Core MonoDevelop.Components MonoDevelop.Core.Gui  MonoDevelop.Projects MonoDevelop.Documentation MonoDevelop.Projects.Gui MonoDevelop.Ide MonoDevelop.Startup Tools
+SUBDIRS = MonoDevelop.Dock NRefactory MonoDevelop.Core MonoDevelop.Components MonoDevelop.Core.Gui  MonoDevelop.Projects MonoDevelop.Documentation MonoDevelop.Projects.Gui MonoDevelop.Ide MonoDevelop.Startup
diff --git a/main/src/core/MonoDevelop.Components/ChangeLog b/main/src/core/MonoDevelop.Components/ChangeLog
index dd6fc0ff3e..35ba83e65f 100644
--- a/main/src/core/MonoDevelop.Components/ChangeLog
+++ b/main/src/core/MonoDevelop.Components/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* gtk-gui/generated.cs, Makefile.am, MonoDevelop.Components.mdp: Directory
+	  reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* Makefile.am, MonoDevelop.Components.mdp,
diff --git a/main/src/core/MonoDevelop.Components/Makefile.am b/main/src/core/MonoDevelop.Components/Makefile.am
index e488fe5059..e7ce9462be 100644
--- a/main/src/core/MonoDevelop.Components/Makefile.am
+++ b/main/src/core/MonoDevelop.Components/Makefile.am
@@ -6,8 +6,7 @@ REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GNOME_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Setup.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/core/MonoDevelop.Components/MonoDevelop.Components.mdp b/main/src/core/MonoDevelop.Components/MonoDevelop.Components.mdp
index 8e6b755903..12a169a070 100644
--- a/main/src/core/MonoDevelop.Components/MonoDevelop.Components.mdp
+++ b/main/src/core/MonoDevelop.Components/MonoDevelop.Components.mdp
@@ -105,7 +105,6 @@
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="False" refto="gnome-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -114,17 +113,10 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Setup" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
-  <GtkDesignInfo isWidgetLibrary="True" gettextClass="MonoDevelop.Core.GettextCatalog">
-    <ExportedWidgets>
-      <Widget>MonoDevelop.Components.FileEntry</Widget>
-      <Widget>MonoDevelop.Components.FolderEntry</Widget>
-      <Widget>MonoDevelop.Components.IconView</Widget>
-    </ExportedWidgets>
-  </GtkDesignInfo>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <ExcludedFiles>
       <File>AssemblyInfo.cs</File>
@@ -137,6 +129,13 @@
     <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
     <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
   </MonoDevelop.Autotools.MakefileInfo>
+  <GtkDesignInfo isWidgetLibrary="True" gettextClass="MonoDevelop.Core.GettextCatalog">
+    <ExportedWidgets>
+      <Widget>MonoDevelop.Components.FileEntry</Widget>
+      <Widget>MonoDevelop.Components.FolderEntry</Widget>
+      <Widget>MonoDevelop.Components.IconView</Widget>
+    </ExportedWidgets>
+  </GtkDesignInfo>
   <MonoDevelop.Gettext.TranslationInfo />
   <DeploymentInformation strategy="File">
     <excludeFiles />
diff --git a/main/src/core/MonoDevelop.Components/gtk-gui/generated.cs b/main/src/core/MonoDevelop.Components/gtk-gui/generated.cs
index dd4abddae9..c67023088d 100644
--- a/main/src/core/MonoDevelop.Components/gtk-gui/generated.cs
+++ b/main/src/core/MonoDevelop.Components/gtk-gui/generated.cs
@@ -15,7 +15,7 @@ namespace Stetic {
         
         private static bool initialized;
         
-        internal static void Initialize() {
+        internal static void Initialize(Gtk.Widget iconRenderer) {
             if ((Stetic.Gui.initialized == false)) {
                 Stetic.Gui.initialized = true;
             }
diff --git a/main/src/core/MonoDevelop.Core.Gui/ChangeLog b/main/src/core/MonoDevelop.Core.Gui/ChangeLog
index c372ea585c..a1b5508a64 100644
--- a/main/src/core/MonoDevelop.Core.Gui/ChangeLog
+++ b/main/src/core/MonoDevelop.Core.Gui/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Core.Gui.mdp, Makefile.am: Directory reorganization.
+
 2007-12-03  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.Core.Gui.WebBrowser/IWebBrowser.cs: Add LinkClicked event,
diff --git a/main/src/core/MonoDevelop.Core.Gui/Makefile.am b/main/src/core/MonoDevelop.Core.Gui/Makefile.am
index 4b2a0a8b17..58a9bb0c06 100644
--- a/main/src/core/MonoDevelop.Core.Gui/Makefile.am
+++ b/main/src/core/MonoDevelop.Core.Gui/Makefile.am
@@ -6,9 +6,9 @@ REFS =  \
 	$(GNOME_SHARP_LIBS) \
 	$(GNOME_VFS_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Gui.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Setup.dll \
+	$(MONO_ADDINS_GUI_LIBS) \
+	$(MONO_ADDINS_LIBS) \
+	$(MONO_ADDINS_SETUP_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:ICSharpCode.SharpZipLib \
diff --git a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
index ec201d5dfc..573d82de64 100644
--- a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
+++ b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
@@ -189,12 +189,7 @@
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="ICSharpCode.SharpZipLib, Version=2.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Setup" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -203,8 +198,12 @@
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Gui, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Setup, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <GtkDesignInfo gtkVersion="2.8.3" />
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <ExcludedFiles>
       <File>AssemblyInfo.cs</File>
@@ -217,6 +216,7 @@
     <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
     <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
   </MonoDevelop.Autotools.MakefileInfo>
+  <GtkDesignInfo gtkVersion="2.8.3" />
   <DeploymentInformation strategy="File">
     <excludeFiles />
   </DeploymentInformation>
diff --git a/main/src/core/MonoDevelop.Core/ChangeLog b/main/src/core/MonoDevelop.Core/ChangeLog
index 46a6719574..c169b3876b 100644
--- a/main/src/core/MonoDevelop.Core/ChangeLog
+++ b/main/src/core/MonoDevelop.Core/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* Makefile.am, MonoDevelop.Core.mdp: Directory reorganization.
+
 2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.Core.ProgressMonitoring/ConsoleProgressMonitor.cs: Added
diff --git a/main/src/core/MonoDevelop.Core/Makefile.am b/main/src/core/MonoDevelop.Core/Makefile.am
index be4c148ad0..ef007212c6 100644
--- a/main/src/core/MonoDevelop.Core/Makefile.am
+++ b/main/src/core/MonoDevelop.Core/Makefile.am
@@ -70,8 +70,8 @@ GENERATED_FILES = MonoDevelop.Core/GettextCatalog.cs \
 RES = MonoDevelop.Core.addin.xml                                                          
 
 REFS =  \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Setup.dll \
+	$(MONO_ADDINS_LIBS) \
+	$(MONO_ADDINS_SETUP_LIBS) \
 	-r:ICSharpCode.SharpZipLib \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.mdp b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.mdp
index 819684c89d..6587275698 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.mdp
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.mdp
@@ -87,8 +87,8 @@
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="ICSharpCode.SharpZipLib, Version=2.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Setup" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Setup, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <ExcludedFiles>
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index e96d2b9c55..693fd72e39 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Ide.mdp, Makefile.am: Directory reorganization.
+
 2007-12-03  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs: Make logging call more
diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am
index 9baacf02d2..a2b87a29ab 100644
--- a/main/src/core/MonoDevelop.Ide/Makefile.am
+++ b/main/src/core/MonoDevelop.Ide/Makefile.am
@@ -9,11 +9,11 @@ REFS =  \
 	$(GNOME_VFS_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(GTKHTML_SHARP_LIBS) \
+	$(MONO_ADDINS_GUI_LIBS) \
+	$(MONO_ADDINS_LIBS) \
+	$(MONO_ADDINS_SETUP_LIBS) \
 	$(MONODOC_LIBS) \
 	-r:$(top_builddir)/build/AddIns/MonoDevelop.Documentation.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Gui.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Setup.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
index faf200ad19..66190f71d5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
@@ -346,17 +346,8 @@
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.GetOptions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Documentation" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Dock" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
     <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Gui" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Setup" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -366,14 +357,17 @@
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Components" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core.Gui" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Projects.Gui" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Documentation" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Setup, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Gui, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtkhtml-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
-  <GtkDesignInfo isWidgetLibrary="True" gtkVersion="2.8.3">
-    <ExportedWidgets>
-      <Widget>MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector</Widget>
-      <Widget>MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel</Widget>
-      <Widget>MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel</Widget>
-    </ExportedWidgets>
-  </GtkDesignInfo>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <ExcludedFiles>
       <File>AssemblyInfo.cs</File>
@@ -386,6 +380,13 @@
     <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
     <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
   </MonoDevelop.Autotools.MakefileInfo>
+  <GtkDesignInfo isWidgetLibrary="True" gtkVersion="2.8.3">
+    <ExportedWidgets>
+      <Widget>MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector</Widget>
+      <Widget>MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel</Widget>
+      <Widget>MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel</Widget>
+    </ExportedWidgets>
+  </GtkDesignInfo>
   <MonoDevelop.Gettext.TranslationInfo />
   <DeploymentInformation strategy="File">
     <excludeFiles />
diff --git a/main/src/core/MonoDevelop.Projects.Gui/ChangeLog b/main/src/core/MonoDevelop.Projects.Gui/ChangeLog
index 92e78148d4..02407a7696 100644
--- a/main/src/core/MonoDevelop.Projects.Gui/ChangeLog
+++ b/main/src/core/MonoDevelop.Projects.Gui/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Projects.Gui.mdp, Makefile.am: Directory reorganization.
+
 2007-11-22  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.Projects.Gui.Dialogs.OptionPanels/RuntimeOptionsPanel.cs: Add
diff --git a/main/src/core/MonoDevelop.Projects.Gui/Makefile.am b/main/src/core/MonoDevelop.Projects.Gui/Makefile.am
index 930a657f88..8fe9d3de6d 100644
--- a/main/src/core/MonoDevelop.Projects.Gui/Makefile.am
+++ b/main/src/core/MonoDevelop.Projects.Gui/Makefile.am
@@ -4,7 +4,7 @@ ASSEMBLY = $(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll
 REFS =  \
 	$(GNOME_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
index 5a4f494e49..dd79bad68b 100644
--- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
+++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
@@ -83,7 +83,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
diff --git a/main/src/core/MonoDevelop.Projects/ChangeLog b/main/src/core/MonoDevelop.Projects/ChangeLog
index a839580e6e..efc51315e8 100644
--- a/main/src/core/MonoDevelop.Projects/ChangeLog
+++ b/main/src/core/MonoDevelop.Projects/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Projects.mdp, Makefile.am: Directory reorganization.
+
 2007-11-21  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.Projects/CustomCommandType.cs,
diff --git a/main/src/core/MonoDevelop.Projects/Makefile.am b/main/src/core/MonoDevelop.Projects/Makefile.am
index c5eaf47352..b3d8fb4a82 100644
--- a/main/src/core/MonoDevelop.Projects/Makefile.am
+++ b/main/src/core/MonoDevelop.Projects/Makefile.am
@@ -4,8 +4,8 @@ CONFIG = MonoDevelop.Projects.dll.config
   
 
 REFS =  \
+	$(MONO_ADDINS_LIBS) \
 	$(MONODOC_LIBS) \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
 	-r:$(top_builddir)/build/bin/Mono.Cecil.dll \
 	-r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.mdp b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.mdp
index baf6cc39cc..293e76221e 100644
--- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.mdp
+++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.mdp
@@ -230,11 +230,11 @@
     <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Cecil" />
     <ProjectReference type="Project" localcopy="False" refto="Mono.Cecil.Mdb" />
+    <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
+    <ProjectReference type="Project" localcopy="False" refto="Mono.Cecil" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
diff --git a/main/src/core/MonoDevelop.Startup/ChangeLog b/main/src/core/MonoDevelop.Startup/ChangeLog
index 70d2aba6c6..eb4032d409 100644
--- a/main/src/core/MonoDevelop.Startup/ChangeLog
+++ b/main/src/core/MonoDevelop.Startup/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Startup.mdp, MonoDevelop.exe.addins, Makefile.am: Directory
+	  reorganization.
+
 2007-11-12  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.Startup/MonoDevelopMain.cs: Use SetProcessName; "killall
diff --git a/main/src/core/MonoDevelop.Startup/Makefile.am b/main/src/core/MonoDevelop.Startup/Makefile.am
index 46e8ddd20e..df7787f9ba 100644
--- a/main/src/core/MonoDevelop.Startup/Makefile.am
+++ b/main/src/core/MonoDevelop.Startup/Makefile.am
@@ -11,7 +11,7 @@ AssemblyInfo.cs
 all: $(ASSEMBLY) $(ASSEMBLY).config
 
 REFS =  \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.mdp b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.mdp
index bd5563b39d..9dcc0b171b 100644
--- a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.mdp
+++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.mdp
@@ -23,7 +23,7 @@
   <References>
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Ide" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />
diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins b/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins
index 65e8e1e3aa..9daab66b83 100644
--- a/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins
+++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.exe.addins
@@ -1,3 +1,4 @@
 <Addins>
 	<Directory include-subdirs="true">../AddIns</Directory>
+	<Directory include-subdirs="true">../../../local-config</Directory>
 </Addins>
diff --git a/main/src/tools/Tools.mds b/main/src/tools/Tools.mds
index 51967567c2..811bcf80dd 100644
--- a/main/src/tools/Tools.mds
+++ b/main/src/tools/Tools.mds
@@ -1,5 +1,5 @@
 <Combine name="Tools" fileversion="2.0">
-  <Configurations>
+  <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
       <Entry build="True" name="mdhost" configuration="Debug" />
       <Entry build="True" name="mdrun" configuration="Debug" />
diff --git a/main/src/tools/mdhost/ChangeLog b/main/src/tools/mdhost/ChangeLog
index ab77f6120b..d470a71da7 100644
--- a/main/src/tools/mdhost/ChangeLog
+++ b/main/src/tools/mdhost/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* Makefile.am, mdhost.mdp: Directory reorganization.
+
 2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* mdhost.mdp: Project file names updated by change in MD path functions.
diff --git a/main/src/tools/mdhost/Makefile.am b/main/src/tools/mdhost/Makefile.am
index 35675598f9..ddd3fc267b 100644
--- a/main/src/tools/mdhost/Makefile.am
+++ b/main/src/tools/mdhost/Makefile.am
@@ -8,7 +8,7 @@ all: $(ASSEMBLY)
 
 REFS = -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	-r:System.Runtime.Remoting \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
+	$(MONO_ADDINS_LIBS) \
 	-r:Mono.Posix
 	
 $(ASSEMBLY): $(build_sources)
diff --git a/main/src/tools/mdhost/mdhost.mdp b/main/src/tools/mdhost/mdhost.mdp
index 5ab3c71f53..89a157b122 100644
--- a/main/src/tools/mdhost/mdhost.mdp
+++ b/main/src/tools/mdhost/mdhost.mdp
@@ -21,7 +21,6 @@
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
   </References>
   <DeploymentInformation strategy="File">
     <excludeFiles />
diff --git a/main/src/tools/mdrun/ChangeLog b/main/src/tools/mdrun/ChangeLog
index 317bd99762..d1b9f9a631 100644
--- a/main/src/tools/mdrun/ChangeLog
+++ b/main/src/tools/mdrun/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* mdrun.mdp, Makefile.am: Directory reorganization.
+
 2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* mdrun.mdp: Project file names updated by change in MD path functions.
diff --git a/main/src/tools/mdrun/Makefile.am b/main/src/tools/mdrun/Makefile.am
index e96e49e5ef..e2d412a82a 100644
--- a/main/src/tools/mdrun/Makefile.am
+++ b/main/src/tools/mdrun/Makefile.am
@@ -7,8 +7,8 @@ src/mdrun.cs
 all: $(ASSEMBLY) $(ASSEMBLY).config
 
 REFS = -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.dll \
-	-r:$(top_builddir)/build/bin/Mono.Addins.Setup.dll
+	$(MONO_ADDINS_LIBS) \
+	$(MONO_ADDINS_SETUP_LIBS)
 	
 $(ASSEMBLY): $(build_sources)
 	$(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) /out:$(ASSEMBLY)
diff --git a/main/src/tools/mdrun/mdrun.mdp b/main/src/tools/mdrun/mdrun.mdp
index 1e4e1557b1..dd1284e1b8 100644
--- a/main/src/tools/mdrun/mdrun.mdp
+++ b/main/src/tools/mdrun/mdrun.mdp
@@ -19,8 +19,8 @@
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Core" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Setup" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Setup, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
   <Deployment.LinuxDeployData scriptName="mdrun" />
 </Project>
\ No newline at end of file