diff --git a/doc/ChangeLog b/doc/ChangeLog
index 862e5ffd4..91668026d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-25  Mike Kestner  <mkestner@ximian.com>
+
+	* All: move all signal args from *Sharp to base namespaces.
+
 2003-01-13  Peter Williams  <peter@newton.cx>
 
 	* en/Gtk/Application.xml: Update Init, InitCheck functions
diff --git a/doc/en/AtkSharp/ActiveDescendantChangedArgs.xml b/doc/en/Atk/ActiveDescendantChangedArgs.xml
similarity index 89%
rename from doc/en/AtkSharp/ActiveDescendantChangedArgs.xml
rename to doc/en/Atk/ActiveDescendantChangedArgs.xml
index 3b1adde89..65123768e 100644
--- a/doc/en/AtkSharp/ActiveDescendantChangedArgs.xml
+++ b/doc/en/Atk/ActiveDescendantChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ActiveDescendantChangedArgs" FullName="AtkSharp.ActiveDescendantChangedArgs">
+<Type Name="ActiveDescendantChangedArgs" FullName="Atk.ActiveDescendantChangedArgs">
   <TypeSignature Language="C#" Value="public class ActiveDescendantChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:AtkSharp.ActiveDescendantChangedArgs" /></returns>
+        <returns>a <see cref="T:Atk.ActiveDescendantChangedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/ChildrenChangedArgs.xml b/doc/en/Atk/ChildrenChangedArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/ChildrenChangedArgs.xml
rename to doc/en/Atk/ChildrenChangedArgs.xml
index 7e8bcb942..9500f984e 100644
--- a/doc/en/AtkSharp/ChildrenChangedArgs.xml
+++ b/doc/en/Atk/ChildrenChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChildrenChangedArgs" FullName="AtkSharp.ChildrenChangedArgs">
+<Type Name="ChildrenChangedArgs" FullName="Atk.ChildrenChangedArgs">
   <TypeSignature Language="C#" Value="public class ChildrenChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.ChildrenChangedArgs'</returns>
+        <returns>a <see cref="T:Atk.ChildrenChangedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/ColumnDeletedArgs.xml b/doc/en/Atk/ColumnDeletedArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/ColumnDeletedArgs.xml
rename to doc/en/Atk/ColumnDeletedArgs.xml
index 46dd47b25..cb9ebe4af 100644
--- a/doc/en/AtkSharp/ColumnDeletedArgs.xml
+++ b/doc/en/Atk/ColumnDeletedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ColumnDeletedArgs" FullName="AtkSharp.ColumnDeletedArgs">
+<Type Name="ColumnDeletedArgs" FullName="Atk.ColumnDeletedArgs">
   <TypeSignature Language="C#" Value="public class ColumnDeletedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.ColumnDeletedArgs'</returns>
+        <returns>a <see cref="T:Atk.ColumnDeletedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/ColumnInsertedArgs.xml b/doc/en/Atk/ColumnInsertedArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/ColumnInsertedArgs.xml
rename to doc/en/Atk/ColumnInsertedArgs.xml
index 989fa0c8a..c09f4b466 100644
--- a/doc/en/AtkSharp/ColumnInsertedArgs.xml
+++ b/doc/en/Atk/ColumnInsertedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ColumnInsertedArgs" FullName="AtkSharp.ColumnInsertedArgs">
+<Type Name="ColumnInsertedArgs" FullName="Atk.ColumnInsertedArgs">
   <TypeSignature Language="C#" Value="public class ColumnInsertedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.ColumnInsertedArgs'</returns>
+        <returns>a <see cref="T:Atk.ColumnInsertedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/FocusEventArgs.xml b/doc/en/Atk/FocusEventArgs.xml
similarity index 90%
rename from doc/en/AtkSharp/FocusEventArgs.xml
rename to doc/en/Atk/FocusEventArgs.xml
index 06b3d786e..50cf76547 100644
--- a/doc/en/AtkSharp/FocusEventArgs.xml
+++ b/doc/en/Atk/FocusEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FocusEventArgs" FullName="AtkSharp.FocusEventArgs">
+<Type Name="FocusEventArgs" FullName="Atk.FocusEventArgs">
   <TypeSignature Language="C#" Value="public class FocusEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.FocusEventArgs'</returns>
+        <returns>a <see cref="T:Atk.FocusEventArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/PropertyChangeArgs.xml b/doc/en/Atk/PropertyChangeArgs.xml
similarity index 90%
rename from doc/en/AtkSharp/PropertyChangeArgs.xml
rename to doc/en/Atk/PropertyChangeArgs.xml
index 2d2e92c61..85870cbf0 100644
--- a/doc/en/AtkSharp/PropertyChangeArgs.xml
+++ b/doc/en/Atk/PropertyChangeArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PropertyChangeArgs" FullName="AtkSharp.PropertyChangeArgs">
+<Type Name="PropertyChangeArgs" FullName="Atk.PropertyChangeArgs">
   <TypeSignature Language="C#" Value="public class PropertyChangeArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.PropertyChangeArgs'</returns>
+        <returns>a <see cref="T:Atk.PropertyChangeArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/RowDeletedArgs.xml b/doc/en/Atk/RowDeletedArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/RowDeletedArgs.xml
rename to doc/en/Atk/RowDeletedArgs.xml
index 76624e2ed..a390dd243 100644
--- a/doc/en/AtkSharp/RowDeletedArgs.xml
+++ b/doc/en/Atk/RowDeletedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowDeletedArgs" FullName="AtkSharp.RowDeletedArgs">
+<Type Name="RowDeletedArgs" FullName="Atk.RowDeletedArgs">
   <TypeSignature Language="C#" Value="public class RowDeletedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.RowDeletedArgs'</returns>
+        <returns>a <see cref="T:Atk.RowDeletedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/RowInsertedArgs.xml b/doc/en/Atk/RowInsertedArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/RowInsertedArgs.xml
rename to doc/en/Atk/RowInsertedArgs.xml
index 825fa560a..7fe06626b 100644
--- a/doc/en/AtkSharp/RowInsertedArgs.xml
+++ b/doc/en/Atk/RowInsertedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowInsertedArgs" FullName="AtkSharp.RowInsertedArgs">
+<Type Name="RowInsertedArgs" FullName="Atk.RowInsertedArgs">
   <TypeSignature Language="C#" Value="public class RowInsertedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.RowInsertedArgs'</returns>
+        <returns>a <see cref="T:Atk.RowInsertedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/StateChangeArgs.xml b/doc/en/Atk/StateChangeArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/StateChangeArgs.xml
rename to doc/en/Atk/StateChangeArgs.xml
index 7bf189f66..ff48436b9 100644
--- a/doc/en/AtkSharp/StateChangeArgs.xml
+++ b/doc/en/Atk/StateChangeArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="StateChangeArgs" FullName="AtkSharp.StateChangeArgs">
+<Type Name="StateChangeArgs" FullName="Atk.StateChangeArgs">
   <TypeSignature Language="C#" Value="public class StateChangeArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.StateChangeArgs'</returns>
+        <returns>a <see cref="T:Atk.StateChangeArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/TextCaretMovedArgs.xml b/doc/en/Atk/TextCaretMovedArgs.xml
similarity index 90%
rename from doc/en/AtkSharp/TextCaretMovedArgs.xml
rename to doc/en/Atk/TextCaretMovedArgs.xml
index 9bd662faa..bead10ef2 100644
--- a/doc/en/AtkSharp/TextCaretMovedArgs.xml
+++ b/doc/en/Atk/TextCaretMovedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextCaretMovedArgs" FullName="AtkSharp.TextCaretMovedArgs">
+<Type Name="TextCaretMovedArgs" FullName="Atk.TextCaretMovedArgs">
   <TypeSignature Language="C#" Value="public class TextCaretMovedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.TextCaretMovedArgs'</returns>
+        <returns>a <see cref="T:Atk.TextCaretMovedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/AtkSharp/TextChangedArgs.xml b/doc/en/Atk/TextChangedArgs.xml
similarity index 92%
rename from doc/en/AtkSharp/TextChangedArgs.xml
rename to doc/en/Atk/TextChangedArgs.xml
index 895c760db..f383ac0fc 100644
--- a/doc/en/AtkSharp/TextChangedArgs.xml
+++ b/doc/en/Atk/TextChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextChangedArgs" FullName="AtkSharp.TextChangedArgs">
+<Type Name="TextChangedArgs" FullName="Atk.TextChangedArgs">
   <TypeSignature Language="C#" Value="public class TextChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'AtkSharp.TextChangedArgs'</returns>
+        <returns>a <see cref="T:Atk.TextChangedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdaSharp/ErrorArgs.xml b/doc/en/Gda/ErrorArgs.xml
similarity index 92%
rename from doc/en/GdaSharp/ErrorArgs.xml
rename to doc/en/Gda/ErrorArgs.xml
index 0ac2ad6ee..16a16ed00 100644
--- a/doc/en/GdaSharp/ErrorArgs.xml
+++ b/doc/en/Gda/ErrorArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ErrorArgs" FullName="GdaSharp.ErrorArgs">
+<Type Name="ErrorArgs" FullName="Gda.ErrorArgs">
   <TypeSignature Language="C#" Value="public class ErrorArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GdaSharp.ErrorArgs" /></returns>
+        <returns>a <see cref="T:Gda.ErrorArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdaSharp/EventNotificationArgs.xml b/doc/en/Gda/EventNotificationArgs.xml
similarity index 93%
rename from doc/en/GdaSharp/EventNotificationArgs.xml
rename to doc/en/Gda/EventNotificationArgs.xml
index 140c27a43..9dc400b07 100644
--- a/doc/en/GdaSharp/EventNotificationArgs.xml
+++ b/doc/en/Gda/EventNotificationArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="EventNotificationArgs" FullName="GdaSharp.EventNotificationArgs">
+<Type Name="EventNotificationArgs" FullName="Gda.EventNotificationArgs">
   <TypeSignature Language="C#" Value="public class EventNotificationArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GdaSharp.EventNotificationArgs" /></returns>
+        <returns>a <see cref="T:Gda.EventNotificationArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdaSharp/RowInsertedEventArgs.xml b/doc/en/Gda/RowInsertedEventArgs.xml
similarity index 90%
rename from doc/en/GdaSharp/RowInsertedEventArgs.xml
rename to doc/en/Gda/RowInsertedEventArgs.xml
index 9b1563562..094902628 100644
--- a/doc/en/GdaSharp/RowInsertedEventArgs.xml
+++ b/doc/en/Gda/RowInsertedEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowInsertedEventArgs" FullName="GdaSharp.RowInsertedEventArgs">
+<Type Name="RowInsertedEventArgs" FullName="Gda.RowInsertedEventArgs">
   <TypeSignature Language="C#" Value="public class RowInsertedEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GdaSharp.RowInsertedEventArgs" /></returns>
+        <returns>a <see cref="T:Gda.RowInsertedEventArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdaSharp/RowRemovedEventArgs.xml b/doc/en/Gda/RowRemovedEventArgs.xml
similarity index 90%
rename from doc/en/GdaSharp/RowRemovedEventArgs.xml
rename to doc/en/Gda/RowRemovedEventArgs.xml
index 984e82c5f..2316869d7 100644
--- a/doc/en/GdaSharp/RowRemovedEventArgs.xml
+++ b/doc/en/Gda/RowRemovedEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowRemovedEventArgs" FullName="GdaSharp.RowRemovedEventArgs">
+<Type Name="RowRemovedEventArgs" FullName="Gda.RowRemovedEventArgs">
   <TypeSignature Language="C#" Value="public class RowRemovedEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GdaSharp.RowRemovedEventArgs" /></returns>
+        <returns>a <see cref="T:Gda.RowRemovedEventArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdaSharp/RowUpdatedEventArgs.xml b/doc/en/Gda/RowUpdatedEventArgs.xml
similarity index 90%
rename from doc/en/GdaSharp/RowUpdatedEventArgs.xml
rename to doc/en/Gda/RowUpdatedEventArgs.xml
index 3c4174e6e..80e9b7dab 100644
--- a/doc/en/GdaSharp/RowUpdatedEventArgs.xml
+++ b/doc/en/Gda/RowUpdatedEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowUpdatedEventArgs" FullName="GdaSharp.RowUpdatedEventArgs">
+<Type Name="RowUpdatedEventArgs" FullName="Gda.RowUpdatedEventArgs">
   <TypeSignature Language="C#" Value="public class RowUpdatedEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GdaSharp.RowUpdatedEventArgs" /></returns>
+        <returns>a <see cref="T:Gda.RowUpdatedEventArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdaSharp/WarningArgs.xml b/doc/en/Gda/WarningArgs.xml
similarity index 91%
rename from doc/en/GdaSharp/WarningArgs.xml
rename to doc/en/Gda/WarningArgs.xml
index 758b13251..92a36e260 100644
--- a/doc/en/GdaSharp/WarningArgs.xml
+++ b/doc/en/Gda/WarningArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="WarningArgs" FullName="GdaSharp.WarningArgs">
+<Type Name="WarningArgs" FullName="Gda.WarningArgs">
   <TypeSignature Language="C#" Value="public class WarningArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GdaSharp.WarningArgs" /></returns>
+        <returns>a <see cref="T:Gda.WarningArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdkSharp/AreaUpdatedArgs.xml b/doc/en/Gdk/AreaUpdatedArgs.xml
similarity index 94%
rename from doc/en/GdkSharp/AreaUpdatedArgs.xml
rename to doc/en/Gdk/AreaUpdatedArgs.xml
index 0e0260e96..2d73c402e 100644
--- a/doc/en/GdkSharp/AreaUpdatedArgs.xml
+++ b/doc/en/Gdk/AreaUpdatedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="AreaUpdatedArgs" FullName="GdkSharp.AreaUpdatedArgs">
+<Type Name="AreaUpdatedArgs" FullName="Gdk.AreaUpdatedArgs">
   <TypeSignature Language="C#" Value="public class AreaUpdatedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gdk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GdkSharp.AreaUpdatedArgs'</returns>
+        <returns>To be added: an object of type 'Gdk.AreaUpdatedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GdkSharp/ClosedArgs.xml b/doc/en/Gdk/ClosedArgs.xml
similarity index 96%
rename from doc/en/GdkSharp/ClosedArgs.xml
rename to doc/en/Gdk/ClosedArgs.xml
index e8f83a4be..912b009ae 100644
--- a/doc/en/GdkSharp/ClosedArgs.xml
+++ b/doc/en/Gdk/ClosedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ClosedArgs" FullName="GdkSharp.ClosedArgs">
+<Type Name="ClosedArgs" FullName="Gdk.ClosedArgs">
   <TypeSignature Language="C#" Value="public class ClosedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gdk-sharp</AssemblyName>
diff --git a/doc/en/GdkSharp/DisplayOpenedArgs.xml b/doc/en/Gdk/DisplayOpenedArgs.xml
similarity index 95%
rename from doc/en/GdkSharp/DisplayOpenedArgs.xml
rename to doc/en/Gdk/DisplayOpenedArgs.xml
index 17f9bfdf9..3c6bf85cc 100644
--- a/doc/en/GdkSharp/DisplayOpenedArgs.xml
+++ b/doc/en/Gdk/DisplayOpenedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DisplayOpenedArgs" FullName="GdkSharp.DisplayOpenedArgs">
+<Type Name="DisplayOpenedArgs" FullName="Gdk.DisplayOpenedArgs">
   <TypeSignature Language="C#" Value="public class DisplayOpenedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gdk-sharp</AssemblyName>
diff --git a/doc/en/GdkSharp/SizePreparedArgs.xml b/doc/en/Gdk/SizePreparedArgs.xml
similarity index 96%
rename from doc/en/GdkSharp/SizePreparedArgs.xml
rename to doc/en/Gdk/SizePreparedArgs.xml
index 3a1aa5ad5..11626a903 100644
--- a/doc/en/GdkSharp/SizePreparedArgs.xml
+++ b/doc/en/Gdk/SizePreparedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SizePreparedArgs" FullName="GdkSharp.SizePreparedArgs">
+<Type Name="SizePreparedArgs" FullName="Gdk.SizePreparedArgs">
   <TypeSignature Language="C#" Value="public class SizePreparedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gdk-sharp</AssemblyName>
diff --git a/doc/en/GnomeSharp/BackClickedArgs.xml b/doc/en/Gnome/BackClickedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/BackClickedArgs.xml
rename to doc/en/Gnome/BackClickedArgs.xml
index 1750bbc1c..e181e67e0 100644
--- a/doc/en/GnomeSharp/BackClickedArgs.xml
+++ b/doc/en/Gnome/BackClickedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="BackClickedArgs" FullName="GnomeSharp.BackClickedArgs">
+<Type Name="BackClickedArgs" FullName="Gnome.BackClickedArgs">
   <TypeSignature Language="C#" Value="public class BackClickedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.BackClickedArgs'</returns>
