49 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/pistachio/rules.mk b/keyboards/pistachio/rules.mk
deleted file mode 100644
index 93ae534be9..0000000000
--- a/keyboards/pistachio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = pistachio/rev2
-\ No newline at end of file
diff --git a/keyboards/pistachio/config.h b/keyboards/rate/pistachio/config.h
index 5ff7b3d799..5ff7b3d799 100644
--- a/keyboards/pistachio/config.h
+++ b/keyboards/rate/pistachio/config.h
diff --git a/keyboards/pistachio/info.json b/keyboards/rate/pistachio/info.json
index 8cdeb51ca3..8cdeb51ca3 100644
--- a/keyboards/pistachio/info.json
+++ b/keyboards/rate/pistachio/info.json
diff --git a/keyboards/pistachio/keymaps/default/keymap.c b/keyboards/rate/pistachio/keymaps/default/keymap.c
index 585807abdd..585807abdd 100644
--- a/keyboards/pistachio/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/default/keymap.c
diff --git a/keyboards/pistachio/keymaps/rate/keymap.c b/keyboards/rate/pistachio/keymaps/rate/keymap.c
index 34e1324aed..34e1324aed 100644
--- a/keyboards/pistachio/keymaps/rate/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/rate/keymap.c
diff --git a/keyboards/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c
index 357253ac2d..357253ac2d 100644
--- a/keyboards/pistachio/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/via/keymap.c
diff --git a/keyboards/pistachio/keymaps/via/rules.mk b/keyboards/rate/pistachio/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/pistachio/keymaps/via/rules.mk
+++ b/keyboards/rate/pistachio/keymaps/via/rules.mk
diff --git a/keyboards/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c
index 2a850f64a4..2a850f64a4 100644
--- a/keyboards/pistachio/pistachio.c
+++ b/keyboards/rate/pistachio/pistachio.c
diff --git a/keyboards/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h
index 8cbb967f49..7bf2c59ad6 100644
--- a/keyboards/pistachio/pistachio.h
+++ b/keyboards/rate/pistachio/pistachio.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_pistachio_rev1)
+#if defined(KEYBOARD_rate_pistachio_rev1)
 #    include "rev1.h"
-#elif defined(KEYBOARD_pistachio_rev2)
+#elif defined(KEYBOARD_rate_pistachio_rev2)
 #    include "rev2.h"
 #endif
