diff --git a/README b/README
index db3b87a..cc444b7 100644
--- a/README
+++ b/README
@@ -13,3 +13,4 @@ bldr - build a binary package from an Everest package file
 install - package agnostic installation script
 prep - prepare a directory for image creation
 mkimg - create an image
+spi - install a package to a directory
diff --git a/tools/README.bldr b/tools/bldr/README.bldr
similarity index 100%
rename from tools/README.bldr
rename to tools/bldr/README.bldr
diff --git a/tools/bldr b/tools/bldr/bldr
similarity index 100%
rename from tools/bldr
rename to tools/bldr/bldr
diff --git a/tools/bldr.conf b/tools/bldr/bldr.conf
similarity index 100%
rename from tools/bldr.conf
rename to tools/bldr/bldr.conf
diff --git a/tools/README.spi b/tools/spi/README.spi
similarity index 100%
rename from tools/README.spi
rename to tools/spi/README.spi
diff --git a/tools/spi b/tools/spi/spi
similarity index 100%
rename from tools/spi
rename to tools/spi/spi