+        <returns>a <see cref="T:Gnome.BackClickedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/CancelClickedArgs.xml b/doc/en/Gnome/CancelClickedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/CancelClickedArgs.xml
rename to doc/en/Gnome/CancelClickedArgs.xml
index c17eaae3a..a64deb4e4 100644
--- a/doc/en/GnomeSharp/CancelClickedArgs.xml
+++ b/doc/en/Gnome/CancelClickedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CancelClickedArgs" FullName="GnomeSharp.CancelClickedArgs">
+<Type Name="CancelClickedArgs" FullName="Gnome.CancelClickedArgs">
   <TypeSignature Language="C#" Value="public class CancelClickedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.CancelClickedArgs'</returns>
+        <returns>a <see cref="T:Gnome.CancelClickedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/CanvasEventArgs.xml b/doc/en/Gnome/CanvasEventArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/CanvasEventArgs.xml
rename to doc/en/Gnome/CanvasEventArgs.xml
index 96f7b142d..1319e2379 100644
--- a/doc/en/GnomeSharp/CanvasEventArgs.xml
+++ b/doc/en/Gnome/CanvasEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CanvasEventArgs" FullName="GnomeSharp.CanvasEventArgs">
+<Type Name="CanvasEventArgs" FullName="Gnome.CanvasEventArgs">
   <TypeSignature Language="C#" Value="public class CanvasEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.CanvasEventArgs'</returns>
+        <returns>a <see cref="T:Gnome.CanvasEventArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/ColorSetArgs.xml b/doc/en/Gnome/ColorSetArgs.xml
similarity index 94%
rename from doc/en/GnomeSharp/ColorSetArgs.xml
rename to doc/en/Gnome/ColorSetArgs.xml
index ee5257c97..484c390f4 100644
--- a/doc/en/GnomeSharp/ColorSetArgs.xml
+++ b/doc/en/Gnome/ColorSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ColorSetArgs" FullName="GnomeSharp.ColorSetArgs">
+<Type Name="ColorSetArgs" FullName="Gnome.ColorSetArgs">
   <TypeSignature Language="C#" Value="public class ColorSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.ColorSetArgs'</returns>
+        <returns>a <see cref="T:Gnome.ColorSetArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/ConnectedArgs.xml b/doc/en/Gnome/ConnectedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/ConnectedArgs.xml
rename to doc/en/Gnome/ConnectedArgs.xml
index 976a7ee2d..868581644 100644
--- a/doc/en/GnomeSharp/ConnectedArgs.xml
+++ b/doc/en/Gnome/ConnectedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ConnectedArgs" FullName="GnomeSharp.ConnectedArgs">
+<Type Name="ConnectedArgs" FullName="Gnome.ConnectedArgs">
   <TypeSignature Language="C#" Value="public class ConnectedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.ConnectedArgs'</returns>
+        <returns>a <see cref="T:Gnome.ConnectedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/CopiesSetArgs.xml b/doc/en/Gnome/CopiesSetArgs.xml
similarity index 93%
rename from doc/en/GnomeSharp/CopiesSetArgs.xml
rename to doc/en/Gnome/CopiesSetArgs.xml
index 4dc69247f..e08f839c4 100644
--- a/doc/en/GnomeSharp/CopiesSetArgs.xml
+++ b/doc/en/Gnome/CopiesSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CopiesSetArgs" FullName="GnomeSharp.CopiesSetArgs">
+<Type Name="CopiesSetArgs" FullName="Gnome.CopiesSetArgs">
   <TypeSignature Language="C#" Value="public class CopiesSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeSharp.CopiesSetArgs" /></returns>
+        <returns>a <see cref="T:Gnome.CopiesSetArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/DrawBackgroundArgs.xml b/doc/en/Gnome/DrawBackgroundArgs.xml
similarity index 94%
rename from doc/en/GnomeSharp/DrawBackgroundArgs.xml
rename to doc/en/Gnome/DrawBackgroundArgs.xml
index 0f71d0638..9abd93c5a 100644
--- a/doc/en/GnomeSharp/DrawBackgroundArgs.xml
+++ b/doc/en/Gnome/DrawBackgroundArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DrawBackgroundArgs" FullName="GnomeSharp.DrawBackgroundArgs">
+<Type Name="DrawBackgroundArgs" FullName="Gnome.DrawBackgroundArgs">
   <TypeSignature Language="C#" Value="public class DrawBackgroundArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.DrawBackgroundArgs'</returns>
+        <returns>a <see cref="T:Gnome.DrawBackgroundArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/FinishClickedArgs.xml b/doc/en/Gnome/FinishClickedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/FinishClickedArgs.xml
rename to doc/en/Gnome/FinishClickedArgs.xml
index 19459ceb3..3a25b7040 100644
--- a/doc/en/GnomeSharp/FinishClickedArgs.xml
+++ b/doc/en/Gnome/FinishClickedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FinishClickedArgs" FullName="GnomeSharp.FinishClickedArgs">
+<Type Name="FinishClickedArgs" FullName="Gnome.FinishClickedArgs">
   <TypeSignature Language="C#" Value="public class FinishClickedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.FinishClickedArgs'</returns>
+        <returns>a <see cref="T:Gnome.FinishClickedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/FontSetArgs.xml b/doc/en/Gnome/FontSetArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/FontSetArgs.xml
rename to doc/en/Gnome/FontSetArgs.xml
index ef50bd3ad..e5ec1a23a 100644
--- a/doc/en/GnomeSharp/FontSetArgs.xml
+++ b/doc/en/Gnome/FontSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FontSetArgs" FullName="GnomeSharp.FontSetArgs">
+<Type Name="FontSetArgs" FullName="Gnome.FontSetArgs">
   <TypeSignature Language="C#" Value="public class FontSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.FontSetArgs'</returns>
+        <returns>a <see cref="T:Gnome.FontSetArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/IconFocusedArgs.xml b/doc/en/Gnome/IconFocusedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/IconFocusedArgs.xml
rename to doc/en/Gnome/IconFocusedArgs.xml
index 87f6efb48..b21d43905 100644
--- a/doc/en/GnomeSharp/IconFocusedArgs.xml
+++ b/doc/en/Gnome/IconFocusedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="IconFocusedArgs" FullName="GnomeSharp.IconFocusedArgs">
+<Type Name="IconFocusedArgs" FullName="Gnome.IconFocusedArgs">
   <TypeSignature Language="C#" Value="public class IconFocusedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.IconFocusedArgs'</returns>
+        <returns>a <see cref="T:Gnome.IconFocusedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/IconSelectedArgs.xml b/doc/en/Gnome/IconSelectedArgs.xml
similarity index 92%
rename from doc/en/GnomeSharp/IconSelectedArgs.xml
rename to doc/en/Gnome/IconSelectedArgs.xml
index 5951a2921..e519e16a3 100644
--- a/doc/en/GnomeSharp/IconSelectedArgs.xml
+++ b/doc/en/Gnome/IconSelectedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="IconSelectedArgs" FullName="GnomeSharp.IconSelectedArgs">
+<Type Name="IconSelectedArgs" FullName="Gnome.IconSelectedArgs">
   <TypeSignature Language="C#" Value="public class IconSelectedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.IconSelectedArgs'</returns>
+        <returns>a <see cref="T:Gnome.IconSelectedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/IconUnselectedArgs.xml b/doc/en/Gnome/IconUnselectedArgs.xml
similarity index 91%
rename from doc/en/GnomeSharp/IconUnselectedArgs.xml
rename to doc/en/Gnome/IconUnselectedArgs.xml
index 4460df509..dc4716caf 100644
--- a/doc/en/GnomeSharp/IconUnselectedArgs.xml
+++ b/doc/en/Gnome/IconUnselectedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="IconUnselectedArgs" FullName="GnomeSharp.IconUnselectedArgs">
+<Type Name="IconUnselectedArgs" FullName="Gnome.IconUnselectedArgs">
   <TypeSignature Language="C#" Value="public class IconUnselectedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.IconUnselectedArgs'</returns>
+        <returns>a <see cref="T:Gnome.IconUnselectedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/MoveCursorArgs.xml b/doc/en/Gnome/MoveCursorArgs.xml
similarity index 92%
rename from doc/en/GnomeSharp/MoveCursorArgs.xml
rename to doc/en/Gnome/MoveCursorArgs.xml
index 3c52a7bbf..767875e1d 100644
--- a/doc/en/GnomeSharp/MoveCursorArgs.xml
+++ b/doc/en/Gnome/MoveCursorArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveCursorArgs" FullName="GnomeSharp.MoveCursorArgs">
+<Type Name="MoveCursorArgs" FullName="Gnome.MoveCursorArgs">
   <TypeSignature Language="C#" Value="public class MoveCursorArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.MoveCursorArgs'</returns>
+        <returns>a <see cref="T:Gnome.MoveCursorArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/NextClickedArgs.xml b/doc/en/Gnome/NextClickedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/NextClickedArgs.xml
rename to doc/en/Gnome/NextClickedArgs.xml
index 75c23c54d..d4581c6a1 100644
--- a/doc/en/GnomeSharp/NextClickedArgs.xml
+++ b/doc/en/Gnome/NextClickedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="NextClickedArgs" FullName="GnomeSharp.NextClickedArgs">
+<Type Name="NextClickedArgs" FullName="Gnome.NextClickedArgs">
   <TypeSignature Language="C#" Value="public class NextClickedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.NextClickedArgs'</returns>
+        <returns>a <see cref="T:Gnome.NextClickedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/PreparedArgs.xml b/doc/en/Gnome/PreparedArgs.xml
similarity index 90%
rename from doc/en/GnomeSharp/PreparedArgs.xml
rename to doc/en/Gnome/PreparedArgs.xml
index a02fa6185..fba9bf53b 100644
--- a/doc/en/GnomeSharp/PreparedArgs.xml
+++ b/doc/en/Gnome/PreparedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PreparedArgs" FullName="GnomeSharp.PreparedArgs">
+<Type Name="PreparedArgs" FullName="Gnome.PreparedArgs">
   <TypeSignature Language="C#" Value="public class PreparedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.PreparedArgs'</returns>
+        <returns>a <see cref="T:Gnome.PreparedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/RenderBackgroundArgs.xml b/doc/en/Gnome/RenderBackgroundArgs.xml
similarity index 89%
rename from doc/en/GnomeSharp/RenderBackgroundArgs.xml
rename to doc/en/Gnome/RenderBackgroundArgs.xml
index f403223c3..c13d333b6 100644
--- a/doc/en/GnomeSharp/RenderBackgroundArgs.xml
+++ b/doc/en/Gnome/RenderBackgroundArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RenderBackgroundArgs" FullName="GnomeSharp.RenderBackgroundArgs">
+<Type Name="RenderBackgroundArgs" FullName="Gnome.RenderBackgroundArgs">
   <TypeSignature Language="C#" Value="public class RenderBackgroundArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.RenderBackgroundArgs'</returns>
+        <returns>a <see cref="T:Gnome.RenderBackgroundArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/SaveYourselfArgs.xml b/doc/en/Gnome/SaveYourselfArgs.xml
similarity index 95%
rename from doc/en/GnomeSharp/SaveYourselfArgs.xml
rename to doc/en/Gnome/SaveYourselfArgs.xml
index c42187412..ed16c89ae 100644
--- a/doc/en/GnomeSharp/SaveYourselfArgs.xml
+++ b/doc/en/Gnome/SaveYourselfArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SaveYourselfArgs" FullName="GnomeSharp.SaveYourselfArgs">
+<Type Name="SaveYourselfArgs" FullName="Gnome.SaveYourselfArgs">
   <TypeSignature Language="C#" Value="public class SaveYourselfArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.SaveYourselfArgs'</returns>
+        <returns>a <see cref="T:Gnome.SaveYourselfArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/TextChangedArgs.xml b/doc/en/Gnome/TextChangedArgs.xml
similarity index 86%
rename from doc/en/GnomeSharp/TextChangedArgs.xml
rename to doc/en/Gnome/TextChangedArgs.xml
index 761723450..e08eb1e22 100644
--- a/doc/en/GnomeSharp/TextChangedArgs.xml
+++ b/doc/en/Gnome/TextChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextChangedArgs" FullName="GnomeSharp.TextChangedArgs">
+<Type Name="TextChangedArgs" FullName="Gnome.TextChangedArgs">
   <TypeSignature Language="C#" Value="public class TextChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GnomeSharp.TextChangedArgs'</returns>
+        <returns>a <see cref="T:Gnome.TextChangedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeDbSharp/CreatePopupMenuArgs.xml b/doc/en/GnomeDb/CreatePopupMenuArgs.xml
similarity index 90%
rename from doc/en/GnomeDbSharp/CreatePopupMenuArgs.xml
rename to doc/en/GnomeDb/CreatePopupMenuArgs.xml
index dc17652ac..a2b134f88 100644
--- a/doc/en/GnomeDbSharp/CreatePopupMenuArgs.xml
+++ b/doc/en/GnomeDb/CreatePopupMenuArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CreatePopupMenuArgs" FullName="GnomeDbSharp.CreatePopupMenuArgs">
+<Type Name="CreatePopupMenuArgs" FullName="GnomeDb.CreatePopupMenuArgs">
   <TypeSignature Language="C#" Value="public class CreatePopupMenuArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnomedb-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeDbSharp.CreatePopupMenuArgs" /></returns>
+        <returns>a <see cref="T:GnomeDb.CreatePopupMenuArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeDbSharp/DoubleClickedArgs.xml b/doc/en/GnomeDb/DoubleClickedArgs.xml
similarity index 90%
rename from doc/en/GnomeDbSharp/DoubleClickedArgs.xml
rename to doc/en/GnomeDb/DoubleClickedArgs.xml
index 8a1f99fb2..9503c555e 100644
--- a/doc/en/GnomeDbSharp/DoubleClickedArgs.xml
+++ b/doc/en/GnomeDb/DoubleClickedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DoubleClickedArgs" FullName="GnomeDbSharp.DoubleClickedArgs">
+<Type Name="DoubleClickedArgs" FullName="GnomeDb.DoubleClickedArgs">
   <TypeSignature Language="C#" Value="public class DoubleClickedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnomedb-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeDbSharp.DoubleClickedArgs" /></returns>
+        <returns>a <see cref="T:GnomeDb.DoubleClickedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeDbSharp/FinishedArgs.xml b/doc/en/GnomeDb/FinishedArgs.xml
similarity index 91%
rename from doc/en/GnomeDbSharp/FinishedArgs.xml
rename to doc/en/GnomeDb/FinishedArgs.xml
index 67b946f4d..47fd6fde5 100644
--- a/doc/en/GnomeDbSharp/FinishedArgs.xml
+++ b/doc/en/GnomeDb/FinishedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FinishedArgs" FullName="GnomeDbSharp.FinishedArgs">
+<Type Name="FinishedArgs" FullName="GnomeDb.FinishedArgs">
   <TypeSignature Language="C#" Value="public class FinishedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnomedb-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeDbSharp.FinishedArgs" /></returns>
+        <returns>a <see cref="T:GnomeDb.FinishedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeDbSharp/ProgressMessageArgs.xml b/doc/en/GnomeDb/ProgressMessageArgs.xml
similarity index 90%
rename from doc/en/GnomeDbSharp/ProgressMessageArgs.xml
rename to doc/en/GnomeDb/ProgressMessageArgs.xml
index 3421db98d..6c59f5296 100644
--- a/doc/en/GnomeDbSharp/ProgressMessageArgs.xml
+++ b/doc/en/GnomeDb/ProgressMessageArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ProgressMessageArgs" FullName="GnomeDbSharp.ProgressMessageArgs">
+<Type Name="ProgressMessageArgs" FullName="GnomeDb.ProgressMessageArgs">
   <TypeSignature Language="C#" Value="public class ProgressMessageArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnomedb-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeDbSharp.ProgressMessageArgs" /></returns>
+        <returns>a <see cref="T:GnomeDb.ProgressMessageArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeDbSharp/RowSelectedArgs.xml b/doc/en/GnomeDb/RowSelectedArgs.xml
similarity index 90%
rename from doc/en/GnomeDbSharp/RowSelectedArgs.xml
rename to doc/en/GnomeDb/RowSelectedArgs.xml
index 4af9af249..de5001df5 100644
--- a/doc/en/GnomeDbSharp/RowSelectedArgs.xml
+++ b/doc/en/GnomeDb/RowSelectedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowSelectedArgs" FullName="GnomeDbSharp.RowSelectedArgs">
+<Type Name="RowSelectedArgs" FullName="GnomeDb.RowSelectedArgs">
   <TypeSignature Language="C#" Value="public class RowSelectedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnomedb-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeDbSharp.RowSelectedArgs" /></returns>