diff --git a/keyboards/pistachio/readme.md b/keyboards/rate/pistachio/readme.md
index 8ff5933f4f..dc989bbe6c 100644
--- a/keyboards/pistachio/readme.md
+++ b/keyboards/rate/pistachio/readme.md
@@ -10,9 +10,9 @@ This is a 92-key split keyboard with JIS layout and spare keys.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio/rev1:default
-    make pistachio/rev2:default
+    make rate/pistachio/rev1:default
+    make rate/pistachio/rev2:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-[Build guide](https://ratelog.net/pistachio-build-guide/)
-\ No newline at end of file
+[Build guide](https://ratelog.net/pistachio-build-guide/)
diff --git a/keyboards/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index 24f121ef17..24f121ef17 100644
--- a/keyboards/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
diff --git a/keyboards/pistachio/rev1/readme.md b/keyboards/rate/pistachio/rev1/readme.md
index eae3776935..eae3776935 100644
--- a/keyboards/pistachio/rev1/readme.md
+++ b/keyboards/rate/pistachio/rev1/readme.md
diff --git a/keyboards/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c
index 5824157f53..5824157f53 100644
--- a/keyboards/pistachio/rev1/rev1.c
+++ b/keyboards/rate/pistachio/rev1/rev1.c
diff --git a/keyboards/pistachio/rev1/rev1.h b/keyboards/rate/pistachio/rev1/rev1.h
index e42de2d2b0..e42de2d2b0 100644
--- a/keyboards/pistachio/rev1/rev1.h
+++ b/keyboards/rate/pistachio/rev1/rev1.h
diff --git a/keyboards/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk
index 909b1e68de..909b1e68de 100644
--- a/keyboards/pistachio/rev1/rules.mk
+++ b/keyboards/rate/pistachio/rev1/rules.mk
diff --git a/keyboards/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index d0de298542..d0de298542 100644
--- a/keyboards/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
diff --git a/keyboards/pistachio/rev2/readme.md b/keyboards/rate/pistachio/rev2/readme.md
index 12d9f6598f..12d9f6598f 100644
--- a/keyboards/pistachio/rev2/readme.md
+++ b/keyboards/rate/pistachio/rev2/readme.md
diff --git a/keyboards/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c
index c6e64a526d..c6e64a526d 100644
--- a/keyboards/pistachio/rev2/rev2.c
+++ b/keyboards/rate/pistachio/rev2/rev2.c
diff --git a/keyboards/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h
index 750778a30e..750778a30e 100644
--- a/keyboards/pistachio/rev2/rev2.h
+++ b/keyboards/rate/pistachio/rev2/rev2.h
diff --git a/keyboards/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk
index 909b1e68de..909b1e68de 100644
--- a/keyboards/pistachio/rev2/rules.mk
+++ b/keyboards/rate/pistachio/rev2/rules.mk
diff --git a/keyboards/rate/pistachio/rules.mk b/keyboards/rate/pistachio/rules.mk
new file mode 100644
index 0000000000..a5f4485316
--- /dev/null
+++ b/keyboards/rate/pistachio/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rate/pistachio/rev2
diff --git a/keyboards/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 4da866bb7d..4da866bb7d 100644
--- a/keyboards/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/config.h
diff --git a/keyboards/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index d4e130300c..d4e130300c 100644
--- a/keyboards/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
diff --git a/keyboards/pistachio_mp/keymaps/default/keymap.c b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
index c206f30617..c206f30617 100644
--- a/keyboards/pistachio_mp/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
diff --git a/keyboards/pistachio_mp/keymaps/default/readme.md b/keyboards/rate/pistachio_mp/keymaps/default/readme.md
index 2bc50be9dd..2bc50be9dd 100644
--- a/keyboards/pistachio_mp/keymaps/default/readme.md
+++ b/keyboards/rate/pistachio_mp/keymaps/default/readme.md
diff --git a/keyboards/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
index 241b501d1d..241b501d1d 100644
--- a/keyboards/pistachio_mp/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_mp/keymaps/via/readme.md b/keyboards/rate/pistachio_mp/keymaps/via/readme.md
index b768049ccc..b768049ccc 100644
--- a/keyboards/pistachio_mp/keymaps/via/readme.md
+++ b/keyboards/rate/pistachio_mp/keymaps/via/readme.md
diff --git a/keyboards/pistachio_mp/keymaps/via/rules.mk b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/pistachio_mp/keymaps/via/rules.mk
+++ b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
diff --git a/keyboards/pistachio_mp/pistachio_mp.c b/keyboards/rate/pistachio_mp/pistachio_mp.c
index 40e75fe1b0..40e75fe1b0 100644
--- a/keyboards/pistachio_mp/pistachio_mp.c
+++ b/keyboards/rate/pistachio_mp/pistachio_mp.c
diff --git a/keyboards/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h
index d7c5c9bad9..d7c5c9bad9 100644
--- a/keyboards/pistachio_mp/pistachio_mp.h
+++ b/keyboards/rate/pistachio_mp/pistachio_mp.h
diff --git a/keyboards/pistachio_mp/readme.md b/keyboards/rate/pistachio_mp/readme.md
index 0e5b030a6e..b8ea088a4a 100644
--- a/keyboards/pistachio_mp/readme.md
+++ b/keyboards/rate/pistachio_mp/readme.md
@@ -10,12 +10,12 @@ This is a numeric keypad with a rotary encoder that uses a stainless steel plate
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio_mp:default
+    make rate/pistachio_mp:default
 
 Flashing example for this keyboard:
 
-    make pistachio_mp:default:flash
+    make rate/pistachio_mp:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
-\ No newline at end of file
+[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
diff --git a/keyboards/pistachio_mp/rules.mk b/keyboards/rate/pistachio_mp/rules.mk
index 424aed9074..424aed9074 100644
--- a/keyboards/pistachio_mp/rules.mk
+++ b/keyboards/rate/pistachio_mp/rules.mk
diff --git a/keyboards/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h
index c3cb584962..f268967f6e 100644
--- a/keyboards/pistachio_pro/config.h
+++ b/keyboards/rate/pistachio_pro/config.h
@@ -96,7 +96,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* OLED */
 #define OLED_DISPLAY_128X64
-#define OLED_FONT_H "keyboards/pistachio_pro/lib/glcdfont.c"
+#define OLED_FONT_H "keyboards/rate/pistachio_pro/lib/glcdfont.c"
 
 #define OLED_FONT_WIDTH 6
 #define OLED_FONT_HEIGHT 6
diff --git a/keyboards/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json
index c519a69e11..c519a69e11 100644
--- a/keyboards/pistachio_pro/info.json
+++ b/keyboards/rate/pistachio_pro/info.json
diff --git a/keyboards/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
index 3fe6e8a5f5..3fe6e8a5f5 100644
--- a/keyboards/pistachio_pro/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/default/readme.md b/keyboards/rate/pistachio_pro/keymaps/default/readme.md
index bf313ec19d..bf313ec19d 100644
--- a/keyboards/pistachio_pro/keymaps/default/readme.md
+++ b/keyboards/rate/pistachio_pro/keymaps/default/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/rate/keymap.c b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
index 7aa70c51d1..7aa70c51d1 100644
--- a/keyboards/pistachio_pro/keymaps/rate/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/rate/readme.md b/keyboards/rate/pistachio_pro/keymaps/rate/readme.md
index c7049b67ce..c7049b67ce 100644
--- a/keyboards/pistachio_pro/keymaps/rate/readme.md
+++ b/keyboards/rate/pistachio_pro/keymaps/rate/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
index f30254320b..f30254320b 100644
--- a/keyboards/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/via/readme.md b/keyboards/rate/pistachio_pro/keymaps/via/readme.md
index e2f4b9f6b2..e2f4b9f6b2 100644
--- a/keyboards/pistachio_pro/keymaps/via/readme.md
+++ b/keyboards/rate/pistachio_pro/keymaps/via/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/via/rules.mk b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/pistachio_pro/keymaps/via/rules.mk
+++ b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
diff --git a/keyboards/pistachio_pro/lib/bme280.c b/keyboards/rate/pistachio_pro/lib/bme280.c
index f3dc231dc5..f3dc231dc5 100644
--- a/keyboards/pistachio_pro/lib/bme280.c
+++ b/keyboards/rate/pistachio_pro/lib/bme280.c
diff --git a/keyboards/pistachio_pro/lib/bme280.h b/keyboards/rate/pistachio_pro/lib/bme280.h
index eb503038d3..eb503038d3 100644
--- a/keyboards/pistachio_pro/lib/bme280.h
+++ b/keyboards/rate/pistachio_pro/lib/bme280.h
diff --git a/keyboards/pistachio_pro/lib/glcdfont.c b/keyboards/rate/pistachio_pro/lib/glcdfont.c
index 41041f12bb..41041f12bb 100644
--- a/keyboards/pistachio_pro/lib/glcdfont.c
+++ b/keyboards/rate/pistachio_pro/lib/glcdfont.c
diff --git a/keyboards/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c
index 6cbfb6dfea..6cbfb6dfea 100644
--- a/keyboards/pistachio_pro/matrix.c
+++ b/keyboards/rate/pistachio_pro/matrix.c
diff --git a/keyboards/pistachio_pro/pistachio_pro.c b/keyboards/rate/pistachio_pro/pistachio_pro.c
index fda14471b7..fda14471b7 100644
--- a/keyboards/pistachio_pro/pistachio_pro.c
+++ b/keyboards/rate/pistachio_pro/pistachio_pro.c
diff --git a/keyboards/pistachio_pro/pistachio_pro.h b/keyboards/rate/pistachio_pro/pistachio_pro.h
index 42de95ea87..42de95ea87 100644
--- a/keyboards/pistachio_pro/pistachio_pro.h
+++ b/keyboards/rate/pistachio_pro/pistachio_pro.h
diff --git a/keyboards/pistachio_pro/readme.md b/keyboards/rate/pistachio_pro/readme.md
index b224c874e6..752f98b73b 100644
--- a/keyboards/pistachio_pro/readme.md
+++ b/keyboards/rate/pistachio_pro/readme.md
@@ -10,11 +10,11 @@ This is a JIS layout TKL keyboard with 89 keys, encoder and OLED.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio_pro:default
+    make rate/pistachio_pro:default
 
 Flashing example for this keyboard:
 
-    make pistachio_pro:default:flash
+    make rate/pistachio_pro:default:flash
 
 To reset the keyboard into bootloader mode, press the reset switch on the underside.
 
diff --git a/keyboards/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk
index 6816d8d32b..6816d8d32b 100644
--- a/keyboards/pistachio_pro/rules.mk
+++ b/keyboards/rate/pistachio_pro/rules.mk