diff --git a/README.md b/README.md
index e2ded6bb..b2eb1b79 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-# Kaleidoscope-Hardware-ErgoDox
+# Kaleidoscope-Hardware-EZ-ErgoDox
 
-This is a plugin for [Kaleidoscope][fw], that adds hardware support for
-the ErgoDox.
+[![Build Status][travis:image]][travis:status]
 
- [fw]: https://github.com/keyboardio/Kaleidoscope
+ [travis:image]: https://travis-ci.org/keyboardio/Kaleidoscope-Hardware-EZ-ErgoDox.svg?branch=master
+ [travis:status]: https://travis-ci.org/keyboardio/Kaleidoscope-Hardware-EZ-ErgoDox
+
+See [doc/plugin/Hardware-EZ-ErgoDox.md](doc/plugin/Hardware-EZ-ErgoDox.md) for documentation.
diff --git a/doc/plugin/Hardware-EZ-ErgoDox.md b/doc/plugin/Hardware-EZ-ErgoDox.md
new file mode 100644
index 00000000..e2ded6bb
--- /dev/null
+++ b/doc/plugin/Hardware-EZ-ErgoDox.md
@@ -0,0 +1,6 @@
+# Kaleidoscope-Hardware-ErgoDox
+
+This is a plugin for [Kaleidoscope][fw], that adds hardware support for
+the ErgoDox.
+
+ [fw]: https://github.com/keyboardio/Kaleidoscope
diff --git a/.kaleidoscope-builder.conf b/examples/ErgoDox/.kaleidoscope-builder.conf
similarity index 100%
rename from .kaleidoscope-builder.conf
rename to examples/ErgoDox/.kaleidoscope-builder.conf
diff --git a/src/kaleidoscope/hardware/ErgoDox.cpp b/src/kaleidoscope/hardware/ErgoDox.cpp
index b05a82b9..3877b3ab 100644
--- a/src/kaleidoscope/hardware/ErgoDox.cpp
+++ b/src/kaleidoscope/hardware/ErgoDox.cpp
@@ -27,7 +27,7 @@
 #include <Kaleidoscope.h>
 #include <KeyboardioHID.h>
 #include <avr/wdt.h>
-#include "ErgoDoxScanner.h"
+#include "kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.h"
 
 namespace kaleidoscope {
 namespace hardware {
diff --git a/src/kaleidoscope/hardware/ErgoDox.h b/src/kaleidoscope/hardware/ErgoDox.h
index da48c126..5b9b2137 100644
--- a/src/kaleidoscope/hardware/ErgoDox.h
+++ b/src/kaleidoscope/hardware/ErgoDox.h
@@ -27,7 +27,7 @@
 
 #include <Arduino.h>
 
-#include "ErgoDoxScanner.h"
+#include "kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.h"
 
 #define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::ErgoDox
 #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h"
diff --git a/src/kaleidoscope/hardware/ErgoDoxScanner.cpp b/src/kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.cpp
similarity index 97%
rename from src/kaleidoscope/hardware/ErgoDoxScanner.cpp
rename to src/kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.cpp
index 869cde34..d48b6d11 100644
--- a/src/kaleidoscope/hardware/ErgoDoxScanner.cpp
+++ b/src/kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.cpp
@@ -23,9 +23,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ErgoDoxScanner.h"
+#include "kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.h"
 #include <avr/wdt.h>
-#include "i2cmaster.h"
+#include "kaleidoscope/hardware/ErgoDox/i2cmaster.h"
 
 #define I2C_ADDR        0b0100000
 #define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
diff --git a/src/kaleidoscope/hardware/ErgoDoxScanner.h b/src/kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.h
similarity index 100%
rename from src/kaleidoscope/hardware/ErgoDoxScanner.h
rename to src/kaleidoscope/hardware/ErgoDox/ErgoDoxScanner.h
diff --git a/src/kaleidoscope/hardware/i2cmaster.cpp b/src/kaleidoscope/hardware/ErgoDox/i2cmaster.cpp
similarity index 99%
rename from src/kaleidoscope/hardware/i2cmaster.cpp
rename to src/kaleidoscope/hardware/ErgoDox/i2cmaster.cpp
index 267848c1..83226857 100644
--- a/src/kaleidoscope/hardware/i2cmaster.cpp
+++ b/src/kaleidoscope/hardware/ErgoDox/i2cmaster.cpp
@@ -9,7 +9,7 @@
 #include <inttypes.h>
 #include <compat/twi.h>
 
-#include "i2cmaster.h"
+#include "kaleidoscope/hardware/ErgoDox/i2cmaster.h"
 
 
 /* define CPU frequency in Mhz here if not defined in Makefile */
diff --git a/src/kaleidoscope/hardware/i2cmaster.h b/src/kaleidoscope/hardware/ErgoDox/i2cmaster.h
similarity index 100%
rename from src/kaleidoscope/hardware/i2cmaster.h
rename to src/kaleidoscope/hardware/ErgoDox/i2cmaster.h