+        <returns>a <see cref="T:GnomeDb.RowSelectedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeDbSharp/SelectionClearedArgs.xml b/doc/en/GnomeDb/SelectionClearedArgs.xml
similarity index 90%
rename from doc/en/GnomeDbSharp/SelectionClearedArgs.xml
rename to doc/en/GnomeDb/SelectionClearedArgs.xml
index ddc0ab355..c7b7f2107 100644
--- a/doc/en/GnomeDbSharp/SelectionClearedArgs.xml
+++ b/doc/en/GnomeDb/SelectionClearedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectionClearedArgs" FullName="GnomeDbSharp.SelectionClearedArgs">
+<Type Name="SelectionClearedArgs" FullName="GnomeDb.SelectionClearedArgs">
   <TypeSignature Language="C#" Value="public class SelectionClearedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnomedb-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:GnomeDbSharp.SelectionClearedArgs" /></returns>
+        <returns>a <see cref="T:GnomeDb.SelectionClearedArgs" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/AccelChangedArgs.xml b/doc/en/Gtk/AccelChangedArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/AccelChangedArgs.xml
rename to doc/en/Gtk/AccelChangedArgs.xml
index a309183b4..a84983831 100644
--- a/doc/en/GtkSharp/AccelChangedArgs.xml
+++ b/doc/en/Gtk/AccelChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="AccelChangedArgs" FullName="GtkSharp.AccelChangedArgs">
+<Type Name="AccelChangedArgs" FullName="Gtk.AccelChangedArgs">
   <TypeSignature Language="C#" Value="public class AccelChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.AccelChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.AccelChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/AcceptPositionArgs.xml b/doc/en/Gtk/AcceptPositionArgs.xml
similarity index 86%
rename from doc/en/GtkSharp/AcceptPositionArgs.xml
rename to doc/en/Gtk/AcceptPositionArgs.xml
index 7ebb013ca..a64fc0e2f 100644
--- a/doc/en/GtkSharp/AcceptPositionArgs.xml
+++ b/doc/en/Gtk/AcceptPositionArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="AcceptPositionArgs" FullName="GtkSharp.AcceptPositionArgs">
+<Type Name="AcceptPositionArgs" FullName="Gtk.AcceptPositionArgs">
   <TypeSignature Language="C#" Value="public class AcceptPositionArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.AcceptPositionArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.AcceptPositionArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ActivateCurrentArgs.xml b/doc/en/Gtk/ActivateCurrentArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ActivateCurrentArgs.xml
rename to doc/en/Gtk/ActivateCurrentArgs.xml
index 917b9b2d0..658dc3181 100644
--- a/doc/en/GtkSharp/ActivateCurrentArgs.xml
+++ b/doc/en/Gtk/ActivateCurrentArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ActivateCurrentArgs" FullName="GtkSharp.ActivateCurrentArgs">
+<Type Name="ActivateCurrentArgs" FullName="Gtk.ActivateCurrentArgs">
   <TypeSignature Language="C#" Value="public class ActivateCurrentArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ActivateCurrentArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ActivateCurrentArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/AddedArgs.xml b/doc/en/Gtk/AddedArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/AddedArgs.xml
rename to doc/en/Gtk/AddedArgs.xml
index 95bdff2d5..6bca4d794 100644
--- a/doc/en/GtkSharp/AddedArgs.xml
+++ b/doc/en/Gtk/AddedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="AddedArgs" FullName="GtkSharp.AddedArgs">
+<Type Name="AddedArgs" FullName="Gtk.AddedArgs">
   <TypeSignature Language="C#" Value="public class AddedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.AddedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.AddedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/AdjustBoundsArgs.xml b/doc/en/Gtk/AdjustBoundsArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/AdjustBoundsArgs.xml
rename to doc/en/Gtk/AdjustBoundsArgs.xml
index 09d0a7ddc..087a0e0e7 100644
--- a/doc/en/GtkSharp/AdjustBoundsArgs.xml
+++ b/doc/en/Gtk/AdjustBoundsArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="AdjustBoundsArgs" FullName="GtkSharp.AdjustBoundsArgs">
+<Type Name="AdjustBoundsArgs" FullName="Gtk.AdjustBoundsArgs">
   <TypeSignature Language="C#" Value="public class AdjustBoundsArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.AdjustBoundsArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.AdjustBoundsArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/BoundsArgs.xml b/doc/en/Gtk/BoundsArgs.xml
similarity index 95%
rename from doc/en/GtkSharp/BoundsArgs.xml
rename to doc/en/Gtk/BoundsArgs.xml
index de7ff7d08..bd7a7bdd3 100644
--- a/doc/en/GtkSharp/BoundsArgs.xml
+++ b/doc/en/Gtk/BoundsArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="BoundsArgs" FullName="GtkSharp.BoundsArgs">
+<Type Name="BoundsArgs" FullName="Gtk.BoundsArgs">
   <TypeSignature Language="C#" Value="public class BoundsArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.BoundsArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.BoundsArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ButtonPressEventArgs.xml b/doc/en/Gtk/ButtonPressEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ButtonPressEventArgs.xml
rename to doc/en/Gtk/ButtonPressEventArgs.xml
index 075de5e96..bcb4d5fc7 100644
--- a/doc/en/GtkSharp/ButtonPressEventArgs.xml
+++ b/doc/en/Gtk/ButtonPressEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ButtonPressEventArgs" FullName="GtkSharp.ButtonPressEventArgs">
+<Type Name="ButtonPressEventArgs" FullName="Gtk.ButtonPressEventArgs">
   <TypeSignature Language="C#" Value="public class ButtonPressEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ButtonPressEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ButtonPressEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ButtonReleaseEventArgs.xml b/doc/en/Gtk/ButtonReleaseEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ButtonReleaseEventArgs.xml
rename to doc/en/Gtk/ButtonReleaseEventArgs.xml
index a2a723626..a8ab5732c 100644
--- a/doc/en/GtkSharp/ButtonReleaseEventArgs.xml
+++ b/doc/en/Gtk/ButtonReleaseEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ButtonReleaseEventArgs" FullName="GtkSharp.ButtonReleaseEventArgs">
+<Type Name="ButtonReleaseEventArgs" FullName="Gtk.ButtonReleaseEventArgs">
   <TypeSignature Language="C#" Value="public class ButtonReleaseEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ButtonReleaseEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ButtonReleaseEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CancelPositionArgs.xml b/doc/en/Gtk/CancelPositionArgs.xml
similarity index 86%
rename from doc/en/GtkSharp/CancelPositionArgs.xml
rename to doc/en/Gtk/CancelPositionArgs.xml
index cd7023460..147d08f74 100644
--- a/doc/en/GtkSharp/CancelPositionArgs.xml
+++ b/doc/en/Gtk/CancelPositionArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CancelPositionArgs" FullName="GtkSharp.CancelPositionArgs">
+<Type Name="CancelPositionArgs" FullName="Gtk.CancelPositionArgs">
   <TypeSignature Language="C#" Value="public class CancelPositionArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CancelPositionArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CancelPositionArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ChangeCurrentPageArgs.xml b/doc/en/Gtk/ChangeCurrentPageArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ChangeCurrentPageArgs.xml
rename to doc/en/Gtk/ChangeCurrentPageArgs.xml
index 1051d2362..a711efac1 100644
--- a/doc/en/GtkSharp/ChangeCurrentPageArgs.xml
+++ b/doc/en/Gtk/ChangeCurrentPageArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChangeCurrentPageArgs" FullName="GtkSharp.ChangeCurrentPageArgs">
+<Type Name="ChangeCurrentPageArgs" FullName="Gtk.ChangeCurrentPageArgs">
   <TypeSignature Language="C#" Value="public class ChangeCurrentPageArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ChangeCurrentPageArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ChangeCurrentPageArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ChangeValueArgs.xml b/doc/en/Gtk/ChangeValueArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ChangeValueArgs.xml
rename to doc/en/Gtk/ChangeValueArgs.xml
index 6adbc9bcb..1d3fb7177 100644
--- a/doc/en/GtkSharp/ChangeValueArgs.xml
+++ b/doc/en/Gtk/ChangeValueArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChangeValueArgs" FullName="GtkSharp.ChangeValueArgs">
+<Type Name="ChangeValueArgs" FullName="Gtk.ChangeValueArgs">
   <TypeSignature Language="C#" Value="public class ChangeValueArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ChangeValueArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ChangeValueArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ChildAnchorInsertedArgs.xml b/doc/en/Gtk/ChildAnchorInsertedArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/ChildAnchorInsertedArgs.xml
rename to doc/en/Gtk/ChildAnchorInsertedArgs.xml
index de37d2d2b..8070c62c6 100644
--- a/doc/en/GtkSharp/ChildAnchorInsertedArgs.xml
+++ b/doc/en/Gtk/ChildAnchorInsertedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChildAnchorInsertedArgs" FullName="GtkSharp.ChildAnchorInsertedArgs">
+<Type Name="ChildAnchorInsertedArgs" FullName="Gtk.ChildAnchorInsertedArgs">
   <TypeSignature Language="C#" Value="public class ChildAnchorInsertedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ChildAnchorInsertedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ChildAnchorInsertedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ChildAttachedArgs.xml b/doc/en/Gtk/ChildAttachedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ChildAttachedArgs.xml
rename to doc/en/Gtk/ChildAttachedArgs.xml
index c8bee52fa..fdd345a8c 100644
--- a/doc/en/GtkSharp/ChildAttachedArgs.xml
+++ b/doc/en/Gtk/ChildAttachedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChildAttachedArgs" FullName="GtkSharp.ChildAttachedArgs">
+<Type Name="ChildAttachedArgs" FullName="Gtk.ChildAttachedArgs">
   <TypeSignature Language="C#" Value="public class ChildAttachedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ChildAttachedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ChildAttachedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ChildDetachedArgs.xml b/doc/en/Gtk/ChildDetachedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ChildDetachedArgs.xml
rename to doc/en/Gtk/ChildDetachedArgs.xml
index 182170770..3f6e84b9c 100644
--- a/doc/en/GtkSharp/ChildDetachedArgs.xml
+++ b/doc/en/Gtk/ChildDetachedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChildDetachedArgs" FullName="GtkSharp.ChildDetachedArgs">
+<Type Name="ChildDetachedArgs" FullName="Gtk.ChildDetachedArgs">
   <TypeSignature Language="C#" Value="public class ChildDetachedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ChildDetachedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ChildDetachedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ChildNotifiedArgs.xml b/doc/en/Gtk/ChildNotifiedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ChildNotifiedArgs.xml
rename to doc/en/Gtk/ChildNotifiedArgs.xml
index 0df79973b..375e5ce41 100644
--- a/doc/en/GtkSharp/ChildNotifiedArgs.xml
+++ b/doc/en/Gtk/ChildNotifiedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ChildNotifiedArgs" FullName="GtkSharp.ChildNotifiedArgs">
+<Type Name="ChildNotifiedArgs" FullName="Gtk.ChildNotifiedArgs">
   <TypeSignature Language="C#" Value="public class ChildNotifiedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ChildNotifiedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ChildNotifiedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ClientEventArgs.xml b/doc/en/Gtk/ClientEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ClientEventArgs.xml
rename to doc/en/Gtk/ClientEventArgs.xml
index ac9056b45..fd82221bf 100644
--- a/doc/en/GtkSharp/ClientEventArgs.xml
+++ b/doc/en/Gtk/ClientEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ClientEventArgs" FullName="GtkSharp.ClientEventArgs">
+<Type Name="ClientEventArgs" FullName="Gtk.ClientEventArgs">
   <TypeSignature Language="C#" Value="public class ClientEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ClientEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ClientEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CommitArgs.xml b/doc/en/Gtk/CommitArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/CommitArgs.xml
rename to doc/en/Gtk/CommitArgs.xml
index b999f5c25..415aaf30a 100644
--- a/doc/en/GtkSharp/CommitArgs.xml
+++ b/doc/en/Gtk/CommitArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CommitArgs" FullName="GtkSharp.CommitArgs">
+<Type Name="CommitArgs" FullName="Gtk.CommitArgs">
   <TypeSignature Language="C#" Value="public class CommitArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CommitArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CommitArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ConfigureEventArgs.xml b/doc/en/Gtk/ConfigureEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ConfigureEventArgs.xml
rename to doc/en/Gtk/ConfigureEventArgs.xml
index 29e41dd77..eabad161a 100644
--- a/doc/en/GtkSharp/ConfigureEventArgs.xml
+++ b/doc/en/Gtk/ConfigureEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ConfigureEventArgs" FullName="GtkSharp.ConfigureEventArgs">
+<Type Name="ConfigureEventArgs" FullName="Gtk.ConfigureEventArgs">
   <TypeSignature Language="C#" Value="public class ConfigureEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ConfigureEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ConfigureEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CurrentParagraphAlignmentChangedArgs.xml b/doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml
similarity index 87%
rename from doc/en/GtkSharp/CurrentParagraphAlignmentChangedArgs.xml
rename to doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml
index 2d39e4fd7..c3611892a 100644
--- a/doc/en/GtkSharp/CurrentParagraphAlignmentChangedArgs.xml
+++ b/doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CurrentParagraphAlignmentChangedArgs" FullName="GtkSharp.CurrentParagraphAlignmentChangedArgs">
+<Type Name="CurrentParagraphAlignmentChangedArgs" FullName="Gtk.CurrentParagraphAlignmentChangedArgs">
   <TypeSignature Language="C#" Value="public class CurrentParagraphAlignmentChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CurrentParagraphAlignmentChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CurrentParagraphAlignmentChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CurrentParagraphIndentationChangedArgs.xml b/doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/CurrentParagraphIndentationChangedArgs.xml
rename to doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml
index 91228b24c..0ffb9feb2 100644
--- a/doc/en/GtkSharp/CurrentParagraphIndentationChangedArgs.xml
+++ b/doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CurrentParagraphIndentationChangedArgs" FullName="GtkSharp.CurrentParagraphIndentationChangedArgs">
+<Type Name="CurrentParagraphIndentationChangedArgs" FullName="Gtk.CurrentParagraphIndentationChangedArgs">
   <TypeSignature Language="C#" Value="public class CurrentParagraphIndentationChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CurrentParagraphIndentationChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CurrentParagraphIndentationChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CurrentParagraphStyleChangedArgs.xml b/doc/en/Gtk/CurrentParagraphStyleChangedArgs.xml
similarity index 88%
rename from doc/en/GtkSharp/CurrentParagraphStyleChangedArgs.xml
rename to doc/en/Gtk/CurrentParagraphStyleChangedArgs.xml
index 08516fcc3..0fa136bc3 100644
--- a/doc/en/GtkSharp/CurrentParagraphStyleChangedArgs.xml
+++ b/doc/en/Gtk/CurrentParagraphStyleChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CurrentParagraphStyleChangedArgs" FullName="GtkSharp.CurrentParagraphStyleChangedArgs">
+<Type Name="CurrentParagraphStyleChangedArgs" FullName="Gtk.CurrentParagraphStyleChangedArgs">
   <TypeSignature Language="C#" Value="public class CurrentParagraphStyleChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CurrentParagraphStyleChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CurrentParagraphStyleChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CursorMoveArgs.xml b/doc/en/Gtk/CursorMoveArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/CursorMoveArgs.xml
rename to doc/en/Gtk/CursorMoveArgs.xml
index cf17a3bb6..1fdbc641b 100644
--- a/doc/en/GtkSharp/CursorMoveArgs.xml
+++ b/doc/en/Gtk/CursorMoveArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CursorMoveArgs" FullName="GtkSharp.CursorMoveArgs">
+<Type Name="CursorMoveArgs" FullName="Gtk.CursorMoveArgs">
   <TypeSignature Language="C#" Value="public class CursorMoveArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CursorMoveArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CursorMoveArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CycleChildFocusArgs.xml b/doc/en/Gtk/CycleChildFocusArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/CycleChildFocusArgs.xml
rename to doc/en/Gtk/CycleChildFocusArgs.xml
index 41f48aaa2..9d20c398c 100644
--- a/doc/en/GtkSharp/CycleChildFocusArgs.xml
+++ b/doc/en/Gtk/CycleChildFocusArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CycleChildFocusArgs" FullName="GtkSharp.CycleChildFocusArgs">
+<Type Name="CycleChildFocusArgs" FullName="Gtk.CycleChildFocusArgs">
   <TypeSignature Language="C#" Value="public class CycleChildFocusArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CycleChildFocusArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CycleChildFocusArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/CycleHandleFocusArgs.xml b/doc/en/Gtk/CycleHandleFocusArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/CycleHandleFocusArgs.xml
rename to doc/en/Gtk/CycleHandleFocusArgs.xml
index d83fbe1b2..0bee0fe13 100644
--- a/doc/en/GtkSharp/CycleHandleFocusArgs.xml
+++ b/doc/en/Gtk/CycleHandleFocusArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="CycleHandleFocusArgs" FullName="GtkSharp.CycleHandleFocusArgs">
+<Type Name="CycleHandleFocusArgs" FullName="Gtk.CycleHandleFocusArgs">
   <TypeSignature Language="C#" Value="public class CycleHandleFocusArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.CycleHandleFocusArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.CycleHandleFocusArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DeleteEventArgs.xml b/doc/en/Gtk/DeleteEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/DeleteEventArgs.xml
