diff --git a/bin/build-arduino-package b/bin/build-arduino-package
index 03597349..0b04a2a3 100644
--- a/bin/build-arduino-package
+++ b/bin/build-arduino-package
@@ -32,6 +32,8 @@ chdir($checkout_path);
 `rm -rf $checkout_path/toolchain`;
 `rm -rf $checkout_path/etc`;
 `rm -rf $checkout_path/doc`;
+chdir("$checkout_dir/avr/libraries/");
+`mv Kaleidoscope/plugins/* .`;
 chdir($dir);
 `rm -rf $checkout_dir/avr/build-tools`;
 `mv $checkout_dir/avr $checkout_dir/$checkout_dir`; # A hack to get consistent naming with the old setup
diff --git a/src/kaleidoscope/driver/keyboardio/Model01Side.cpp b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/driver/keyboardio/Model01Side.cpp
similarity index 100%
rename from src/kaleidoscope/driver/keyboardio/Model01Side.cpp
rename to plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/driver/keyboardio/Model01Side.cpp
diff --git a/src/kaleidoscope/driver/keyboardio/Model01Side.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/driver/keyboardio/Model01Side.h
similarity index 100%
rename from src/kaleidoscope/driver/keyboardio/Model01Side.h
rename to plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/driver/keyboardio/Model01Side.h
diff --git a/src/kaleidoscope/driver/keyboardio/wire-protocol-constants.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/driver/keyboardio/wire-protocol-constants.h
similarity index 100%
rename from src/kaleidoscope/driver/keyboardio/wire-protocol-constants.h
rename to plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/driver/keyboardio/wire-protocol-constants.h