34 files changed, 43 insertions, 58 deletions
diff --git a/Hurd/MicroKernelFUD.mdwn b/Hurd/MicroKernelFUD.mdwn
deleted file mode 100644
index b48d2c96..00000000
--- a/Hurd/MicroKernelFUD.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This page has moved to a [[Mach/MicroKernelFUD]].
diff --git a/Hurd/contributing.mdwn b/Hurd/contributing.mdwn
index 083301ed..d86923f8 100644
--- a/Hurd/contributing.mdwn
+++ b/Hurd/contributing.mdwn
@@ -42,7 +42,7 @@ not touch the Hurd proper.
 If you are interested in developping the Hurd proper, there is
 plenty of work to do.  Before you can significantly contribute,
 take some time to learn about the system, e.g.,
-[[Mach/MicroKernelsForBeginners]].  Until you can do the basic exercises
+[[microkernels_for_beginners|microkernel/for_beginners]].  Until you can do the basic exercises
 listed there, you won't be able to significantly contribute to
 the Hurd.
 
@@ -51,4 +51,4 @@ See the [[ToDo]].
 # GNU Mach
 
 GNU Mach is the underlying microkernel used by the Hurd.  It has
-a number of deficencies [[Mach/GNUMachRevivalProject]].
+a number of deficencies; [[mach/gnumach/RevivalProject]].
diff --git a/Hurd/gettinghelp.mdwn b/Hurd/gettinghelp.mdwn
index 2b163c18..c8dfc07f 100644
--- a/Hurd/gettinghelp.mdwn
+++ b/Hurd/gettinghelp.mdwn
@@ -18,7 +18,7 @@ redistribute your contributions.
 # Essential Documentation
 
 * [[FrequentlyAskedQuestions]]
-* [[Mach/HardwareCompatibilityList]]
+* [[mach/gnumach/HardwareCompatibilityList]]
 
 # Forums
 
diff --git a/Mach/BuildingOskitMach.mdwn b/Mach/BuildingOskitMach.mdwn
index e1bf66f7..334b0669 100644
--- a/Mach/BuildingOskitMach.mdwn
+++ b/Mach/BuildingOskitMach.mdwn
@@ -69,7 +69,7 @@ In case you want to build the Hurd servers as well, you can check them out with:
 
 **_Inteface generator:_**
 
-See the [[Mig/MachInterfaceGenerator]] for more information.
+See the [[microkernel/mach/MIG]] for more information.
 
 Check it out using
 
diff --git a/Mach/OskitMach.mdwn b/Mach/OskitMach.mdwn
index 999c771e..bfa12380 100644
--- a/Mach/OskitMach.mdwn
+++ b/Mach/OskitMach.mdwn
@@ -9,13 +9,13 @@
 
 ## <a name="About"> About </a>
 