rename to doc/en/Gtk/DeleteEventArgs.xml
index 640e0f799..914668912 100644
--- a/doc/en/GtkSharp/DeleteEventArgs.xml
+++ b/doc/en/Gtk/DeleteEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DeleteEventArgs" FullName="GtkSharp.DeleteEventArgs">
+<Type Name="DeleteEventArgs" FullName="Gtk.DeleteEventArgs">
   <TypeSignature Language="C#" Value="public class DeleteEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DeleteEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DeleteEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DeleteFromCursorArgs.xml b/doc/en/Gtk/DeleteFromCursorArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/DeleteFromCursorArgs.xml
rename to doc/en/Gtk/DeleteFromCursorArgs.xml
index 68643c4b9..a251a418f 100644
--- a/doc/en/GtkSharp/DeleteFromCursorArgs.xml
+++ b/doc/en/Gtk/DeleteFromCursorArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DeleteFromCursorArgs" FullName="GtkSharp.DeleteFromCursorArgs">
+<Type Name="DeleteFromCursorArgs" FullName="Gtk.DeleteFromCursorArgs">
   <TypeSignature Language="C#" Value="public class DeleteFromCursorArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DeleteFromCursorArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DeleteFromCursorArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DeleteRangeArgs.xml b/doc/en/Gtk/DeleteRangeArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/DeleteRangeArgs.xml
rename to doc/en/Gtk/DeleteRangeArgs.xml
index 7be96ec16..099ea55cf 100644
--- a/doc/en/GtkSharp/DeleteRangeArgs.xml
+++ b/doc/en/Gtk/DeleteRangeArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DeleteRangeArgs" FullName="GtkSharp.DeleteRangeArgs">
+<Type Name="DeleteRangeArgs" FullName="Gtk.DeleteRangeArgs">
   <TypeSignature Language="C#" Value="public class DeleteRangeArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DeleteRangeArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DeleteRangeArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DestroyEventArgs.xml b/doc/en/Gtk/DestroyEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/DestroyEventArgs.xml
rename to doc/en/Gtk/DestroyEventArgs.xml
index 749774e6c..69cb63675 100644
--- a/doc/en/GtkSharp/DestroyEventArgs.xml
+++ b/doc/en/Gtk/DestroyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DestroyEventArgs" FullName="GtkSharp.DestroyEventArgs">
+<Type Name="DestroyEventArgs" FullName="Gtk.DestroyEventArgs">
   <TypeSignature Language="C#" Value="public class DestroyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DestroyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DestroyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DirectionChangedArgs.xml b/doc/en/Gtk/DirectionChangedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/DirectionChangedArgs.xml
rename to doc/en/Gtk/DirectionChangedArgs.xml
index 0c5581f01..972303169 100644
--- a/doc/en/GtkSharp/DirectionChangedArgs.xml
+++ b/doc/en/Gtk/DirectionChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DirectionChangedArgs" FullName="GtkSharp.DirectionChangedArgs">
+<Type Name="DirectionChangedArgs" FullName="Gtk.DirectionChangedArgs">
   <TypeSignature Language="C#" Value="public class DirectionChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DirectionChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DirectionChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DisableDeviceArgs.xml b/doc/en/Gtk/DisableDeviceArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/DisableDeviceArgs.xml
rename to doc/en/Gtk/DisableDeviceArgs.xml
index 5c3a92183..73145787a 100644
--- a/doc/en/GtkSharp/DisableDeviceArgs.xml
+++ b/doc/en/Gtk/DisableDeviceArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DisableDeviceArgs" FullName="GtkSharp.DisableDeviceArgs">
+<Type Name="DisableDeviceArgs" FullName="Gtk.DisableDeviceArgs">
   <TypeSignature Language="C#" Value="public class DisableDeviceArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DisableDeviceArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DisableDeviceArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragBeginArgs.xml b/doc/en/Gtk/DragBeginArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/DragBeginArgs.xml
rename to doc/en/Gtk/DragBeginArgs.xml
index 331a0ee1f..56b51d3c0 100644
--- a/doc/en/GtkSharp/DragBeginArgs.xml
+++ b/doc/en/Gtk/DragBeginArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragBeginArgs" FullName="GtkSharp.DragBeginArgs">
+<Type Name="DragBeginArgs" FullName="Gtk.DragBeginArgs">
   <TypeSignature Language="C#" Value="public class DragBeginArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragBeginArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragBeginArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragDataDeleteArgs.xml b/doc/en/Gtk/DragDataDeleteArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/DragDataDeleteArgs.xml
rename to doc/en/Gtk/DragDataDeleteArgs.xml
index 8e29d03c5..5142607d6 100644
--- a/doc/en/GtkSharp/DragDataDeleteArgs.xml
+++ b/doc/en/Gtk/DragDataDeleteArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragDataDeleteArgs" FullName="GtkSharp.DragDataDeleteArgs">
+<Type Name="DragDataDeleteArgs" FullName="Gtk.DragDataDeleteArgs">
   <TypeSignature Language="C#" Value="public class DragDataDeleteArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragDataDeleteArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragDataDeleteArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragDataGetArgs.xml b/doc/en/Gtk/DragDataGetArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/DragDataGetArgs.xml
rename to doc/en/Gtk/DragDataGetArgs.xml
index 38f94084c..a97b3c641 100644
--- a/doc/en/GtkSharp/DragDataGetArgs.xml
+++ b/doc/en/Gtk/DragDataGetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragDataGetArgs" FullName="GtkSharp.DragDataGetArgs">
+<Type Name="DragDataGetArgs" FullName="Gtk.DragDataGetArgs">
   <TypeSignature Language="C#" Value="public class DragDataGetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragDataGetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragDataGetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragDataReceivedArgs.xml b/doc/en/Gtk/DragDataReceivedArgs.xml
similarity index 95%
rename from doc/en/GtkSharp/DragDataReceivedArgs.xml
rename to doc/en/Gtk/DragDataReceivedArgs.xml
index f7fbcdc86..3a2f2515e 100644
--- a/doc/en/GtkSharp/DragDataReceivedArgs.xml
+++ b/doc/en/Gtk/DragDataReceivedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragDataReceivedArgs" FullName="GtkSharp.DragDataReceivedArgs">
+<Type Name="DragDataReceivedArgs" FullName="Gtk.DragDataReceivedArgs">
   <TypeSignature Language="C#" Value="public class DragDataReceivedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragDataReceivedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragDataReceivedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragDropArgs.xml b/doc/en/Gtk/DragDropArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/DragDropArgs.xml
rename to doc/en/Gtk/DragDropArgs.xml
index 8b8ca9864..ab908eea6 100644
--- a/doc/en/GtkSharp/DragDropArgs.xml
+++ b/doc/en/Gtk/DragDropArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragDropArgs" FullName="GtkSharp.DragDropArgs">
+<Type Name="DragDropArgs" FullName="Gtk.DragDropArgs">
   <TypeSignature Language="C#" Value="public class DragDropArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragDropArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragDropArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragEndArgs.xml b/doc/en/Gtk/DragEndArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/DragEndArgs.xml
rename to doc/en/Gtk/DragEndArgs.xml
index 35219ea8b..428e8a7c7 100644
--- a/doc/en/GtkSharp/DragEndArgs.xml
+++ b/doc/en/Gtk/DragEndArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragEndArgs" FullName="GtkSharp.DragEndArgs">
+<Type Name="DragEndArgs" FullName="Gtk.DragEndArgs">
   <TypeSignature Language="C#" Value="public class DragEndArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragEndArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragEndArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragLeaveArgs.xml b/doc/en/Gtk/DragLeaveArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/DragLeaveArgs.xml
rename to doc/en/Gtk/DragLeaveArgs.xml
index 6d9269d9f..0cf4c1863 100644
--- a/doc/en/GtkSharp/DragLeaveArgs.xml
+++ b/doc/en/Gtk/DragLeaveArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragLeaveArgs" FullName="GtkSharp.DragLeaveArgs">
+<Type Name="DragLeaveArgs" FullName="Gtk.DragLeaveArgs">
   <TypeSignature Language="C#" Value="public class DragLeaveArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragLeaveArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragLeaveArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DragMotionArgs.xml b/doc/en/Gtk/DragMotionArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/DragMotionArgs.xml
rename to doc/en/Gtk/DragMotionArgs.xml
index 63c031db9..34e2556a2 100644
--- a/doc/en/GtkSharp/DragMotionArgs.xml
+++ b/doc/en/Gtk/DragMotionArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DragMotionArgs" FullName="GtkSharp.DragMotionArgs">
+<Type Name="DragMotionArgs" FullName="Gtk.DragMotionArgs">
   <TypeSignature Language="C#" Value="public class DragMotionArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DragMotionArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DragMotionArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/DrawArgs.xml b/doc/en/Gtk/DrawArgs.xml
similarity index 95%
rename from doc/en/GtkSharp/DrawArgs.xml
rename to doc/en/Gtk/DrawArgs.xml
index f84a59a41..c944b0250 100644
--- a/doc/en/GtkSharp/DrawArgs.xml
+++ b/doc/en/Gtk/DrawArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="DrawArgs" FullName="GtkSharp.DrawArgs">
+<Type Name="DrawArgs" FullName="Gtk.DrawArgs">
   <TypeSignature Language="C#" Value="public class DrawArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.DrawArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.DrawArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/EditedArgs.xml b/doc/en/Gtk/EditedArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/EditedArgs.xml
rename to doc/en/Gtk/EditedArgs.xml
index 758885ba6..e61dc6ac6 100644
--- a/doc/en/GtkSharp/EditedArgs.xml
+++ b/doc/en/Gtk/EditedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="EditedArgs" FullName="GtkSharp.EditedArgs">
+<Type Name="EditedArgs" FullName="Gtk.EditedArgs">
   <TypeSignature Language="C#" Value="public class EditedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.EditedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.EditedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/EnableDeviceArgs.xml b/doc/en/Gtk/EnableDeviceArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/EnableDeviceArgs.xml
rename to doc/en/Gtk/EnableDeviceArgs.xml
index 67d850744..af49c5c68 100644
--- a/doc/en/GtkSharp/EnableDeviceArgs.xml
+++ b/doc/en/Gtk/EnableDeviceArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="EnableDeviceArgs" FullName="GtkSharp.EnableDeviceArgs">
+<Type Name="EnableDeviceArgs" FullName="Gtk.EnableDeviceArgs">
   <TypeSignature Language="C#" Value="public class EnableDeviceArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.EnableDeviceArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.EnableDeviceArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/EnterNotifyEventArgs.xml b/doc/en/Gtk/EnterNotifyEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/EnterNotifyEventArgs.xml
rename to doc/en/Gtk/EnterNotifyEventArgs.xml
index 0b0f3bf47..44aaac300 100644
--- a/doc/en/GtkSharp/EnterNotifyEventArgs.xml
+++ b/doc/en/Gtk/EnterNotifyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="EnterNotifyEventArgs" FullName="GtkSharp.EnterNotifyEventArgs">
+<Type Name="EnterNotifyEventArgs" FullName="Gtk.EnterNotifyEventArgs">
   <TypeSignature Language="C#" Value="public class EnterNotifyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.EnterNotifyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.EnterNotifyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ExpandCollapseCursorRowArgs.xml b/doc/en/Gtk/ExpandCollapseCursorRowArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/ExpandCollapseCursorRowArgs.xml
rename to doc/en/Gtk/ExpandCollapseCursorRowArgs.xml
index fb9db67c1..ba4033ccc 100644
--- a/doc/en/GtkSharp/ExpandCollapseCursorRowArgs.xml
+++ b/doc/en/Gtk/ExpandCollapseCursorRowArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ExpandCollapseCursorRowArgs" FullName="GtkSharp.ExpandCollapseCursorRowArgs">
+<Type Name="ExpandCollapseCursorRowArgs" FullName="Gtk.ExpandCollapseCursorRowArgs">
   <TypeSignature Language="C#" Value="public class ExpandCollapseCursorRowArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ExpandCollapseCursorRowArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ExpandCollapseCursorRowArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ExposeEventArgs.xml b/doc/en/Gtk/ExposeEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ExposeEventArgs.xml
rename to doc/en/Gtk/ExposeEventArgs.xml
index 2c032dede..f87e46a47 100644
--- a/doc/en/GtkSharp/ExposeEventArgs.xml
+++ b/doc/en/Gtk/ExposeEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ExposeEventArgs" FullName="GtkSharp.ExposeEventArgs">
+<Type Name="ExposeEventArgs" FullName="Gtk.ExposeEventArgs">
   <TypeSignature Language="C#" Value="public class ExposeEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ExposeEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ExposeEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FocusChildSetArgs.xml b/doc/en/Gtk/FocusChildSetArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/FocusChildSetArgs.xml
rename to doc/en/Gtk/FocusChildSetArgs.xml
index d826bf715..46d022407 100644
--- a/doc/en/GtkSharp/FocusChildSetArgs.xml
+++ b/doc/en/Gtk/FocusChildSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FocusChildSetArgs" FullName="GtkSharp.FocusChildSetArgs">
+<Type Name="FocusChildSetArgs" FullName="Gtk.FocusChildSetArgs">
   <TypeSignature Language="C#" Value="public class FocusChildSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FocusChildSetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FocusChildSetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FocusInEventArgs.xml b/doc/en/Gtk/FocusInEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/FocusInEventArgs.xml
rename to doc/en/Gtk/FocusInEventArgs.xml
index 55e4a365f..d1bfc1239 100644
--- a/doc/en/GtkSharp/FocusInEventArgs.xml
+++ b/doc/en/Gtk/FocusInEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FocusInEventArgs" FullName="GtkSharp.FocusInEventArgs">
+<Type Name="FocusInEventArgs" FullName="Gtk.FocusInEventArgs">
   <TypeSignature Language="C#" Value="public class FocusInEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FocusInEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FocusInEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FocusOutEventArgs.xml b/doc/en/Gtk/FocusOutEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/FocusOutEventArgs.xml
rename to doc/en/Gtk/FocusOutEventArgs.xml
index aff922e46..3c1f01d1c 100644
--- a/doc/en/GtkSharp/FocusOutEventArgs.xml
+++ b/doc/en/Gtk/FocusOutEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FocusOutEventArgs" FullName="GtkSharp.FocusOutEventArgs">
+<Type Name="FocusOutEventArgs" FullName="Gtk.FocusOutEventArgs">
   <TypeSignature Language="C#" Value="public class FocusOutEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FocusOutEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FocusOutEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FocusTabArgs.xml b/doc/en/Gtk/FocusTabArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/FocusTabArgs.xml
rename to doc/en/Gtk/FocusTabArgs.xml
index da0e97de0..e7d1adf26 100644
--- a/doc/en/GtkSharp/FocusTabArgs.xml
+++ b/doc/en/Gtk/FocusTabArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FocusTabArgs" FullName="GtkSharp.FocusTabArgs">
+<Type Name="FocusTabArgs" FullName="Gtk.FocusTabArgs">
   <TypeSignature Language="C#" Value="public class FocusTabArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FocusTabArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FocusTabArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FocusedArgs.xml b/doc/en/Gtk/FocusedArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/FocusedArgs.xml
rename to doc/en/Gtk/FocusedArgs.xml
index 8b940351d..6e55023bc 100644
--- a/doc/en/GtkSharp/FocusedArgs.xml
+++ b/doc/en/Gtk/FocusedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FocusedArgs" FullName="GtkSharp.FocusedArgs">
+<Type Name="FocusedArgs" FullName="Gtk.FocusedArgs">
   <TypeSignature Language="C#" Value="public class FocusedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FocusedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FocusedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FormatValueArgs.xml b/doc/en/Gtk/FormatValueArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/FormatValueArgs.xml
rename to doc/en/Gtk/FormatValueArgs.xml
index c0a6a3603..40a6ad072 100644
--- a/doc/en/GtkSharp/FormatValueArgs.xml
+++ b/doc/en/Gtk/FormatValueArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FormatValueArgs" FullName="GtkSharp.FormatValueArgs">
+<Type Name="FormatValueArgs" FullName="Gtk.FormatValueArgs">
   <TypeSignature Language="C#" Value="public class FormatValueArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FormatValueArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FormatValueArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/FrameEventArgs.xml b/doc/en/Gtk/FrameEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/FrameEventArgs.xml
rename to doc/en/Gtk/FrameEventArgs.xml
index b1a83c38f..65ea1baab 100644
--- a/doc/en/GtkSharp/FrameEventArgs.xml
+++ b/doc/en/Gtk/FrameEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="FrameEventArgs" FullName="GtkSharp.FrameEventArgs">
+<Type Name="FrameEventArgs" FullName="Gtk.FrameEventArgs">
   <TypeSignature Language="C#" Value="public class FrameEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.FrameEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.FrameEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/GrabNotifyArgs.xml b/doc/en/Gtk/GrabNotifyArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/GrabNotifyArgs.xml
