diff --git a/Documentation/util.md b/Documentation/util.md
index b618dcc..ddcd2a1 100644
--- a/Documentation/util.md
+++ b/Documentation/util.md
@@ -25,7 +25,7 @@
 * __cavium__ - Devicetree_convert Tool to convert a DTB to a static C
 file `Python`
 * __cbfstool__
-	* [_cbfstool_](cbfstool/index.md) - For manipulating CBFS file
+	* [_cbfstool_](util/cbfstool/index.md) - For manipulating CBFS file
 `C`
 	* _fmaptool_ - Converts plaintext fmd files into fmap blobs `C`
 	* _rmodtool_ - Creates rmodules `C`
@@ -50,7 +50,7 @@
 * __genbuild_h__ - Generate build system definitions `Shell`
 * __gitconfig__ - Initialize git repository submodules install git
 hooks `Bash`
-* [__ifdtool__](ifdtool/index.md) - Extract and dump Intel Firmware
+* [__ifdtool__](util/ifdtool/index.md) - Extract and dump Intel Firmware
 Descriptor information `C`
 * __intelmetool__ - Dump interesting things about Management Engine
 even if hidden `C`
@@ -155,7 +155,8 @@
 
  ## In depth documentation
 
-* [ifdtool](ifdtool/index.md)
+* [cbfstool](util/cbfstool/index.md)
+* [ifdtool](util/ifdtool/index.md)
 
 ## Generated documentation
 
diff --git a/Documentation/cbfstool/index.md b/Documentation/util/cbfstool/index.md
similarity index 100%
rename from Documentation/cbfstool/index.md
rename to Documentation/util/cbfstool/index.md
diff --git a/Documentation/cbfstool/mmap_windows.md b/Documentation/util/cbfstool/mmap_windows.md
similarity index 100%
rename from Documentation/cbfstool/mmap_windows.md
rename to Documentation/util/cbfstool/mmap_windows.md
diff --git a/Documentation/cbfstool/mmap_windows.svg b/Documentation/util/cbfstool/mmap_windows.svg
similarity index 100%
rename from Documentation/cbfstool/mmap_windows.svg
rename to Documentation/util/cbfstool/mmap_windows.svg
diff --git a/Documentation/ifdtool/binary_extraction.md b/Documentation/util/ifdtool/binary_extraction.md
similarity index 100%
rename from Documentation/ifdtool/binary_extraction.md
rename to Documentation/util/ifdtool/binary_extraction.md
diff --git a/Documentation/ifdtool/index.md b/Documentation/util/ifdtool/index.md
similarity index 100%
rename from Documentation/ifdtool/index.md
rename to Documentation/util/ifdtool/index.md
diff --git a/Documentation/ifdtool/layout.md b/Documentation/util/ifdtool/layout.md
similarity index 97%
rename from Documentation/ifdtool/layout.md
rename to Documentation/util/ifdtool/layout.md
index 77319b8..f89cc03 100644
--- a/Documentation/ifdtool/layout.md
+++ b/Documentation/util/ifdtool/layout.md
@@ -2,7 +2,7 @@
 
 A coreboot image for an Intel SoC contains two separate definitions of the
 layout of the flash. The Intel Flash Descriptor (IFD) which defines offsets and
-sizes of various regions of flash and the [coreboot FMAP](../lib/flashmap.md).
+sizes of various regions of flash and the [coreboot FMAP](../../lib/flashmap.md).
 
 The FMAP should define all of the of the regions defined by the IFD to ensure
 that those regions are accounted for by coreboot and will not be accidentally