-OSKit-Mach began as a branch of the GNUMach 1.2 kernel, but since the release of GNU Mach 1.3, OSKit-Mach has been merged as the new GNUMach 2.x mainline. The [[Mach/MachHistory]] page tells a more interesting story including other operating systems who use Mach in their kernels.
+OSKit-Mach began as a branch of the GNUMach 1.2 kernel, but since the release of GNU Mach 1.3, OSKit-Mach has been merged as the new GNUMach 2.x mainline. The [[history]] page tells a more interesting story including other operating systems who use Mach in their kernels.
 
 GNU Mach 2.0 makes use of the drivers provided by [the OSKit](http://www.cs.utah.edu/flux/oskit/) from [the Flux Research Group](http://www.cs.utah.edu/flux/). The OSKit provided a neat driver base where both [[TWiki/FreeBSD]] and Linux (2.2.12) drivers are made available to [Mach](http://www-2.cs.cmu.edu/afs/cs/project/mach/public/www/mach.html) and thus the Hurd. However, OSKit isn't maintained anymore.
 
 ## <a name="Status"> Status </a>
 
-The OSKit-Mach version of GNUmach is today (2005) more or less defunct. Nobody is working on it. Few people ever got it running, and by now there are also problems building with recent toolchains. Instead, the Hurd developers now concentrate on completely different microkernels (Coyotos being the current favourite), as well as on improving the original GNU Mach 1.x codebase. (See also [[GNUMachRevivalProject]].)
+The OSKit-Mach version of GNUmach is today (2005) more or less defunct. Nobody is working on it. Few people ever got it running, and by now there are also problems building with recent toolchains. Instead, the Hurd developers now concentrate on completely different microkernels (Coyotos being the current favourite), as well as on improving the original GNU Mach 1.x codebase. (See also [[gnumach/RevivalProject]].)
 
 The [[MailingLists]], or the [[IRC]] is, like always, the best source of more current information.
 
diff --git a/Mach/UsefulOskitPatches.mdwn b/Mach/UsefulOskitPatches.mdwn
deleted file mode 100644
index 6718610c..00000000
--- a/Mach/UsefulOskitPatches.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-This page has been moved to [[OskitPatches]].
-
--- [[Main/JoachimNilsson]] - 08 Jan 2003
diff --git a/Mig/MachInterfaceGenerator.mdwn b/Mig/MachInterfaceGenerator.mdwn
deleted file mode 100644
index 55f88946..00000000
--- a/Mig/MachInterfaceGenerator.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-## <a name="MIG"> </a> MIG
-
-MIG is the Mach 3.0 interface generator, as maintained by the GNU Hurd developers for the GNU project.
-
-The interface generator produces stub code from interface definition (.defs) files. The stub code makes it easy to implement and use Mach interfaces as remote procedure calls (RPC).
-
-You need this tool to compile the GNU Mach and Hurd distributions, and to compile the GNU C library for the Hurd. Also, you will need it for other software in the GNU systems that uses Mach-based inter-process communication.
-
-## <a name="Status_of_the_project"> Status of the project </a>
-
-MIG 1.3 was released in March 2002, and features compatibility with OSF Mach.
-
-----
-
-Copyright (C) 2001 Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA
-
-Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.
diff --git a/idl.mdwn b/idl.mdwn
index 0a600a6a..2086bfea 100644
--- a/idl.mdwn
+++ b/idl.mdwn
@@ -17,6 +17,6 @@ redistribute your contributions.
 
 An IDL is an interface definition language.  The most well-known is
 CORBA.  An IDL compiler takes a specification and generates stubs
-that hide the transport details.  In the case of [[MIG]], this
+that hide the transport details.  In the case of [[microkernel/mach/MIG]], this
 hides the marshalling and unmarshalling of parameters according
-to Mach's semantics.
+to [[microkernel/Mach]]'s semantics.
diff --git a/liedtke.mdwn b/liedtke.mdwn
index a2807f5c..1c573afe 100644
--- a/liedtke.mdwn
+++ b/liedtke.mdwn
@@ -15,4 +15,4 @@ your rights under copyright, including the rights to copy, modify, and
 redistribute your contributions.
 """]]
 
-Liedtke is the father of [[L4]].
+Liedtke is the father of [[microkernel/L4]].
diff --git a/microkernel.mdwn b/microkernel.mdwn
index 6d719ac4..56268b61 100644
--- a/microkernel.mdwn
+++ b/microkernel.mdwn
@@ -30,3 +30,9 @@ Other notable microkernels include Hydra, KeyKOS, Eros and L4.
 
 An [introduction](http://www.cs.cornell.edu/Info/People/ulfar/ukernel/ukernel.html) by 
 Úlfar Erlingsson and Athanasios Kyparlis (from 1996) to microkernel concepts.
+
+[[Research]].
+
+[[Microkernels_for_beginners|for_beginners]].
+
+A 2002 article about [[microkernel_FUD|FUD]] (Fear, Uncertainty, Doubt).
diff --git a/Mach/MicroKernelsForBeginners.mdwn b/microkernel/for_beginners.mdwn
index 0fa7bd17..24daf290 100644
--- a/Mach/MicroKernelsForBeginners.mdwn
+++ b/microkernel/for_beginners.mdwn
@@ -20,15 +20,15 @@ redistribute your contributions.
 A [[microkernel]] implements a minimal number of abstractions
 that facilitate the realization of operating system services.
 
-[[MachConcepts]] are documented here.
+[[Mach's_concepts|mach/concepts]] are documented here.
 
 Read OSF's Kernel Principles.  Find it under the
-[[documentation]] link.
+[[mach/documentation]] link.
 
 # Exercises
 
 Mach's API is documented in OSF's Kernel API book.  Find it
-under the [[documentation]] link.  Skim it to get an idea
+under the [[mach/documentation]] link.  Skim it to get an idea
 of how the API looks and then try the following exercises:
 
 Send messages using Mach's IPC mechanism
diff --git a/Mach/MicroKernelFUD.mdwn b/microkernel/fud.mdwn
index bc2e366b..bc2e366b 100644
--- a/Mach/MicroKernelFUD.mdwn
+++ b/microkernel/fud.mdwn
diff --git a/Mach.mdwn b/microkernel/mach.mdwn
index 7b051a01..9da27269 100644
--- a/Mach.mdwn
+++ b/microkernel/mach.mdwn
@@ -1,16 +1,16 @@
 Mach is a so-called first generation [[microkernel]].  It is the
 microkernel currently used by the [[Hurd]].
 
-* [[MachConcepts]]
-* [[MachHistory]] ([Torvalds, Tanenbaum Debate](http://www.dina.dk/~abraham/Linus_vs_Tanenbaum.html))
-
-* [[MicroKernelsForBeginners]]
-* [[MicroKernelFUD]]: Fear, Uncertainty, Doubt
-* [[MicroKernelResearch]]
-
+* [[Documentation]]
+* [[Concepts]]
+* [[History]] ([Torvalds, Tanenbaum Debate](http://www.dina.dk/~abraham/Linus_vs_Tanenbaum.html))
 
 # Implementations
 
 * [[GNUMach]]
 * [[OskitMach]] - A Once Successor of Mach based on OSKit
 * [Apple's Darwin](http://developer.apple.com/darwin/) ([API](http://developer.apple.com/documentation/Darwin/Conceptual/KernelProgramming/index.html)) (**non-free**)
+
+# Related
+
+* [[Mach_Interface_Generator|mig]]
diff --git a/Mach/MachConcepts.mdwn b/microkernel/mach/concepts.mdwn
index f81e4e4f..f81e4e4f 100644
--- a/Mach/MachConcepts.mdwn
+++ b/microkernel/mach/concepts.mdwn
diff --git a/Mach/discussion.mdwn b/microkernel/mach/discussion.mdwn
index 589e302d..589e302d 100644
--- a/Mach/discussion.mdwn
+++ b/microkernel/mach/discussion.mdwn
diff --git a/Mach/documentation.mdwn b/microkernel/mach/documentation.mdwn
index bb91313c..bb91313c 100644
--- a/Mach/documentation.mdwn
+++ b/microkernel/mach/documentation.mdwn
diff --git a/mach/externalpagermechanism.mdwn b/microkernel/mach/externalpagermechanism.mdwn
index cdd25040..1ccab6c4 100644
--- a/mach/externalpagermechanism.mdwn
+++ b/microkernel/mach/externalpagermechanism.mdwn
@@ -24,7 +24,7 @@ latter.
 
 In Mach, a task's [[Mach/AddressSpace]] consists of references
 to [[Mach/MemoryObjects]].  A memory object is designated using
-a [[Mach/Port]] (a port is just a [[capability]]) and
+a [[port]] (a port is just a [[capability]]) and
 implemented by a normal process.
 
 To associate a memory object with a portion of a task's
diff --git a/Mach/GNUMach.mdwn b/microkernel/mach/gnumach.mdwn
index 2fe02dcf..4e00df8c 100644
--- a/Mach/GNUMach.mdwn
+++ b/microkernel/mach/gnumach.mdwn
@@ -25,6 +25,7 @@ added using glue code, i.e., a Linux emulation layer in Mach.
 
 # Related Links
 
-* [[BuildingGNUMach]]
-* [[GNUMachRevivalProject]] - GNU Mach Projects
+* [[Building]]
+* [[RevivalProject]] - GNU Mach Projects
+* [[HardwareCompatibilityList]]
 * [[Ports]] - Ports to other Architectures
diff --git a/Mach/BuildingGNUMach.mdwn b/microkernel/mach/gnumach/building.mdwn
index 163cc9e1..a85490e2 100644
--- a/Mach/BuildingGNUMach.mdwn
+++ b/microkernel/mach/gnumach/building.mdwn
@@ -37,7 +37,7 @@ Building GNU Mach requires the _build-essential_ and _fakeroot_ packages, their
 
 ### <a name="_on_non_Debian_systems"> ... on non-Debian systems </a>
 
-Apart from the case that you only want to install GNU Mach's header files (see below), building GNU Mach requires you to have the Mach Interface Generator installed. See [[Mig/BuildingMIG]] about how to do that, then come back here.
+Apart from the case that you only want to install GNU Mach's header files (see below), building GNU Mach requires you to have the Mach Interface Generator installed. See [[building_MIG|mig/Building]] about how to do that, then come back here.
 
 Additionally, building GNU Mach requires a C compiler, a standard C library and your favourite flavor of awk (gawk) and GNU make.
 
diff --git a/Mach/hardwarecompatibilitylist.mdwn b/microkernel/mach/gnumach/hardwarecompatibilitylist.mdwn
index c3f59af1..c3f59af1 100644
--- a/Mach/hardwarecompatibilitylist.mdwn
+++ b/microkernel/mach/gnumach/hardwarecompatibilitylist.mdwn
diff --git a/Mach/hardwarecompatibilitylist/discussion.mdwn b/microkernel/mach/gnumach/hardwarecompatibilitylist/discussion.mdwn
index 69ca3190..69ca3190 100644
--- a/Mach/hardwarecompatibilitylist/discussion.mdwn
+++ b/microkernel/mach/gnumach/hardwarecompatibilitylist/discussion.mdwn
diff --git a/Mach/GNUMach/ports.mdwn b/microkernel/mach/gnumach/ports.mdwn
index 9c9e5515..9c9e5515 100644
--- a/Mach/GNUMach/ports.mdwn
+++ b/microkernel/mach/gnumach/ports.mdwn
diff --git a/Mach/GNUMachRevivalProject.mdwn b/microkernel/mach/gnumach/revivalproject.mdwn
index b04b695f..b04b695f 100644
--- a/Mach/GNUMachRevivalProject.mdwn
+++ b/microkernel/mach/gnumach/revivalproject.mdwn
diff --git a/Mach/MachHistory.mdwn b/microkernel/mach/history.mdwn
index d108225b..fe3247df 100644
--- a/Mach/MachHistory.mdwn
+++ b/microkernel/mach/history.mdwn
@@ -36,7 +36,7 @@ Meanwhile, OSKit became unmaintained, thus posing more of a burden on than being
 
 In 2005 Gianluca Guida started a different attempt to use the osenv interface with minimal changes to GNU Mach 1.x, thus allowing use of the generic driver interface while importing as little of the umaintained OSKit code as possible. However, there turned out to be serious problems with OSKit, so this attempt was abandoned as well.
 
-Today, GNU Mach development focuses on the 1.x branch again -- see also [[GNUMachRevivalProject]].
+Today, GNU Mach development focuses on the 1.x branch again -- see also [[gnumach/RevivalProject]].
 
 # <a name="Status_of_the_project"> Status of the project </a>
 
diff --git a/Mach/mach/ipc.mdwn b/microkernel/mach/ipc.mdwn
index 68fa9d0e..01a9a891 100644
--- a/Mach/mach/ipc.mdwn
+++ b/microkernel/mach/ipc.mdwn
@@ -15,6 +15,8 @@ your rights under copyright, including the rights to copy, modify, and
 redistribute your contributions.
 """]]
 