rename to doc/en/Gtk/GrabNotifyArgs.xml
index 8a6958790..f405f7271 100644
--- a/doc/en/GtkSharp/GrabNotifyArgs.xml
+++ b/doc/en/Gtk/GrabNotifyArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="GrabNotifyArgs" FullName="GtkSharp.GrabNotifyArgs">
+<Type Name="GrabNotifyArgs" FullName="Gtk.GrabNotifyArgs">
   <TypeSignature Language="C#" Value="public class GrabNotifyArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.GrabNotifyArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.GrabNotifyArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/HelpShownArgs.xml b/doc/en/Gtk/HelpShownArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/HelpShownArgs.xml
rename to doc/en/Gtk/HelpShownArgs.xml
index 2ab43154e..6956e639a 100644
--- a/doc/en/GtkSharp/HelpShownArgs.xml
+++ b/doc/en/Gtk/HelpShownArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="HelpShownArgs" FullName="GtkSharp.HelpShownArgs">
+<Type Name="HelpShownArgs" FullName="Gtk.HelpShownArgs">
   <TypeSignature Language="C#" Value="public class HelpShownArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.HelpShownArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.HelpShownArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/HierarchyChangedArgs.xml b/doc/en/Gtk/HierarchyChangedArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/HierarchyChangedArgs.xml
rename to doc/en/Gtk/HierarchyChangedArgs.xml
index 19b28fbb1..3a3aca755 100644
--- a/doc/en/GtkSharp/HierarchyChangedArgs.xml
+++ b/doc/en/Gtk/HierarchyChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="HierarchyChangedArgs" FullName="GtkSharp.HierarchyChangedArgs">
+<Type Name="HierarchyChangedArgs" FullName="Gtk.HierarchyChangedArgs">
   <TypeSignature Language="C#" Value="public class HierarchyChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.HierarchyChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.HierarchyChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/IframeCreatedArgs.xml b/doc/en/Gtk/IframeCreatedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/IframeCreatedArgs.xml
rename to doc/en/Gtk/IframeCreatedArgs.xml
index aa804c339..cc766450f 100644
--- a/doc/en/GtkSharp/IframeCreatedArgs.xml
+++ b/doc/en/Gtk/IframeCreatedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="IframeCreatedArgs" FullName="GtkSharp.IframeCreatedArgs">
+<Type Name="IframeCreatedArgs" FullName="Gtk.IframeCreatedArgs">
   <TypeSignature Language="C#" Value="public class IframeCreatedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.IframeCreatedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.IframeCreatedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/InputArgs.xml b/doc/en/Gtk/InputArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/InputArgs.xml
rename to doc/en/Gtk/InputArgs.xml
index 8cffa850a..7807e18e9 100644
--- a/doc/en/GtkSharp/InputArgs.xml
+++ b/doc/en/Gtk/InputArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="InputArgs" FullName="GtkSharp.InputArgs">
+<Type Name="InputArgs" FullName="Gtk.InputArgs">
   <TypeSignature Language="C#" Value="public class InputArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.InputArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.InputArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/InsertAtCursorArgs.xml b/doc/en/Gtk/InsertAtCursorArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/InsertAtCursorArgs.xml
rename to doc/en/Gtk/InsertAtCursorArgs.xml
index 3cf63d5c4..f20b9dbeb 100644
--- a/doc/en/GtkSharp/InsertAtCursorArgs.xml
+++ b/doc/en/Gtk/InsertAtCursorArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="InsertAtCursorArgs" FullName="GtkSharp.InsertAtCursorArgs">
+<Type Name="InsertAtCursorArgs" FullName="Gtk.InsertAtCursorArgs">
   <TypeSignature Language="C#" Value="public class InsertAtCursorArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.InsertAtCursorArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.InsertAtCursorArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/InsertTextArgs.xml b/doc/en/Gtk/InsertTextArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/InsertTextArgs.xml
rename to doc/en/Gtk/InsertTextArgs.xml
index 80baf4fbd..9a6afe2c7 100644
--- a/doc/en/GtkSharp/InsertTextArgs.xml
+++ b/doc/en/Gtk/InsertTextArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="InsertTextArgs" FullName="GtkSharp.InsertTextArgs">
+<Type Name="InsertTextArgs" FullName="Gtk.InsertTextArgs">
   <TypeSignature Language="C#" Value="public class InsertTextArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.InsertTextArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.InsertTextArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/InsertionColorChangedArgs.xml b/doc/en/Gtk/InsertionColorChangedArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/InsertionColorChangedArgs.xml
rename to doc/en/Gtk/InsertionColorChangedArgs.xml
index d647763e5..1fca65442 100644
--- a/doc/en/GtkSharp/InsertionColorChangedArgs.xml
+++ b/doc/en/Gtk/InsertionColorChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="InsertionColorChangedArgs" FullName="GtkSharp.InsertionColorChangedArgs">
+<Type Name="InsertionColorChangedArgs" FullName="Gtk.InsertionColorChangedArgs">
   <TypeSignature Language="C#" Value="public class InsertionColorChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.InsertionColorChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.InsertionColorChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/InsertionFontStyleChangedArgs.xml b/doc/en/Gtk/InsertionFontStyleChangedArgs.xml
similarity index 88%
rename from doc/en/GtkSharp/InsertionFontStyleChangedArgs.xml
rename to doc/en/Gtk/InsertionFontStyleChangedArgs.xml
index 727d1ee7a..1d936e1e6 100644
--- a/doc/en/GtkSharp/InsertionFontStyleChangedArgs.xml
+++ b/doc/en/Gtk/InsertionFontStyleChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="InsertionFontStyleChangedArgs" FullName="GtkSharp.InsertionFontStyleChangedArgs">
+<Type Name="InsertionFontStyleChangedArgs" FullName="Gtk.InsertionFontStyleChangedArgs">
   <TypeSignature Language="C#" Value="public class InsertionFontStyleChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.InsertionFontStyleChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.InsertionFontStyleChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/KeyPressEventArgs.xml b/doc/en/Gtk/KeyPressEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/KeyPressEventArgs.xml
rename to doc/en/Gtk/KeyPressEventArgs.xml
index 30e9d7f94..786f466d9 100644
--- a/doc/en/GtkSharp/KeyPressEventArgs.xml
+++ b/doc/en/Gtk/KeyPressEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="KeyPressEventArgs" FullName="GtkSharp.KeyPressEventArgs">
+<Type Name="KeyPressEventArgs" FullName="Gtk.KeyPressEventArgs">
   <TypeSignature Language="C#" Value="public class KeyPressEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.KeyPressEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.KeyPressEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/KeyReleaseEventArgs.xml b/doc/en/Gtk/KeyReleaseEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/KeyReleaseEventArgs.xml
rename to doc/en/Gtk/KeyReleaseEventArgs.xml
index 937452ce8..8f7c62dad 100644
--- a/doc/en/GtkSharp/KeyReleaseEventArgs.xml
+++ b/doc/en/Gtk/KeyReleaseEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="KeyReleaseEventArgs" FullName="GtkSharp.KeyReleaseEventArgs">
+<Type Name="KeyReleaseEventArgs" FullName="Gtk.KeyReleaseEventArgs">
   <TypeSignature Language="C#" Value="public class KeyReleaseEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.KeyReleaseEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.KeyReleaseEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/LeaveNotifyEventArgs.xml b/doc/en/Gtk/LeaveNotifyEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/LeaveNotifyEventArgs.xml
rename to doc/en/Gtk/LeaveNotifyEventArgs.xml
index 0f14c76cd..87ceca072 100644
--- a/doc/en/GtkSharp/LeaveNotifyEventArgs.xml
+++ b/doc/en/Gtk/LeaveNotifyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="LeaveNotifyEventArgs" FullName="GtkSharp.LeaveNotifyEventArgs">
+<Type Name="LeaveNotifyEventArgs" FullName="Gtk.LeaveNotifyEventArgs">
   <TypeSignature Language="C#" Value="public class LeaveNotifyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.LeaveNotifyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.LeaveNotifyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/LinkClickedArgs.xml b/doc/en/Gtk/LinkClickedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/LinkClickedArgs.xml
rename to doc/en/Gtk/LinkClickedArgs.xml
index 81a633d9f..a6d465786 100644
--- a/doc/en/GtkSharp/LinkClickedArgs.xml
+++ b/doc/en/Gtk/LinkClickedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="LinkClickedArgs" FullName="GtkSharp.LinkClickedArgs">
+<Type Name="LinkClickedArgs" FullName="Gtk.LinkClickedArgs">
   <TypeSignature Language="C#" Value="public class LinkClickedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.LinkClickedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.LinkClickedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MapEventArgs.xml b/doc/en/Gtk/MapEventArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/MapEventArgs.xml
rename to doc/en/Gtk/MapEventArgs.xml
index ea3862d99..c84222822 100644
--- a/doc/en/GtkSharp/MapEventArgs.xml
+++ b/doc/en/Gtk/MapEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MapEventArgs" FullName="GtkSharp.MapEventArgs">
+<Type Name="MapEventArgs" FullName="Gtk.MapEventArgs">
   <TypeSignature Language="C#" Value="public class MapEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MapEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MapEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MarkDeletedArgs.xml b/doc/en/Gtk/MarkDeletedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/MarkDeletedArgs.xml
rename to doc/en/Gtk/MarkDeletedArgs.xml
index 5566d4091..901fc2d0b 100644
--- a/doc/en/GtkSharp/MarkDeletedArgs.xml
+++ b/doc/en/Gtk/MarkDeletedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MarkDeletedArgs" FullName="GtkSharp.MarkDeletedArgs">
+<Type Name="MarkDeletedArgs" FullName="Gtk.MarkDeletedArgs">
   <TypeSignature Language="C#" Value="public class MarkDeletedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MarkDeletedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MarkDeletedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MarkSetArgs.xml b/doc/en/Gtk/MarkSetArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/MarkSetArgs.xml
rename to doc/en/Gtk/MarkSetArgs.xml
index d3bb37589..6fe600dd0 100644
--- a/doc/en/GtkSharp/MarkSetArgs.xml
+++ b/doc/en/Gtk/MarkSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MarkSetArgs" FullName="GtkSharp.MarkSetArgs">
+<Type Name="MarkSetArgs" FullName="Gtk.MarkSetArgs">
   <TypeSignature Language="C#" Value="public class MarkSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MarkSetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MarkSetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MnemonicActivatedArgs.xml b/doc/en/Gtk/MnemonicActivatedArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/MnemonicActivatedArgs.xml
rename to doc/en/Gtk/MnemonicActivatedArgs.xml
index b181f2c4f..f02d93ebf 100644
--- a/doc/en/GtkSharp/MnemonicActivatedArgs.xml
+++ b/doc/en/Gtk/MnemonicActivatedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MnemonicActivatedArgs" FullName="GtkSharp.MnemonicActivatedArgs">
+<Type Name="MnemonicActivatedArgs" FullName="Gtk.MnemonicActivatedArgs">
   <TypeSignature Language="C#" Value="public class MnemonicActivatedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MnemonicActivatedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MnemonicActivatedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MotionNotifyEventArgs.xml b/doc/en/Gtk/MotionNotifyEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/MotionNotifyEventArgs.xml
rename to doc/en/Gtk/MotionNotifyEventArgs.xml
index a91ffdbfb..67368c177 100644
--- a/doc/en/GtkSharp/MotionNotifyEventArgs.xml
+++ b/doc/en/Gtk/MotionNotifyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MotionNotifyEventArgs" FullName="GtkSharp.MotionNotifyEventArgs">
+<Type Name="MotionNotifyEventArgs" FullName="Gtk.MotionNotifyEventArgs">
   <TypeSignature Language="C#" Value="public class MotionNotifyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MotionNotifyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MotionNotifyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveArgs.xml b/doc/en/Gtk/MoveArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/MoveArgs.xml
rename to doc/en/Gtk/MoveArgs.xml
index e275be3e3..685aece34 100644
--- a/doc/en/GtkSharp/MoveArgs.xml
+++ b/doc/en/Gtk/MoveArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveArgs" FullName="GtkSharp.MoveArgs">
+<Type Name="MoveArgs" FullName="Gtk.MoveArgs">
   <TypeSignature Language="C#" Value="public class MoveArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveCurrentArgs.xml b/doc/en/Gtk/MoveCurrentArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/MoveCurrentArgs.xml
rename to doc/en/Gtk/MoveCurrentArgs.xml
index be99a7c3a..4d87da07d 100644
--- a/doc/en/GtkSharp/MoveCurrentArgs.xml
+++ b/doc/en/Gtk/MoveCurrentArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveCurrentArgs" FullName="GtkSharp.MoveCurrentArgs">
+<Type Name="MoveCurrentArgs" FullName="Gtk.MoveCurrentArgs">
   <TypeSignature Language="C#" Value="public class MoveCurrentArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveCurrentArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveCurrentArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveCursorArgs.xml b/doc/en/Gtk/MoveCursorArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/MoveCursorArgs.xml
rename to doc/en/Gtk/MoveCursorArgs.xml
index 7b981b905..24e4d0ef5 100644
--- a/doc/en/GtkSharp/MoveCursorArgs.xml
+++ b/doc/en/Gtk/MoveCursorArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveCursorArgs" FullName="GtkSharp.MoveCursorArgs">
+<Type Name="MoveCursorArgs" FullName="Gtk.MoveCursorArgs">
   <TypeSignature Language="C#" Value="public class MoveCursorArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveCursorArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveCursorArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveFocusArgs.xml b/doc/en/Gtk/MoveFocusArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/MoveFocusArgs.xml
rename to doc/en/Gtk/MoveFocusArgs.xml
index b92d7c04e..532dd9b30 100644
--- a/doc/en/GtkSharp/MoveFocusArgs.xml
+++ b/doc/en/Gtk/MoveFocusArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveFocusArgs" FullName="GtkSharp.MoveFocusArgs">
+<Type Name="MoveFocusArgs" FullName="Gtk.MoveFocusArgs">
   <TypeSignature Language="C#" Value="public class MoveFocusArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveFocusArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveFocusArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveFocusOutArgs.xml b/doc/en/Gtk/MoveFocusOutArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/MoveFocusOutArgs.xml
rename to doc/en/Gtk/MoveFocusOutArgs.xml
index 45ee91f75..81f8ada19 100644
--- a/doc/en/GtkSharp/MoveFocusOutArgs.xml
+++ b/doc/en/Gtk/MoveFocusOutArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveFocusOutArgs" FullName="GtkSharp.MoveFocusOutArgs">
+<Type Name="MoveFocusOutArgs" FullName="Gtk.MoveFocusOutArgs">
   <TypeSignature Language="C#" Value="public class MoveFocusOutArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveFocusOutArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveFocusOutArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveHandleArgs.xml b/doc/en/Gtk/MoveHandleArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/MoveHandleArgs.xml
rename to doc/en/Gtk/MoveHandleArgs.xml
index a19ebebfd..123364439 100644
--- a/doc/en/GtkSharp/MoveHandleArgs.xml
+++ b/doc/en/Gtk/MoveHandleArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveHandleArgs" FullName="GtkSharp.MoveHandleArgs">
+<Type Name="MoveHandleArgs" FullName="Gtk.MoveHandleArgs">
   <TypeSignature Language="C#" Value="public class MoveHandleArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveHandleArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveHandleArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/MoveSliderArgs.xml b/doc/en/Gtk/MoveSliderArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/MoveSliderArgs.xml
rename to doc/en/Gtk/MoveSliderArgs.xml
index 70075d747..ca134e1ea 100644
--- a/doc/en/GtkSharp/MoveSliderArgs.xml
+++ b/doc/en/Gtk/MoveSliderArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="MoveSliderArgs" FullName="GtkSharp.MoveSliderArgs">
+<Type Name="MoveSliderArgs" FullName="Gtk.MoveSliderArgs">
   <TypeSignature Language="C#" Value="public class MoveSliderArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.MoveSliderArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.MoveSliderArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/NoExposeEventArgs.xml b/doc/en/Gtk/NoExposeEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/NoExposeEventArgs.xml
rename to doc/en/Gtk/NoExposeEventArgs.xml
index 0e01f9579..f3bde5b81 100644
--- a/doc/en/GtkSharp/NoExposeEventArgs.xml
+++ b/doc/en/Gtk/NoExposeEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="NoExposeEventArgs" FullName="GtkSharp.NoExposeEventArgs">
+<Type Name="NoExposeEventArgs" FullName="Gtk.NoExposeEventArgs">
   <TypeSignature Language="C#" Value="public class NoExposeEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.NoExposeEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.NoExposeEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ObjectRequestedArgs.xml b/doc/en/Gtk/ObjectRequestedArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/ObjectRequestedArgs.xml
rename to doc/en/Gtk/ObjectRequestedArgs.xml
index e6da4fac4..86620ff62 100644
--- a/doc/en/GtkSharp/ObjectRequestedArgs.xml
+++ b/doc/en/Gtk/ObjectRequestedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ObjectRequestedArgs" FullName="GtkSharp.ObjectRequestedArgs">
+<Type Name="ObjectRequestedArgs" FullName="Gtk.ObjectRequestedArgs">
   <TypeSignature Language="C#" Value="public class ObjectRequestedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/OnCommandArgs.xml b/doc/en/Gtk/OnCommandArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/OnCommandArgs.xml
rename to doc/en/Gtk/OnCommandArgs.xml
index 0f39f5f1e..59586f634 100644
--- a/doc/en/GtkSharp/OnCommandArgs.xml
+++ b/doc/en/Gtk/OnCommandArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="OnCommandArgs" FullName="GtkSharp.OnCommandArgs">
+<Type Name="OnCommandArgs" FullName="Gtk.OnCommandArgs">
   <TypeSignature Language="C#" Value="public class OnCommandArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.OnCommandArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.OnCommandArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/OnUrlArgs.xml b/doc/en/Gtk/OnUrlArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/OnUrlArgs.xml
rename to doc/en/Gtk/OnUrlArgs.xml
index 89f5d17e7..a8a183a50 100644
--- a/doc/en/GtkSharp/OnUrlArgs.xml
+++ b/doc/en/Gtk/OnUrlArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="OnUrlArgs" FullName="GtkSharp.OnUrlArgs">
+<Type Name="OnUrlArgs" FullName="Gtk.OnUrlArgs">
   <TypeSignature Language="C#" Value="public class OnUrlArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.OnUrlArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.OnUrlArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/OrientationChangedArgs.xml b/doc/en/Gtk/OrientationChangedArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/OrientationChangedArgs.xml
rename to doc/en/Gtk/OrientationChangedArgs.xml
index 363a210d6..4bc04108a 100644
--- a/doc/en/GtkSharp/OrientationChangedArgs.xml
+++ b/doc/en/Gtk/OrientationChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="OrientationChangedArgs" FullName="GtkSharp.OrientationChangedArgs">
+<Type Name="OrientationChangedArgs" FullName="Gtk.OrientationChangedArgs">
   <TypeSignature Language="C#" Value="public class OrientationChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.OrientationChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.OrientationChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/OutputArgs.xml b/doc/en/Gtk/OutputArgs.xml
similarity index 88%
rename from doc/en/GtkSharp/OutputArgs.xml
rename to doc/en/Gtk/OutputArgs.xml
index 443d98cb5..5e1a587be 100644
--- a/doc/en/GtkSharp/OutputArgs.xml
+++ b/doc/en/Gtk/OutputArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="OutputArgs" FullName="GtkSharp.OutputArgs">
+<Type Name="OutputArgs" FullName="Gtk.OutputArgs">
   <TypeSignature Language="C#" Value="public class OutputArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.OutputArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.OutputArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PageHorizontallyArgs.xml b/doc/en/Gtk/PageHorizontallyArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/PageHorizontallyArgs.xml
rename to doc/en/Gtk/PageHorizontallyArgs.xml
index 8b7f4c069..a2392e5c3 100644
--- a/doc/en/GtkSharp/PageHorizontallyArgs.xml
+++ b/doc/en/Gtk/PageHorizontallyArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PageHorizontallyArgs" FullName="GtkSharp.PageHorizontallyArgs">
+<Type Name="PageHorizontallyArgs" FullName="Gtk.PageHorizontallyArgs">
   <TypeSignature Language="C#" Value="public class PageHorizontallyArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PageHorizontallyArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PageHorizontallyArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ParentSetArgs.xml b/doc/en/Gtk/ParentSetArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ParentSetArgs.xml
rename to doc/en/Gtk/ParentSetArgs.xml
index c5b1311ef..50b4414d3 100644
--- a/doc/en/GtkSharp/ParentSetArgs.xml
+++ b/doc/en/Gtk/ParentSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ParentSetArgs" FullName="GtkSharp.ParentSetArgs">
+<Type Name="ParentSetArgs" FullName="Gtk.ParentSetArgs">
   <TypeSignature Language="C#" Value="public class ParentSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ParentSetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ParentSetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PixbufInsertedArgs.xml b/doc/en/Gtk/PixbufInsertedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/PixbufInsertedArgs.xml
rename to doc/en/Gtk/PixbufInsertedArgs.xml
index 0d9f91984..0c3dfddb6 100644
--- a/doc/en/GtkSharp/PixbufInsertedArgs.xml
+++ b/doc/en/Gtk/PixbufInsertedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PixbufInsertedArgs" FullName="GtkSharp.PixbufInsertedArgs">
+<Type Name="PixbufInsertedArgs" FullName="Gtk.PixbufInsertedArgs">
   <TypeSignature Language="C#" Value="public class PixbufInsertedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PixbufInsertedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PixbufInsertedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PlugRemovedArgs.xml b/doc/en/Gtk/PlugRemovedArgs.xml
similarity index 87%
rename from doc/en/GtkSharp/PlugRemovedArgs.xml
rename to doc/en/Gtk/PlugRemovedArgs.xml
index 40ca84e73..97104e15b 100644
--- a/doc/en/GtkSharp/PlugRemovedArgs.xml
+++ b/doc/en/Gtk/PlugRemovedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PlugRemovedArgs" FullName="GtkSharp.PlugRemovedArgs">
+<Type Name="PlugRemovedArgs" FullName="Gtk.PlugRemovedArgs">
   <TypeSignature Language="C#" Value="public class PlugRemovedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PlugRemovedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PlugRemovedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PointArgs.xml b/doc/en/Gtk/PointArgs.xml
similarity index 95%
rename from doc/en/GtkSharp/PointArgs.xml
rename to doc/en/Gtk/PointArgs.xml
index f5ad5a4d7..efb41343a 100644
--- a/doc/en/GtkSharp/PointArgs.xml
+++ b/doc/en/Gtk/PointArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PointArgs" FullName="GtkSharp.PointArgs">
+<Type Name="PointArgs" FullName="Gtk.PointArgs">
   <TypeSignature Language="C#" Value="public class PointArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PointArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PointArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PopulatePopupArgs.xml b/doc/en/Gtk/PopulatePopupArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/PopulatePopupArgs.xml
rename to doc/en/Gtk/PopulatePopupArgs.xml
index a8451a3d2..3ec097654 100644
--- a/doc/en/GtkSharp/PopulatePopupArgs.xml
+++ b/doc/en/Gtk/PopulatePopupArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PopulatePopupArgs" FullName="GtkSharp.PopulatePopupArgs">
+<Type Name="PopulatePopupArgs" FullName="Gtk.PopulatePopupArgs">
   <TypeSignature Language="C#" Value="public class PopulatePopupArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PopulatePopupArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PopulatePopupArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PopupMenuArgs.xml b/doc/en/Gtk/PopupMenuArgs.xml
similarity index 87%
rename from doc/en/GtkSharp/PopupMenuArgs.xml
rename to doc/en/Gtk/PopupMenuArgs.xml
index 9cf0da54a..afd94596e 100644
--- a/doc/en/GtkSharp/PopupMenuArgs.xml
+++ b/doc/en/Gtk/PopupMenuArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PopupMenuArgs" FullName="GtkSharp.PopupMenuArgs">
+<Type Name="PopupMenuArgs" FullName="Gtk.PopupMenuArgs">
   <TypeSignature Language="C#" Value="public class PopupMenuArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PopupMenuArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PopupMenuArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/PropertyNotifyEventArgs.xml b/doc/en/Gtk/PropertyNotifyEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/PropertyNotifyEventArgs.xml
rename to doc/en/Gtk/PropertyNotifyEventArgs.xml
index cc4548afd..d394124a4 100644
--- a/doc/en/GtkSharp/PropertyNotifyEventArgs.xml
+++ b/doc/en/Gtk/PropertyNotifyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="PropertyNotifyEventArgs" FullName="GtkSharp.PropertyNotifyEventArgs">
+<Type Name="PropertyNotifyEventArgs" FullName="Gtk.PropertyNotifyEventArgs">
   <TypeSignature Language="C#" Value="public class PropertyNotifyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.PropertyNotifyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.PropertyNotifyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ProximityInEventArgs.xml b/doc/en/Gtk/ProximityInEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ProximityInEventArgs.xml
rename to doc/en/Gtk/ProximityInEventArgs.xml
index d82d39b94..38904a001 100644
--- a/doc/en/GtkSharp/ProximityInEventArgs.xml
+++ b/doc/en/Gtk/ProximityInEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ProximityInEventArgs" FullName="GtkSharp.ProximityInEventArgs">
+<Type Name="ProximityInEventArgs" FullName="Gtk.ProximityInEventArgs">
   <TypeSignature Language="C#" Value="public class ProximityInEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ProximityInEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ProximityInEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ProximityOutEventArgs.xml b/doc/en/Gtk/ProximityOutEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ProximityOutEventArgs.xml
rename to doc/en/Gtk/ProximityOutEventArgs.xml
index ccacff569..5e502aa3c 100644
--- a/doc/en/GtkSharp/ProximityOutEventArgs.xml
+++ b/doc/en/Gtk/ProximityOutEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ProximityOutEventArgs" FullName="GtkSharp.ProximityOutEventArgs">
+<Type Name="ProximityOutEventArgs" FullName="Gtk.ProximityOutEventArgs">
   <TypeSignature Language="C#" Value="public class ProximityOutEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ProximityOutEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ProximityOutEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RedirectArgs.xml b/doc/en/Gtk/RedirectArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/RedirectArgs.xml
rename to doc/en/Gtk/RedirectArgs.xml
index a35f4e26f..d3a6d37d0 100644
--- a/doc/en/GtkSharp/RedirectArgs.xml
+++ b/doc/en/Gtk/RedirectArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RedirectArgs" FullName="GtkSharp.RedirectArgs">
+<Type Name="RedirectArgs" FullName="Gtk.RedirectArgs">
   <TypeSignature Language="C#" Value="public class RedirectArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RedirectArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RedirectArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RemovedArgs.xml b/doc/en/Gtk/RemovedArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/RemovedArgs.xml
rename to doc/en/Gtk/RemovedArgs.xml
index 8f30a6fa0..742cd3cdd 100644
--- a/doc/en/GtkSharp/RemovedArgs.xml
+++ b/doc/en/Gtk/RemovedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RemovedArgs" FullName="GtkSharp.RemovedArgs">
+<Type Name="RemovedArgs" FullName="Gtk.RemovedArgs">
   <TypeSignature Language="C#" Value="public class RemovedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RemovedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RemovedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RenderArgs.xml b/doc/en/Gtk/RenderArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/RenderArgs.xml
rename to doc/en/Gtk/RenderArgs.xml
index bcb92d0e0..4730f84be 100644
--- a/doc/en/GtkSharp/RenderArgs.xml
+++ b/doc/en/Gtk/RenderArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RenderArgs" FullName="GtkSharp.RenderArgs">
+<Type Name="RenderArgs" FullName="Gtk.RenderArgs">
   <TypeSignature Language="C#" Value="public class RenderArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RenderArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RenderArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ResponseArgs.xml b/doc/en/Gtk/ResponseArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ResponseArgs.xml
rename to doc/en/Gtk/ResponseArgs.xml
index 8b2757709..62ff15666 100644
--- a/doc/en/GtkSharp/ResponseArgs.xml
+++ b/doc/en/Gtk/ResponseArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ResponseArgs" FullName="GtkSharp.ResponseArgs">
+<Type Name="ResponseArgs" FullName="Gtk.ResponseArgs">
   <TypeSignature Language="C#" Value="public class ResponseArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ResponseArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ResponseArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RetrieveSurroundingArgs.xml b/doc/en/Gtk/RetrieveSurroundingArgs.xml
similarity index 85%
rename from doc/en/GtkSharp/RetrieveSurroundingArgs.xml
rename to doc/en/Gtk/RetrieveSurroundingArgs.xml
index 1ce59b9ad..42c0a7fd8 100644
--- a/doc/en/GtkSharp/RetrieveSurroundingArgs.xml
+++ b/doc/en/Gtk/RetrieveSurroundingArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RetrieveSurroundingArgs" FullName="GtkSharp.RetrieveSurroundingArgs">
+<Type Name="RetrieveSurroundingArgs" FullName="Gtk.RetrieveSurroundingArgs">
   <TypeSignature Language="C#" Value="public class RetrieveSurroundingArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RetrieveSurroundingArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RetrieveSurroundingArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowActivatedArgs.xml b/doc/en/Gtk/RowActivatedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/RowActivatedArgs.xml
rename to doc/en/Gtk/RowActivatedArgs.xml
index b46e67524..c3b13fa0e 100644
--- a/doc/en/GtkSharp/RowActivatedArgs.xml
+++ b/doc/en/Gtk/RowActivatedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowActivatedArgs" FullName="GtkSharp.RowActivatedArgs">
+<Type Name="RowActivatedArgs" FullName="Gtk.RowActivatedArgs">
   <TypeSignature Language="C#" Value="public class RowActivatedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowActivatedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowActivatedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowChangedArgs.xml b/doc/en/Gtk/RowChangedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/RowChangedArgs.xml
rename to doc/en/Gtk/RowChangedArgs.xml
index dc95513eb..105e915f2 100644
--- a/doc/en/GtkSharp/RowChangedArgs.xml
+++ b/doc/en/Gtk/RowChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowChangedArgs" FullName="GtkSharp.RowChangedArgs">
+<Type Name="RowChangedArgs" FullName="Gtk.RowChangedArgs">
   <TypeSignature Language="C#" Value="public class RowChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowCollapsedArgs.xml b/doc/en/Gtk/RowCollapsedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/RowCollapsedArgs.xml
rename to doc/en/Gtk/RowCollapsedArgs.xml
index 550e21660..efb6274eb 100644
--- a/doc/en/GtkSharp/RowCollapsedArgs.xml
+++ b/doc/en/Gtk/RowCollapsedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowCollapsedArgs" FullName="GtkSharp.RowCollapsedArgs">
+<Type Name="RowCollapsedArgs" FullName="Gtk.RowCollapsedArgs">
   <TypeSignature Language="C#" Value="public class RowCollapsedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowCollapsedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowCollapsedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowDeletedArgs.xml b/doc/en/Gtk/RowDeletedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/RowDeletedArgs.xml
rename to doc/en/Gtk/RowDeletedArgs.xml
index 2ece986ab..8aee0cdcb 100644
--- a/doc/en/GtkSharp/RowDeletedArgs.xml
+++ b/doc/en/Gtk/RowDeletedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowDeletedArgs" FullName="GtkSharp.RowDeletedArgs">
+<Type Name="RowDeletedArgs" FullName="Gtk.RowDeletedArgs">
   <TypeSignature Language="C#" Value="public class RowDeletedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowDeletedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowDeletedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowExpandedArgs.xml b/doc/en/Gtk/RowExpandedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/RowExpandedArgs.xml
rename to doc/en/Gtk/RowExpandedArgs.xml
index 395250a0f..d5e3c0f29 100644
--- a/doc/en/GtkSharp/RowExpandedArgs.xml
+++ b/doc/en/Gtk/RowExpandedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowExpandedArgs" FullName="GtkSharp.RowExpandedArgs">
+<Type Name="RowExpandedArgs" FullName="Gtk.RowExpandedArgs">
   <TypeSignature Language="C#" Value="public class RowExpandedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowExpandedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowExpandedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowHasChildToggledArgs.xml b/doc/en/Gtk/RowHasChildToggledArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/RowHasChildToggledArgs.xml
rename to doc/en/Gtk/RowHasChildToggledArgs.xml
index 56febcee0..cb3e1aa77 100644
--- a/doc/en/GtkSharp/RowHasChildToggledArgs.xml
+++ b/doc/en/Gtk/RowHasChildToggledArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowHasChildToggledArgs" FullName="GtkSharp.RowHasChildToggledArgs">
+<Type Name="RowHasChildToggledArgs" FullName="Gtk.RowHasChildToggledArgs">
   <TypeSignature Language="C#" Value="public class RowHasChildToggledArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowHasChildToggledArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowHasChildToggledArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowInsertedArgs.xml b/doc/en/Gtk/RowInsertedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/RowInsertedArgs.xml
rename to doc/en/Gtk/RowInsertedArgs.xml
index 2cfeaac35..fa590721d 100644
--- a/doc/en/GtkSharp/RowInsertedArgs.xml
+++ b/doc/en/Gtk/RowInsertedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowInsertedArgs" FullName="GtkSharp.RowInsertedArgs">
+<Type Name="RowInsertedArgs" FullName="Gtk.RowInsertedArgs">
   <TypeSignature Language="C#" Value="public class RowInsertedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowInsertedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowInsertedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/RowsReorderedArgs.xml b/doc/en/Gtk/RowsReorderedArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/RowsReorderedArgs.xml