-An IPC is sent by invoking a [[Mach/Port]].
+An IPC is sent by invoking a [[port]].
 
 [The Unofficial GNU Mach IPC beginner's guide](http://www.nongnu.org/hurdextras/ipc_guide/ipc_guide.html)
+
+[[General_information|/ipc]] about IPC.
diff --git a/Mig.mdwn b/microkernel/mach/mig.mdwn
index bdf85a1b..b15b8f50 100644
--- a/Mig.mdwn
+++ b/microkernel/mach/mig.mdwn
@@ -1,4 +1,4 @@
-The [[MachInterfaceGenerator]] (MIG) is an [[IDL]] compiler.  Based on an
+The Mach Interface Generator (MIG) is an [[IDL]] compiler.  Based on an
 interface definition, it creates stubs to [[invoke]] object methods
 and to demultiplex incoming messages.  These stubs conveniently hide
 the details of Mach's [[IPC]] machinery.
@@ -6,5 +6,5 @@ the details of Mach's [[IPC]] machinery.
 GNU MIG is fully compatible with OSF MIG.
 
 * MIG's [homepage](http://www.gnu.org/software/hurd/mig.html)
-* [[MigDocumentation]]
-* [[BuildingMIG]] - Building (and obtaining) MIG
+* [[Documentation]]
+* [[Building]] - Building (and obtaining) MIG
diff --git a/Mig/WebPreferences/logo.png b/microkernel/mach/mig/WebPreferences/logo.png
index cdfec179..cdfec179 100644
--- a/Mig/WebPreferences/logo.png
+++ b/microkernel/mach/mig/WebPreferences/logo.png
diff --git a/Mig/BuildingMIG.mdwn b/microkernel/mach/mig/building.mdwn
index 471edea2..08a1c14b 100644
--- a/Mig/BuildingMIG.mdwn
+++ b/microkernel/mach/mig/building.mdwn
@@ -29,7 +29,7 @@ Building the Mach Interface Generator requires the _build-essential_ and _fakero
 
 Building the Mach Interface Generator requires a C compiler, a standard C library (with corresponding header files) and your favourite flavor of awk (gawk), yacc (bison), lex (flex) and make.
 
-Additionally, you need to have GNU Mach's header files installed. See [[Mach/BuildingGNUMach]] about how to do that, then come back here.
+Additionally, you need to have GNU Mach's header files installed. See [[mach/gnumach/building]] about how to do that, then come back here.
 
 ## <a name="Building_and_Installing"> Building and Installing </a>
 
diff --git a/Mig/discussion.mdwn b/microkernel/mach/mig/discussion.mdwn
index fdab3a45..fdab3a45 100644
--- a/Mig/discussion.mdwn
+++ b/microkernel/mach/mig/discussion.mdwn
diff --git a/Mig/MigDocumentation.mdwn b/microkernel/mach/mig/documentation.mdwn
index c876e494..222f89d1 100644
--- a/Mig/MigDocumentation.mdwn
+++ b/microkernel/mach/mig/documentation.mdwn
@@ -2,9 +2,9 @@
 
 # About
 
-This is a small collection of links to external documents describing the [[MachInterfaceGenerator]] used by GNU Mach.
+This is a small collection of links to external documents describing the Mach Interface Generator used by GNU Mach.
 
-# MiG and C Thread Programming
+# MIG and C Thread Programming
 
 A tutorial which demonstrates the use of the C Threads library primitives in writing a multithreaded program and the use of the Mach Interface Generator (MIG) to generate remote procedure calls for interprocess communication. Like its companion tutorial, it is based on the Mach 2.5 system. However, the concepts are applicable to Mach 3.0 user level programming.
 
diff --git a/Mach/mach/ports.mdwn b/microkernel/mach/port.mdwn
index 47ef427a..47ef427a 100644
--- a/Mach/mach/ports.mdwn
+++ b/microkernel/mach/port.mdwn
diff --git a/Mach/MicroKernelResearch.mdwn b/microkernel/research.mdwn
index 4eefe602..4eefe602 100644
--- a/Mach/MicroKernelResearch.mdwn
+++ b/microkernel/research.mdwn
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 88ba8c21..4454ce28 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -36,12 +36,9 @@ redistribute your contributions.
   * *[[Status|Hurd/GNUHurdStatus]]*
   * *[[Hurd/Documentation]]*
   * *[[Hurd/Running]]*"]]
-* **[[Mach]]**[[if test="destpage(Mach*)" then="
-  * *[[GNU_Mach|Mach/GNUMach]]*
-  * *[[Mach/Documentation]]*"]]
-* **[[Mig]]**[[if test="destpage(Mig*)" then="
-  * *[[About|Mig/MachInterfaceGenerator]]*
-  * *[[Documentation|Mig/MigDocumentation]]*"]]
+* **[[microkernel/Mach]]**[[if test="destpage(microkernel/mach*)" then="
+  * *[[GNU_Mach|microkernel/mach/gnumach]]*
+  * *[[microkernel/mach/Documentation]]*"]]
 
 ---
 
diff --git a/mach/tcb.mdwn b/tcb.mdwn
index 841b85fa..841b85fa 100644
--- a/mach/tcb.mdwn
+++ b/tcb.mdwn