rename to doc/en/Gtk/RowsReorderedArgs.xml
index da77c0bf3..de3b72f0f 100644
--- a/doc/en/GtkSharp/RowsReorderedArgs.xml
+++ b/doc/en/Gtk/RowsReorderedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="RowsReorderedArgs" FullName="GtkSharp.RowsReorderedArgs">
+<Type Name="RowsReorderedArgs" FullName="Gtk.RowsReorderedArgs">
   <TypeSignature Language="C#" Value="public class RowsReorderedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.RowsReorderedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.RowsReorderedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ScreenChangedArgs.xml b/doc/en/Gtk/ScreenChangedArgs.xml
similarity index 95%
rename from doc/en/GtkSharp/ScreenChangedArgs.xml
rename to doc/en/Gtk/ScreenChangedArgs.xml
index 768c41c8e..f2358f392 100644
--- a/doc/en/GtkSharp/ScreenChangedArgs.xml
+++ b/doc/en/Gtk/ScreenChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ScreenChangedArgs" FullName="GtkSharp.ScreenChangedArgs">
+<Type Name="ScreenChangedArgs" FullName="Gtk.ScreenChangedArgs">
   <TypeSignature Language="C#" Value="public class ScreenChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/ScrollAdjustmentsSetArgs.xml b/doc/en/Gtk/ScrollAdjustmentsSetArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/ScrollAdjustmentsSetArgs.xml
rename to doc/en/Gtk/ScrollAdjustmentsSetArgs.xml
index 05f49159c..973e1247d 100644
--- a/doc/en/GtkSharp/ScrollAdjustmentsSetArgs.xml
+++ b/doc/en/Gtk/ScrollAdjustmentsSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ScrollAdjustmentsSetArgs" FullName="GtkSharp.ScrollAdjustmentsSetArgs">
+<Type Name="ScrollAdjustmentsSetArgs" FullName="Gtk.ScrollAdjustmentsSetArgs">
   <TypeSignature Language="C#" Value="public class ScrollAdjustmentsSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ScrollAdjustmentsSetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ScrollAdjustmentsSetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ScrollArgs.xml b/doc/en/Gtk/ScrollArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/ScrollArgs.xml
rename to doc/en/Gtk/ScrollArgs.xml
index 7bdebc20c..372b05cae 100644
--- a/doc/en/GtkSharp/ScrollArgs.xml
+++ b/doc/en/Gtk/ScrollArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ScrollArgs" FullName="GtkSharp.ScrollArgs">
+<Type Name="ScrollArgs" FullName="Gtk.ScrollArgs">
   <TypeSignature Language="C#" Value="public class ScrollArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ScrollArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ScrollArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ScrollChildArgs.xml b/doc/en/Gtk/ScrollChildArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/ScrollChildArgs.xml
rename to doc/en/Gtk/ScrollChildArgs.xml
index eb81136c0..3c6975388 100644
--- a/doc/en/GtkSharp/ScrollChildArgs.xml
+++ b/doc/en/Gtk/ScrollChildArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ScrollChildArgs" FullName="GtkSharp.ScrollChildArgs">
+<Type Name="ScrollChildArgs" FullName="Gtk.ScrollChildArgs">
   <TypeSignature Language="C#" Value="public class ScrollChildArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ScrollChildArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ScrollChildArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ScrollEventArgs.xml b/doc/en/Gtk/ScrollEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/ScrollEventArgs.xml
rename to doc/en/Gtk/ScrollEventArgs.xml
index b7aefd8f7..3cc466644 100644
--- a/doc/en/GtkSharp/ScrollEventArgs.xml
+++ b/doc/en/Gtk/ScrollEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ScrollEventArgs" FullName="GtkSharp.ScrollEventArgs">
+<Type Name="ScrollEventArgs" FullName="Gtk.ScrollEventArgs">
   <TypeSignature Language="C#" Value="public class ScrollEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ScrollEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ScrollEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectAllArgs.xml b/doc/en/Gtk/SelectAllArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/SelectAllArgs.xml
rename to doc/en/Gtk/SelectAllArgs.xml
index efd9958d8..716e4f9ca 100644
--- a/doc/en/GtkSharp/SelectAllArgs.xml
+++ b/doc/en/Gtk/SelectAllArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectAllArgs" FullName="GtkSharp.SelectAllArgs">
+<Type Name="SelectAllArgs" FullName="Gtk.SelectAllArgs">
   <TypeSignature Language="C#" Value="public class SelectAllArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/SelectCursorParentArgs.xml b/doc/en/Gtk/SelectCursorParentArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/SelectCursorParentArgs.xml
rename to doc/en/Gtk/SelectCursorParentArgs.xml
index fb6e71378..493741366 100644
--- a/doc/en/GtkSharp/SelectCursorParentArgs.xml
+++ b/doc/en/Gtk/SelectCursorParentArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectCursorParentArgs" FullName="GtkSharp.SelectCursorParentArgs">
+<Type Name="SelectCursorParentArgs" FullName="Gtk.SelectCursorParentArgs">
   <TypeSignature Language="C#" Value="public class SelectCursorParentArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/SelectCursorRowArgs.xml b/doc/en/Gtk/SelectCursorRowArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/SelectCursorRowArgs.xml
rename to doc/en/Gtk/SelectCursorRowArgs.xml
index d8fb61aa1..37d101293 100644
--- a/doc/en/GtkSharp/SelectCursorRowArgs.xml
+++ b/doc/en/Gtk/SelectCursorRowArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectCursorRowArgs" FullName="GtkSharp.SelectCursorRowArgs">
+<Type Name="SelectCursorRowArgs" FullName="Gtk.SelectCursorRowArgs">
   <TypeSignature Language="C#" Value="public class SelectCursorRowArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectCursorRowArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectCursorRowArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectPageArgs.xml b/doc/en/Gtk/SelectPageArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/SelectPageArgs.xml
rename to doc/en/Gtk/SelectPageArgs.xml
index dd78ddb43..b9e742195 100644
--- a/doc/en/GtkSharp/SelectPageArgs.xml
+++ b/doc/en/Gtk/SelectPageArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectPageArgs" FullName="GtkSharp.SelectPageArgs">
+<Type Name="SelectPageArgs" FullName="Gtk.SelectPageArgs">
   <TypeSignature Language="C#" Value="public class SelectPageArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectPageArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectPageArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectionClearEventArgs.xml b/doc/en/Gtk/SelectionClearEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/SelectionClearEventArgs.xml
rename to doc/en/Gtk/SelectionClearEventArgs.xml
index a7f11cdcb..19faaeaf2 100644
--- a/doc/en/GtkSharp/SelectionClearEventArgs.xml
+++ b/doc/en/Gtk/SelectionClearEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectionClearEventArgs" FullName="GtkSharp.SelectionClearEventArgs">
+<Type Name="SelectionClearEventArgs" FullName="Gtk.SelectionClearEventArgs">
   <TypeSignature Language="C#" Value="public class SelectionClearEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectionClearEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectionClearEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectionGetArgs.xml b/doc/en/Gtk/SelectionGetArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/SelectionGetArgs.xml
rename to doc/en/Gtk/SelectionGetArgs.xml
index 13710ffcf..a0d4c7ec9 100644
--- a/doc/en/GtkSharp/SelectionGetArgs.xml
+++ b/doc/en/Gtk/SelectionGetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectionGetArgs" FullName="GtkSharp.SelectionGetArgs">
+<Type Name="SelectionGetArgs" FullName="Gtk.SelectionGetArgs">
   <TypeSignature Language="C#" Value="public class SelectionGetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectionGetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectionGetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectionNotifyEventArgs.xml b/doc/en/Gtk/SelectionNotifyEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/SelectionNotifyEventArgs.xml
rename to doc/en/Gtk/SelectionNotifyEventArgs.xml
index 1a316a905..cbb35df11 100644
--- a/doc/en/GtkSharp/SelectionNotifyEventArgs.xml
+++ b/doc/en/Gtk/SelectionNotifyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectionNotifyEventArgs" FullName="GtkSharp.SelectionNotifyEventArgs">
+<Type Name="SelectionNotifyEventArgs" FullName="Gtk.SelectionNotifyEventArgs">
   <TypeSignature Language="C#" Value="public class SelectionNotifyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectionNotifyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectionNotifyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectionReceivedArgs.xml b/doc/en/Gtk/SelectionReceivedArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/SelectionReceivedArgs.xml
rename to doc/en/Gtk/SelectionReceivedArgs.xml
index 11273c4ab..b0669a41f 100644
--- a/doc/en/GtkSharp/SelectionReceivedArgs.xml
+++ b/doc/en/Gtk/SelectionReceivedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectionReceivedArgs" FullName="GtkSharp.SelectionReceivedArgs">
+<Type Name="SelectionReceivedArgs" FullName="Gtk.SelectionReceivedArgs">
   <TypeSignature Language="C#" Value="public class SelectionReceivedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectionReceivedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectionReceivedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SelectionRequestEventArgs.xml b/doc/en/Gtk/SelectionRequestEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/SelectionRequestEventArgs.xml
rename to doc/en/Gtk/SelectionRequestEventArgs.xml
index db45cdb9d..5da8de996 100644
--- a/doc/en/GtkSharp/SelectionRequestEventArgs.xml
+++ b/doc/en/Gtk/SelectionRequestEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SelectionRequestEventArgs" FullName="GtkSharp.SelectionRequestEventArgs">
+<Type Name="SelectionRequestEventArgs" FullName="Gtk.SelectionRequestEventArgs">
   <TypeSignature Language="C#" Value="public class SelectionRequestEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SelectionRequestEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SelectionRequestEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SetBaseArgs.xml b/doc/en/Gtk/SetBaseArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/SetBaseArgs.xml
rename to doc/en/Gtk/SetBaseArgs.xml
index cd5fcfdc7..474f5029d 100644
--- a/doc/en/GtkSharp/SetBaseArgs.xml
+++ b/doc/en/Gtk/SetBaseArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SetBaseArgs" FullName="GtkSharp.SetBaseArgs">
+<Type Name="SetBaseArgs" FullName="Gtk.SetBaseArgs">
   <TypeSignature Language="C#" Value="public class SetBaseArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SetBaseArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SetBaseArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SetBaseTargetArgs.xml b/doc/en/Gtk/SetBaseTargetArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/SetBaseTargetArgs.xml
rename to doc/en/Gtk/SetBaseTargetArgs.xml
index 267499ada..e94de2b5a 100644
--- a/doc/en/GtkSharp/SetBaseTargetArgs.xml
+++ b/doc/en/Gtk/SetBaseTargetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SetBaseTargetArgs" FullName="GtkSharp.SetBaseTargetArgs">
+<Type Name="SetBaseTargetArgs" FullName="Gtk.SetBaseTargetArgs">
   <TypeSignature Language="C#" Value="public class SetBaseTargetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SetBaseTargetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SetBaseTargetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SetFocusArgs.xml b/doc/en/Gtk/SetFocusArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/SetFocusArgs.xml
rename to doc/en/Gtk/SetFocusArgs.xml
index f3f6dec6b..fe0c19383 100644
--- a/doc/en/GtkSharp/SetFocusArgs.xml
+++ b/doc/en/Gtk/SetFocusArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SetFocusArgs" FullName="GtkSharp.SetFocusArgs">
+<Type Name="SetFocusArgs" FullName="Gtk.SetFocusArgs">
   <TypeSignature Language="C#" Value="public class SetFocusArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SetFocusArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SetFocusArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SizeAllocatedArgs.xml b/doc/en/Gtk/SizeAllocatedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/SizeAllocatedArgs.xml
rename to doc/en/Gtk/SizeAllocatedArgs.xml
index 9131ae40c..7818c6b18 100644
--- a/doc/en/GtkSharp/SizeAllocatedArgs.xml
+++ b/doc/en/Gtk/SizeAllocatedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SizeAllocatedArgs" FullName="GtkSharp.SizeAllocatedArgs">
+<Type Name="SizeAllocatedArgs" FullName="Gtk.SizeAllocatedArgs">
   <TypeSignature Language="C#" Value="public class SizeAllocatedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SizeAllocatedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SizeAllocatedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SizeRequestedArgs.xml b/doc/en/Gtk/SizeRequestedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/SizeRequestedArgs.xml
rename to doc/en/Gtk/SizeRequestedArgs.xml
index 56998540b..75036b584 100644
--- a/doc/en/GtkSharp/SizeRequestedArgs.xml
+++ b/doc/en/Gtk/SizeRequestedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SizeRequestedArgs" FullName="GtkSharp.SizeRequestedArgs">
+<Type Name="SizeRequestedArgs" FullName="Gtk.SizeRequestedArgs">
   <TypeSignature Language="C#" Value="public class SizeRequestedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SizeRequestedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SizeRequestedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/StartInteractiveSearchArgs.xml b/doc/en/Gtk/StartInteractiveSearchArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/StartInteractiveSearchArgs.xml
rename to doc/en/Gtk/StartInteractiveSearchArgs.xml
index a9e58241f..2bb2d0db8 100644
--- a/doc/en/GtkSharp/StartInteractiveSearchArgs.xml
+++ b/doc/en/Gtk/StartInteractiveSearchArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="StartInteractiveSearchArgs" FullName="GtkSharp.StartInteractiveSearchArgs">
+<Type Name="StartInteractiveSearchArgs" FullName="Gtk.StartInteractiveSearchArgs">
   <TypeSignature Language="C#" Value="public class StartInteractiveSearchArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/StateChangedArgs.xml b/doc/en/Gtk/StateChangedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/StateChangedArgs.xml
rename to doc/en/Gtk/StateChangedArgs.xml
index c1c3084e6..1841ddf0e 100644
--- a/doc/en/GtkSharp/StateChangedArgs.xml
+++ b/doc/en/Gtk/StateChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="StateChangedArgs" FullName="GtkSharp.StateChangedArgs">
+<Type Name="StateChangedArgs" FullName="Gtk.StateChangedArgs">
   <TypeSignature Language="C#" Value="public class StateChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.StateChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.StateChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/StyleChangedArgs.xml b/doc/en/Gtk/StyleChangedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/StyleChangedArgs.xml
rename to doc/en/Gtk/StyleChangedArgs.xml
index f43bc491d..a0f71e6ea 100644
--- a/doc/en/GtkSharp/StyleChangedArgs.xml
+++ b/doc/en/Gtk/StyleChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="StyleChangedArgs" FullName="GtkSharp.StyleChangedArgs">
+<Type Name="StyleChangedArgs" FullName="Gtk.StyleChangedArgs">
   <TypeSignature Language="C#" Value="public class StyleChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.StyleChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.StyleChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/StyleSetArgs.xml b/doc/en/Gtk/StyleSetArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/StyleSetArgs.xml
rename to doc/en/Gtk/StyleSetArgs.xml
index 5a5209873..9be25f702 100644
--- a/doc/en/GtkSharp/StyleSetArgs.xml
+++ b/doc/en/Gtk/StyleSetArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="StyleSetArgs" FullName="GtkSharp.StyleSetArgs">
+<Type Name="StyleSetArgs" FullName="Gtk.StyleSetArgs">
   <TypeSignature Language="C#" Value="public class StyleSetArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.StyleSetArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.StyleSetArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SubmitArgs.xml b/doc/en/Gtk/SubmitArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/SubmitArgs.xml
rename to doc/en/Gtk/SubmitArgs.xml
index acc170bdc..3fae27be5 100644
--- a/doc/en/GtkSharp/SubmitArgs.xml
+++ b/doc/en/Gtk/SubmitArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SubmitArgs" FullName="GtkSharp.SubmitArgs">
+<Type Name="SubmitArgs" FullName="Gtk.SubmitArgs">
   <TypeSignature Language="C#" Value="public class SubmitArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SubmitArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SubmitArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SurroundingDeletedArgs.xml b/doc/en/Gtk/SurroundingDeletedArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/SurroundingDeletedArgs.xml
rename to doc/en/Gtk/SurroundingDeletedArgs.xml
index 7335256dc..77e5a6bbf 100644
--- a/doc/en/GtkSharp/SurroundingDeletedArgs.xml
+++ b/doc/en/Gtk/SurroundingDeletedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SurroundingDeletedArgs" FullName="GtkSharp.SurroundingDeletedArgs">
+<Type Name="SurroundingDeletedArgs" FullName="Gtk.SurroundingDeletedArgs">
   <TypeSignature Language="C#" Value="public class SurroundingDeletedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SurroundingDeletedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SurroundingDeletedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/SwitchPageArgs.xml b/doc/en/Gtk/SwitchPageArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/SwitchPageArgs.xml
rename to doc/en/Gtk/SwitchPageArgs.xml
index bc473fbbe..0d5c827f6 100644
--- a/doc/en/GtkSharp/SwitchPageArgs.xml
+++ b/doc/en/Gtk/SwitchPageArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="SwitchPageArgs" FullName="GtkSharp.SwitchPageArgs">
+<Type Name="SwitchPageArgs" FullName="Gtk.SwitchPageArgs">
   <TypeSignature Language="C#" Value="public class SwitchPageArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.SwitchPageArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.SwitchPageArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TagAddedArgs.xml b/doc/en/Gtk/TagAddedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/TagAddedArgs.xml
rename to doc/en/Gtk/TagAddedArgs.xml
index 323d17682..d08af1dff 100644
--- a/doc/en/GtkSharp/TagAddedArgs.xml
+++ b/doc/en/Gtk/TagAddedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TagAddedArgs" FullName="GtkSharp.TagAddedArgs">
+<Type Name="TagAddedArgs" FullName="Gtk.TagAddedArgs">
   <TypeSignature Language="C#" Value="public class TagAddedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TagAddedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TagAddedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TagAppliedArgs.xml b/doc/en/Gtk/TagAppliedArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/TagAppliedArgs.xml
rename to doc/en/Gtk/TagAppliedArgs.xml
index 2d1812c72..f3c66cd45 100644
--- a/doc/en/GtkSharp/TagAppliedArgs.xml
+++ b/doc/en/Gtk/TagAppliedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TagAppliedArgs" FullName="GtkSharp.TagAppliedArgs">
+<Type Name="TagAppliedArgs" FullName="Gtk.TagAppliedArgs">
   <TypeSignature Language="C#" Value="public class TagAppliedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TagAppliedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TagAppliedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TagChangedArgs.xml b/doc/en/Gtk/TagChangedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/TagChangedArgs.xml
rename to doc/en/Gtk/TagChangedArgs.xml
index 76acb2b3f..7dcf4ebf0 100644
--- a/doc/en/GtkSharp/TagChangedArgs.xml
+++ b/doc/en/Gtk/TagChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TagChangedArgs" FullName="GtkSharp.TagChangedArgs">
+<Type Name="TagChangedArgs" FullName="Gtk.TagChangedArgs">
   <TypeSignature Language="C#" Value="public class TagChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TagChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TagChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TagRemovedArgs.xml b/doc/en/Gtk/TagRemovedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/TagRemovedArgs.xml
rename to doc/en/Gtk/TagRemovedArgs.xml
index 84018a76a..cdd51888c 100644
--- a/doc/en/GtkSharp/TagRemovedArgs.xml
+++ b/doc/en/Gtk/TagRemovedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TagRemovedArgs" FullName="GtkSharp.TagRemovedArgs">
+<Type Name="TagRemovedArgs" FullName="Gtk.TagRemovedArgs">
   <TypeSignature Language="C#" Value="public class TagRemovedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TagRemovedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TagRemovedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TestCollapseRowArgs.xml b/doc/en/Gtk/TestCollapseRowArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/TestCollapseRowArgs.xml
rename to doc/en/Gtk/TestCollapseRowArgs.xml
index d9380eb08..7eba03f70 100644
--- a/doc/en/GtkSharp/TestCollapseRowArgs.xml
+++ b/doc/en/Gtk/TestCollapseRowArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TestCollapseRowArgs" FullName="GtkSharp.TestCollapseRowArgs">
+<Type Name="TestCollapseRowArgs" FullName="Gtk.TestCollapseRowArgs">
   <TypeSignature Language="C#" Value="public class TestCollapseRowArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TestCollapseRowArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TestCollapseRowArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TestExpandRowArgs.xml b/doc/en/Gtk/TestExpandRowArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/TestExpandRowArgs.xml
rename to doc/en/Gtk/TestExpandRowArgs.xml
index f933f398a..1b2016a0c 100644
--- a/doc/en/GtkSharp/TestExpandRowArgs.xml
+++ b/doc/en/Gtk/TestExpandRowArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TestExpandRowArgs" FullName="GtkSharp.TestExpandRowArgs">
+<Type Name="TestExpandRowArgs" FullName="Gtk.TestExpandRowArgs">
   <TypeSignature Language="C#" Value="public class TestExpandRowArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TestExpandRowArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TestExpandRowArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TextDeletedArgs.xml b/doc/en/Gtk/TextDeletedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/TextDeletedArgs.xml
rename to doc/en/Gtk/TextDeletedArgs.xml
index 00b9b52d0..d99ea87c0 100644
--- a/doc/en/GtkSharp/TextDeletedArgs.xml
+++ b/doc/en/Gtk/TextDeletedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextDeletedArgs" FullName="GtkSharp.TextDeletedArgs">
+<Type Name="TextDeletedArgs" FullName="Gtk.TextDeletedArgs">
   <TypeSignature Language="C#" Value="public class TextDeletedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TextDeletedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TextDeletedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TextEventArgs.xml b/doc/en/Gtk/TextEventArgs.xml
similarity index 97%
rename from doc/en/GtkSharp/TextEventArgs.xml
rename to doc/en/Gtk/TextEventArgs.xml
index dcfc3820f..3332a87bd 100644
--- a/doc/en/GtkSharp/TextEventArgs.xml
+++ b/doc/en/Gtk/TextEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextEventArgs" FullName="GtkSharp.TextEventArgs">
+<Type Name="TextEventArgs" FullName="Gtk.TextEventArgs">
   <TypeSignature Language="C#" Value="public class TextEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/TextInsertedArgs.xml b/doc/en/Gtk/TextInsertedArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/TextInsertedArgs.xml
rename to doc/en/Gtk/TextInsertedArgs.xml
index 6a8152d1d..5605758b2 100644
--- a/doc/en/GtkSharp/TextInsertedArgs.xml
+++ b/doc/en/Gtk/TextInsertedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextInsertedArgs" FullName="GtkSharp.TextInsertedArgs">
+<Type Name="TextInsertedArgs" FullName="Gtk.TextInsertedArgs">
   <TypeSignature Language="C#" Value="public class TextInsertedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TextInsertedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TextInsertedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/TextPoppedArgs.xml b/doc/en/Gtk/TextPoppedArgs.xml
similarity index 96%
rename from doc/en/GtkSharp/TextPoppedArgs.xml
rename to doc/en/Gtk/TextPoppedArgs.xml
index 8d7587324..6588136a3 100644
--- a/doc/en/GtkSharp/TextPoppedArgs.xml
+++ b/doc/en/Gtk/TextPoppedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextPoppedArgs" FullName="GtkSharp.TextPoppedArgs">
+<Type Name="TextPoppedArgs" FullName="Gtk.TextPoppedArgs">
   <TypeSignature Language="C#" Value="public class TextPoppedArgs : GtkSharp.SignalArgs" Maintainer="Lee Mallabone" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/TextPushedArgs.xml b/doc/en/Gtk/TextPushedArgs.xml
similarity index 96%
rename from doc/en/GtkSharp/TextPushedArgs.xml
rename to doc/en/Gtk/TextPushedArgs.xml
index fae66c8ab..0e8a2e5d2 100644
--- a/doc/en/GtkSharp/TextPushedArgs.xml
+++ b/doc/en/Gtk/TextPushedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TextPushedArgs" FullName="GtkSharp.TextPushedArgs">
+<Type Name="TextPushedArgs" FullName="Gtk.TextPushedArgs">
   <TypeSignature Language="C#" Value="public class TextPushedArgs : GtkSharp.SignalArgs" Maintainer="Lee Mallabone" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/TitleChangedArgs.xml b/doc/en/Gtk/TitleChangedArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/TitleChangedArgs.xml
rename to doc/en/Gtk/TitleChangedArgs.xml
index 5cbe5fae3..a80a84e2c 100644
--- a/doc/en/GtkSharp/TitleChangedArgs.xml
+++ b/doc/en/Gtk/TitleChangedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="TitleChangedArgs" FullName="GtkSharp.TitleChangedArgs">
+<Type Name="TitleChangedArgs" FullName="Gtk.TitleChangedArgs">
   <TypeSignature Language="C#" Value="public class TitleChangedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.TitleChangedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.TitleChangedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ToggleCursorRowArgs.xml b/doc/en/Gtk/ToggleCursorRowArgs.xml
similarity index 93%
rename from doc/en/GtkSharp/ToggleCursorRowArgs.xml
rename to doc/en/Gtk/ToggleCursorRowArgs.xml
index e69a6e8b8..1dd8b00fa 100644
--- a/doc/en/GtkSharp/ToggleCursorRowArgs.xml
+++ b/doc/en/Gtk/ToggleCursorRowArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ToggleCursorRowArgs" FullName="GtkSharp.ToggleCursorRowArgs">
+<Type Name="ToggleCursorRowArgs" FullName="Gtk.ToggleCursorRowArgs">
   <TypeSignature Language="C#" Value="public class ToggleCursorRowArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/ToggleHandleFocusArgs.xml b/doc/en/Gtk/ToggleHandleFocusArgs.xml
similarity index 86%
rename from doc/en/GtkSharp/ToggleHandleFocusArgs.xml
rename to doc/en/Gtk/ToggleHandleFocusArgs.xml
index 2a45edc59..d9a20665a 100644
--- a/doc/en/GtkSharp/ToggleHandleFocusArgs.xml
+++ b/doc/en/Gtk/ToggleHandleFocusArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ToggleHandleFocusArgs" FullName="GtkSharp.ToggleHandleFocusArgs">
+<Type Name="ToggleHandleFocusArgs" FullName="Gtk.ToggleHandleFocusArgs">
   <TypeSignature Language="C#" Value="public class ToggleHandleFocusArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ToggleHandleFocusArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ToggleHandleFocusArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ToggleSizeAllocatedArgs.xml b/doc/en/Gtk/ToggleSizeAllocatedArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ToggleSizeAllocatedArgs.xml
rename to doc/en/Gtk/ToggleSizeAllocatedArgs.xml
index b8d2e43ad..f21002469 100644
--- a/doc/en/GtkSharp/ToggleSizeAllocatedArgs.xml
+++ b/doc/en/Gtk/ToggleSizeAllocatedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ToggleSizeAllocatedArgs" FullName="GtkSharp.ToggleSizeAllocatedArgs">
+<Type Name="ToggleSizeAllocatedArgs" FullName="Gtk.ToggleSizeAllocatedArgs">
   <TypeSignature Language="C#" Value="public class ToggleSizeAllocatedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ToggleSizeAllocatedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ToggleSizeAllocatedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ToggleSizeRequestedArgs.xml b/doc/en/Gtk/ToggleSizeRequestedArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/ToggleSizeRequestedArgs.xml
rename to doc/en/Gtk/ToggleSizeRequestedArgs.xml
index 4c11a620f..e668fd193 100644
--- a/doc/en/GtkSharp/ToggleSizeRequestedArgs.xml
+++ b/doc/en/Gtk/ToggleSizeRequestedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ToggleSizeRequestedArgs" FullName="GtkSharp.ToggleSizeRequestedArgs">
+<Type Name="ToggleSizeRequestedArgs" FullName="Gtk.ToggleSizeRequestedArgs">
   <TypeSignature Language="C#" Value="public class ToggleSizeRequestedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ToggleSizeRequestedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ToggleSizeRequestedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/ToggledArgs.xml b/doc/en/Gtk/ToggledArgs.xml
similarity index 91%
rename from doc/en/GtkSharp/ToggledArgs.xml
rename to doc/en/Gtk/ToggledArgs.xml
index c01362b4a..e4a57e366 100644
--- a/doc/en/GtkSharp/ToggledArgs.xml
+++ b/doc/en/Gtk/ToggledArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="ToggledArgs" FullName="GtkSharp.ToggledArgs">
+<Type Name="ToggledArgs" FullName="Gtk.ToggledArgs">
   <TypeSignature Language="C#" Value="public class ToggledArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.ToggledArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.ToggledArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/UnmapEventArgs.xml b/doc/en/Gtk/UnmapEventArgs.xml
similarity index 90%
rename from doc/en/GtkSharp/UnmapEventArgs.xml
rename to doc/en/Gtk/UnmapEventArgs.xml
index 13b1d2c7c..ef8debde4 100644
--- a/doc/en/GtkSharp/UnmapEventArgs.xml
+++ b/doc/en/Gtk/UnmapEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="UnmapEventArgs" FullName="GtkSharp.UnmapEventArgs">
+<Type Name="UnmapEventArgs" FullName="Gtk.UnmapEventArgs">
   <TypeSignature Language="C#" Value="public class UnmapEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.UnmapEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.UnmapEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/UnselectAllArgs.xml b/doc/en/Gtk/UnselectAllArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/UnselectAllArgs.xml
rename to doc/en/Gtk/UnselectAllArgs.xml
index c96c41740..91b8fa2d1 100644
--- a/doc/en/GtkSharp/UnselectAllArgs.xml
+++ b/doc/en/Gtk/UnselectAllArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="UnselectAllArgs" FullName="GtkSharp.UnselectAllArgs">
+<Type Name="UnselectAllArgs" FullName="Gtk.UnselectAllArgs">
   <TypeSignature Language="C#" Value="public class UnselectAllArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/UpdateArgs.xml b/doc/en/Gtk/UpdateArgs.xml
similarity index 94%
rename from doc/en/GtkSharp/UpdateArgs.xml
rename to doc/en/Gtk/UpdateArgs.xml
index 8e03fb6b5..aa83f84f5 100644
--- a/doc/en/GtkSharp/UpdateArgs.xml
+++ b/doc/en/Gtk/UpdateArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="UpdateArgs" FullName="GtkSharp.UpdateArgs">
+<Type Name="UpdateArgs" FullName="Gtk.UpdateArgs">
   <TypeSignature Language="C#" Value="public class UpdateArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.UpdateArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.UpdateArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/UrlRequestedArgs.xml b/doc/en/Gtk/UrlRequestedArgs.xml
similarity index 92%
rename from doc/en/GtkSharp/UrlRequestedArgs.xml
rename to doc/en/Gtk/UrlRequestedArgs.xml
index 79fc40530..c68fe7be5 100644
--- a/doc/en/GtkSharp/UrlRequestedArgs.xml
+++ b/doc/en/Gtk/UrlRequestedArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="UrlRequestedArgs" FullName="GtkSharp.UrlRequestedArgs">
+<Type Name="UrlRequestedArgs" FullName="Gtk.UrlRequestedArgs">
   <TypeSignature Language="C#" Value="public class UrlRequestedArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.UrlRequestedArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.UrlRequestedArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/VisibilityNotifyEventArgs.xml b/doc/en/Gtk/VisibilityNotifyEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/VisibilityNotifyEventArgs.xml
rename to doc/en/Gtk/VisibilityNotifyEventArgs.xml
index 4fdca05f9..9e3e35c6b 100644
--- a/doc/en/GtkSharp/VisibilityNotifyEventArgs.xml
+++ b/doc/en/Gtk/VisibilityNotifyEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="VisibilityNotifyEventArgs" FullName="GtkSharp.VisibilityNotifyEventArgs">
+<Type Name="VisibilityNotifyEventArgs" FullName="Gtk.VisibilityNotifyEventArgs">
   <TypeSignature Language="C#" Value="public class VisibilityNotifyEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.VisibilityNotifyEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.VisibilityNotifyEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GtkSharp/WidgetEventArgs.xml b/doc/en/Gtk/WidgetEventArgs.xml
similarity index 95%
rename from doc/en/GtkSharp/WidgetEventArgs.xml
rename to doc/en/Gtk/WidgetEventArgs.xml
index fb1d90640..fac028906 100644
--- a/doc/en/GtkSharp/WidgetEventArgs.xml
+++ b/doc/en/Gtk/WidgetEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="WidgetEventArgs" FullName="GtkSharp.WidgetEventArgs">
+<Type Name="WidgetEventArgs" FullName="Gtk.WidgetEventArgs">
   <TypeSignature Language="C#" Value="public class WidgetEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
diff --git a/doc/en/GtkSharp/WindowStateEventArgs.xml b/doc/en/Gtk/WindowStateEventArgs.xml
similarity index 89%
rename from doc/en/GtkSharp/WindowStateEventArgs.xml
rename to doc/en/Gtk/WindowStateEventArgs.xml
index 1a499e198..65bc40be0 100644
--- a/doc/en/GtkSharp/WindowStateEventArgs.xml
+++ b/doc/en/Gtk/WindowStateEventArgs.xml
@@ -1,4 +1,4 @@
-<Type Name="WindowStateEventArgs" FullName="GtkSharp.WindowStateEventArgs">
+<Type Name="WindowStateEventArgs" FullName="Gtk.WindowStateEventArgs">
   <TypeSignature Language="C#" Value="public class WindowStateEventArgs : GtkSharp.SignalArgs" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
@@ -26,7 +26,7 @@
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>To be added: an object of type 'GtkSharp.WindowStateEventArgs'</returns>
+        <returns>To be added: an object of type 'Gtk.WindowStateEventArgs'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>