diff --git a/keyboards/gh60/config.h b/keyboards/gh60/revc/config.h
similarity index 99%
rename from keyboards/gh60/config.h
rename to keyboards/gh60/revc/config.h
index 8b7391faf1..e0cfa7268d 100644
--- a/keyboards/gh60/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -14,10 +14,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
#include "config_common.h"
/* USB Device descriptor parameter */
@@ -152,5 +148,3 @@ along with this program. If not, see .
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/gh60/info.json b/keyboards/gh60/revc/info.json
similarity index 100%
rename from keyboards/gh60/info.json
rename to keyboards/gh60/revc/info.json
diff --git a/keyboards/gh60/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/bluezio/keymap.c
rename to keyboards/gh60/revc/keymaps/bluezio/keymap.c
diff --git a/keyboards/gh60/keymaps/bluezio/rules.mk b/keyboards/gh60/revc/keymaps/bluezio/rules.mk
similarity index 100%
rename from keyboards/gh60/keymaps/bluezio/rules.mk
rename to keyboards/gh60/revc/keymaps/bluezio/rules.mk
diff --git a/keyboards/gh60/keymaps/chaser/README.md b/keyboards/gh60/revc/keymaps/chaser/README.md
similarity index 100%
rename from keyboards/gh60/keymaps/chaser/README.md
rename to keyboards/gh60/revc/keymaps/chaser/README.md
diff --git a/keyboards/gh60/keymaps/chaser/keymap.c b/keyboards/gh60/revc/keymaps/chaser/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/chaser/keymap.c
rename to keyboards/gh60/revc/keymaps/chaser/keymap.c
diff --git a/keyboards/gh60/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
similarity index 100%
rename from keyboards/gh60/keymaps/dbroqua/config.h
rename to keyboards/gh60/revc/keymaps/dbroqua/config.h
diff --git a/keyboards/gh60/keymaps/dbroqua/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/dbroqua/keymap.c
rename to keyboards/gh60/revc/keymaps/dbroqua/keymap.c
diff --git a/keyboards/gh60/keymaps/dbroqua/rules.mk b/keyboards/gh60/revc/keymaps/dbroqua/rules.mk
similarity index 100%
rename from keyboards/gh60/keymaps/dbroqua/rules.mk
rename to keyboards/gh60/revc/keymaps/dbroqua/rules.mk
diff --git a/keyboards/gh60/keymaps/dbroqua_7U/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/dbroqua_7U/keymap.c
rename to keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
diff --git a/keyboards/gh60/keymaps/dbroqua_7U/rules.mk b/keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk
similarity index 100%
rename from keyboards/gh60/keymaps/dbroqua_7U/rules.mk
rename to keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk
diff --git a/keyboards/gh60/keymaps/default/keymap.c b/keyboards/gh60/revc/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/default/keymap.c
rename to keyboards/gh60/revc/keymaps/default/keymap.c
diff --git a/keyboards/gh60/keymaps/emiilsd/keymap.c b/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/emiilsd/keymap.c
rename to keyboards/gh60/revc/keymaps/emiilsd/keymap.c
diff --git a/keyboards/gh60/keymaps/maartenwut/keymap.c b/keyboards/gh60/revc/keymaps/maartenwut/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/maartenwut/keymap.c
rename to keyboards/gh60/revc/keymaps/maartenwut/keymap.c
diff --git a/keyboards/gh60/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h
similarity index 100%
rename from keyboards/gh60/keymaps/maxr1998/config.h
rename to keyboards/gh60/revc/keymaps/maxr1998/config.h
diff --git a/keyboards/gh60/keymaps/maxr1998/keymap.c b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/maxr1998/keymap.c
rename to keyboards/gh60/revc/keymaps/maxr1998/keymap.c
diff --git a/keyboards/gh60/keymaps/maxr1998/rules.mk b/keyboards/gh60/revc/keymaps/maxr1998/rules.mk
similarity index 100%
rename from keyboards/gh60/keymaps/maxr1998/rules.mk
rename to keyboards/gh60/revc/keymaps/maxr1998/rules.mk
diff --git a/keyboards/gh60/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
similarity index 100%
rename from keyboards/gh60/keymaps/robotmaxtron/config.h
rename to keyboards/gh60/revc/keymaps/robotmaxtron/config.h
diff --git a/keyboards/gh60/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/robotmaxtron/keymap.c
rename to keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
diff --git a/keyboards/gh60/keymaps/robotmaxtron/readme.md b/keyboards/gh60/revc/keymaps/robotmaxtron/readme.md
similarity index 100%
rename from keyboards/gh60/keymaps/robotmaxtron/readme.md
rename to keyboards/gh60/revc/keymaps/robotmaxtron/readme.md
diff --git a/keyboards/gh60/keymaps/robotmaxtron/rules.mk b/keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk
similarity index 100%
rename from keyboards/gh60/keymaps/robotmaxtron/rules.mk
rename to keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk
diff --git a/keyboards/gh60/keymaps/sethbc/keymap.c b/keyboards/gh60/revc/keymaps/sethbc/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/sethbc/keymap.c
rename to keyboards/gh60/revc/keymaps/sethbc/keymap.c
diff --git a/keyboards/gh60/keymaps/sethbc/rules.mk b/keyboards/gh60/revc/keymaps/sethbc/rules.mk
similarity index 100%
rename from keyboards/gh60/keymaps/sethbc/rules.mk
rename to keyboards/gh60/revc/keymaps/sethbc/rules.mk
diff --git a/keyboards/gh60/keymaps/xyverz/keymap.c b/keyboards/gh60/revc/keymaps/xyverz/keymap.c
similarity index 100%
rename from keyboards/gh60/keymaps/xyverz/keymap.c
rename to keyboards/gh60/revc/keymaps/xyverz/keymap.c
diff --git a/keyboards/gh60/pinout.txt b/keyboards/gh60/revc/pinout.txt
similarity index 100%
rename from keyboards/gh60/pinout.txt
rename to keyboards/gh60/revc/pinout.txt
diff --git a/keyboards/gh60/readme.md b/keyboards/gh60/revc/readme.md
similarity index 83%
rename from keyboards/gh60/readme.md
rename to keyboards/gh60/revc/readme.md
index b63cce9735..cb0d953514 100644
--- a/keyboards/gh60/readme.md
+++ b/keyboards/gh60/revc/readme.md
@@ -1,5 +1,4 @@
-GH60
-===
+# GH60 Rev C
@@ -11,7 +10,9 @@ Hardware Availability: http://blog.komar.be/projects/gh60-programmable-keyboard/
Make example for this keyboard (after setting up your build environment):
- make gh60:default
+ make gh60/revc:default
+
+**Note:** This GH60 firmware will not be compatible with the GH60 Satan PCB. Conversely, the GH60 Satan firmware will not be compatible with this PCB. Please ensure you have the correct firmware/pcb combination before flashing.
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).
diff --git a/keyboards/gh60/gh60.c b/keyboards/gh60/revc/revc.c
similarity index 97%
rename from keyboards/gh60/gh60.c
rename to keyboards/gh60/revc/revc.c
index 10ae893594..e06739d2ba 100644
--- a/keyboards/gh60/gh60.c
+++ b/keyboards/gh60/revc/revc.c
@@ -1,4 +1,4 @@
-#include "gh60.h"
+#include "revc.h"
extern inline void gh60_caps_led_on(void);
diff --git a/keyboards/gh60/gh60.h b/keyboards/gh60/revc/revc.h
similarity index 100%
rename from keyboards/gh60/gh60.h
rename to keyboards/gh60/revc/revc.h
diff --git a/keyboards/gh60/rules.mk b/keyboards/gh60/revc/rules.mk
similarity index 97%
rename from keyboards/gh60/rules.mk
rename to keyboards/gh60/revc/rules.mk
index a4ee56d84a..bf7ea514d6 100644
--- a/keyboards/gh60/rules.mk
+++ b/keyboards/gh60/revc/rules.mk
@@ -50,7 +50,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
# CONSOLE_ENABLE = yes # Console for debug(+400)
diff --git a/keyboards/satan/config.h b/keyboards/gh60/satan/config.h
similarity index 100%
rename from keyboards/satan/config.h
rename to keyboards/gh60/satan/config.h
diff --git a/keyboards/satan/info.json b/keyboards/gh60/satan/info.json
similarity index 100%
rename from keyboards/satan/info.json
rename to keyboards/gh60/satan/info.json
diff --git a/keyboards/satan/keymaps/abhixec/keymap.c b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/abhixec/keymap.c
rename to keyboards/gh60/satan/keymaps/abhixec/keymap.c
diff --git a/keyboards/satan/keymaps/abhixec/readme.md b/keyboards/gh60/satan/keymaps/abhixec/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/abhixec/readme.md
rename to keyboards/gh60/satan/keymaps/abhixec/readme.md
diff --git a/keyboards/satan/keymaps/abhixec/rules.mk b/keyboards/gh60/satan/keymaps/abhixec/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/abhixec/rules.mk
rename to keyboards/gh60/satan/keymaps/abhixec/rules.mk
diff --git a/keyboards/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/addcninblue/keymap.c
rename to keyboards/gh60/satan/keymaps/addcninblue/keymap.c
diff --git a/keyboards/satan/keymaps/addcninblue/readme.md b/keyboards/gh60/satan/keymaps/addcninblue/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/addcninblue/readme.md
rename to keyboards/gh60/satan/keymaps/addcninblue/readme.md
diff --git a/keyboards/satan/keymaps/addcninblue/rules.mk b/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/addcninblue/rules.mk
rename to keyboards/gh60/satan/keymaps/addcninblue/rules.mk
diff --git a/keyboards/satan/keymaps/admiralStrokers/config.h b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
similarity index 100%
rename from keyboards/satan/keymaps/admiralStrokers/config.h
rename to keyboards/gh60/satan/keymaps/admiralStrokers/config.h
diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/admiralStrokers/keymap.c
rename to keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
diff --git a/keyboards/satan/keymaps/admiralStrokers/readme.md b/keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/admiralStrokers/readme.md
rename to keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
diff --git a/keyboards/satan/keymaps/admiralStrokers/rules.mk b/keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/admiralStrokers/rules.mk
rename to keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
diff --git a/keyboards/satan/keymaps/ben_iso/config.h b/keyboards/gh60/satan/keymaps/ben_iso/config.h
similarity index 100%
rename from keyboards/satan/keymaps/ben_iso/config.h
rename to keyboards/gh60/satan/keymaps/ben_iso/config.h
diff --git a/keyboards/satan/keymaps/ben_iso/keymap.c b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/ben_iso/keymap.c
rename to keyboards/gh60/satan/keymaps/ben_iso/keymap.c
diff --git a/keyboards/satan/keymaps/ben_iso/readme.md b/keyboards/gh60/satan/keymaps/ben_iso/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/ben_iso/readme.md
rename to keyboards/gh60/satan/keymaps/ben_iso/readme.md
diff --git a/keyboards/satan/keymaps/ben_iso/rules.mk b/keyboards/gh60/satan/keymaps/ben_iso/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/ben_iso/rules.mk
rename to keyboards/gh60/satan/keymaps/ben_iso/rules.mk
diff --git a/keyboards/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/bri/keymap.c
rename to keyboards/gh60/satan/keymaps/bri/keymap.c
diff --git a/keyboards/satan/keymaps/bri/readme.md b/keyboards/gh60/satan/keymaps/bri/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/bri/readme.md
rename to keyboards/gh60/satan/keymaps/bri/readme.md
diff --git a/keyboards/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/chaser/keymap.c
rename to keyboards/gh60/satan/keymaps/chaser/keymap.c
diff --git a/keyboards/satan/keymaps/chaser/readme.md b/keyboards/gh60/satan/keymaps/chaser/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/chaser/readme.md
rename to keyboards/gh60/satan/keymaps/chaser/readme.md
diff --git a/keyboards/satan/keymaps/chaser/rules.mk b/keyboards/gh60/satan/keymaps/chaser/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/chaser/rules.mk
rename to keyboards/gh60/satan/keymaps/chaser/rules.mk
diff --git a/keyboards/satan/keymaps/colemak/keymap.c b/keyboards/gh60/satan/keymaps/colemak/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/colemak/keymap.c
rename to keyboards/gh60/satan/keymaps/colemak/keymap.c
diff --git a/keyboards/satan/keymaps/colemak/readme.md b/keyboards/gh60/satan/keymaps/colemak/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/colemak/readme.md
rename to keyboards/gh60/satan/keymaps/colemak/readme.md
diff --git a/keyboards/satan/keymaps/colemak/rules.mk b/keyboards/gh60/satan/keymaps/colemak/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/colemak/rules.mk
rename to keyboards/gh60/satan/keymaps/colemak/rules.mk
diff --git a/keyboards/satan/keymaps/dbroqua/keymap.c b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/dbroqua/keymap.c
rename to keyboards/gh60/satan/keymaps/dbroqua/keymap.c
diff --git a/keyboards/satan/keymaps/dbroqua/readme.md b/keyboards/gh60/satan/keymaps/dbroqua/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/dbroqua/readme.md
rename to keyboards/gh60/satan/keymaps/dbroqua/readme.md
diff --git a/keyboards/satan/keymaps/default/keymap.c b/keyboards/gh60/satan/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/default/keymap.c
rename to keyboards/gh60/satan/keymaps/default/keymap.c
diff --git a/keyboards/satan/keymaps/default/readme.md b/keyboards/gh60/satan/keymaps/default/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/default/readme.md
rename to keyboards/gh60/satan/keymaps/default/readme.md
diff --git a/keyboards/satan/keymaps/default/rules.mk b/keyboards/gh60/satan/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/default/rules.mk
rename to keyboards/gh60/satan/keymaps/default/rules.mk
diff --git a/keyboards/satan/keymaps/dende_iso/keymap.c b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/dende_iso/keymap.c
rename to keyboards/gh60/satan/keymaps/dende_iso/keymap.c
diff --git a/keyboards/satan/keymaps/dende_iso/readme.md b/keyboards/gh60/satan/keymaps/dende_iso/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/dende_iso/readme.md
rename to keyboards/gh60/satan/keymaps/dende_iso/readme.md
diff --git a/keyboards/satan/keymaps/dende_iso/rules.mk b/keyboards/gh60/satan/keymaps/dende_iso/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/dende_iso/rules.mk
rename to keyboards/gh60/satan/keymaps/dende_iso/rules.mk
diff --git a/keyboards/satan/keymaps/denolfe/README.md b/keyboards/gh60/satan/keymaps/denolfe/README.md
similarity index 100%
rename from keyboards/satan/keymaps/denolfe/README.md
rename to keyboards/gh60/satan/keymaps/denolfe/README.md
diff --git a/keyboards/satan/keymaps/denolfe/keymap.c b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/denolfe/keymap.c
rename to keyboards/gh60/satan/keymaps/denolfe/keymap.c
diff --git a/keyboards/satan/keymaps/denolfe/rules.mk b/keyboards/gh60/satan/keymaps/denolfe/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/denolfe/rules.mk
rename to keyboards/gh60/satan/keymaps/denolfe/rules.mk
diff --git a/keyboards/satan/keymaps/dkrieger/config.h b/keyboards/gh60/satan/keymaps/dkrieger/config.h
similarity index 100%
rename from keyboards/satan/keymaps/dkrieger/config.h
rename to keyboards/gh60/satan/keymaps/dkrieger/config.h
diff --git a/keyboards/satan/keymaps/dkrieger/keymap.c b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/dkrieger/keymap.c
rename to keyboards/gh60/satan/keymaps/dkrieger/keymap.c
diff --git a/keyboards/satan/keymaps/dkrieger/readme.md b/keyboards/gh60/satan/keymaps/dkrieger/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/dkrieger/readme.md
rename to keyboards/gh60/satan/keymaps/dkrieger/readme.md
diff --git a/keyboards/satan/keymaps/dkrieger/rules.mk b/keyboards/gh60/satan/keymaps/dkrieger/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/dkrieger/rules.mk
rename to keyboards/gh60/satan/keymaps/dkrieger/rules.mk
diff --git a/keyboards/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
similarity index 100%
rename from keyboards/satan/keymaps/fakb/config.h
rename to keyboards/gh60/satan/keymaps/fakb/config.h
diff --git a/keyboards/satan/keymaps/fakb/keymap.c b/keyboards/gh60/satan/keymaps/fakb/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/fakb/keymap.c
rename to keyboards/gh60/satan/keymaps/fakb/keymap.c
diff --git a/keyboards/satan/keymaps/fakb/readme.md b/keyboards/gh60/satan/keymaps/fakb/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/fakb/readme.md
rename to keyboards/gh60/satan/keymaps/fakb/readme.md
diff --git a/keyboards/satan/keymaps/fakb/rules.mk b/keyboards/gh60/satan/keymaps/fakb/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/fakb/rules.mk
rename to keyboards/gh60/satan/keymaps/fakb/rules.mk
diff --git a/keyboards/satan/keymaps/hhkb_7u/keymap.c b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/hhkb_7u/keymap.c
rename to keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
diff --git a/keyboards/satan/keymaps/hhkb_7u/readme.md b/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/hhkb_7u/readme.md
rename to keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
diff --git a/keyboards/satan/keymaps/isoHHKB/keymap.c b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/isoHHKB/keymap.c
rename to keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
diff --git a/keyboards/satan/keymaps/isoHHKB/readme.md b/keyboards/gh60/satan/keymaps/isoHHKB/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/isoHHKB/readme.md
rename to keyboards/gh60/satan/keymaps/isoHHKB/readme.md
diff --git a/keyboards/satan/keymaps/isoHHKB/rules.mk b/keyboards/gh60/satan/keymaps/isoHHKB/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/isoHHKB/rules.mk
rename to keyboards/gh60/satan/keymaps/isoHHKB/rules.mk
diff --git a/keyboards/satan/keymaps/iso_split_rshift/.gitignore b/keyboards/gh60/satan/keymaps/iso_split_rshift/.gitignore
similarity index 100%
rename from keyboards/satan/keymaps/iso_split_rshift/.gitignore
rename to keyboards/gh60/satan/keymaps/iso_split_rshift/.gitignore
diff --git a/keyboards/satan/keymaps/iso_split_rshift/build.sh b/keyboards/gh60/satan/keymaps/iso_split_rshift/build.sh
similarity index 100%
rename from keyboards/satan/keymaps/iso_split_rshift/build.sh
rename to keyboards/gh60/satan/keymaps/iso_split_rshift/build.sh
diff --git a/keyboards/satan/keymaps/iso_split_rshift/config.h b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
similarity index 100%
rename from keyboards/satan/keymaps/iso_split_rshift/config.h
rename to keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
diff --git a/keyboards/satan/keymaps/iso_split_rshift/keymap.c b/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/iso_split_rshift/keymap.c
rename to keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c
diff --git a/keyboards/satan/keymaps/iso_split_rshift/readme.md b/keyboards/gh60/satan/keymaps/iso_split_rshift/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/iso_split_rshift/readme.md
rename to keyboards/gh60/satan/keymaps/iso_split_rshift/readme.md
diff --git a/keyboards/satan/keymaps/iso_split_rshift/rules.mk b/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/iso_split_rshift/rules.mk
rename to keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
diff --git a/keyboards/satan/keymaps/jarred/keymap.c b/keyboards/gh60/satan/keymaps/jarred/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/jarred/keymap.c
rename to keyboards/gh60/satan/keymaps/jarred/keymap.c
diff --git a/keyboards/satan/keymaps/jarred/readme.md b/keyboards/gh60/satan/keymaps/jarred/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/jarred/readme.md
rename to keyboards/gh60/satan/keymaps/jarred/readme.md
diff --git a/keyboards/satan/keymaps/lepa/keymap.c b/keyboards/gh60/satan/keymaps/lepa/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/lepa/keymap.c
rename to keyboards/gh60/satan/keymaps/lepa/keymap.c
diff --git a/keyboards/satan/keymaps/lepa/readme.md b/keyboards/gh60/satan/keymaps/lepa/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/lepa/readme.md
rename to keyboards/gh60/satan/keymaps/lepa/readme.md
diff --git a/keyboards/satan/keymaps/lepa/rules.mk b/keyboards/gh60/satan/keymaps/lepa/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/lepa/rules.mk
rename to keyboards/gh60/satan/keymaps/lepa/rules.mk
diff --git a/keyboards/satan/keymaps/mark1/keymap.c b/keyboards/gh60/satan/keymaps/mark1/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/mark1/keymap.c
rename to keyboards/gh60/satan/keymaps/mark1/keymap.c
diff --git a/keyboards/satan/keymaps/mark1/readme.md b/keyboards/gh60/satan/keymaps/mark1/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/mark1/readme.md
rename to keyboards/gh60/satan/keymaps/mark1/readme.md
diff --git a/keyboards/satan/keymaps/midi/config.h b/keyboards/gh60/satan/keymaps/midi/config.h
similarity index 100%
rename from keyboards/satan/keymaps/midi/config.h
rename to keyboards/gh60/satan/keymaps/midi/config.h
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/gh60/satan/keymaps/midi/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/midi/keymap.c
rename to keyboards/gh60/satan/keymaps/midi/keymap.c
diff --git a/keyboards/satan/keymaps/midi/readme.md b/keyboards/gh60/satan/keymaps/midi/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/midi/readme.md
rename to keyboards/gh60/satan/keymaps/midi/readme.md
diff --git a/keyboards/satan/keymaps/midi/rules.mk b/keyboards/gh60/satan/keymaps/midi/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/midi/rules.mk
rename to keyboards/gh60/satan/keymaps/midi/rules.mk
diff --git a/keyboards/satan/keymaps/no_caps_lock/keymap.c b/keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/no_caps_lock/keymap.c
rename to keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c
diff --git a/keyboards/satan/keymaps/no_caps_lock/readme.md b/keyboards/gh60/satan/keymaps/no_caps_lock/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/no_caps_lock/readme.md
rename to keyboards/gh60/satan/keymaps/no_caps_lock/readme.md
diff --git a/keyboards/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
similarity index 100%
rename from keyboards/satan/keymaps/olligranlund_iso/config.h
rename to keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
diff --git a/keyboards/satan/keymaps/olligranlund_iso/keymap.c b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/olligranlund_iso/keymap.c
rename to keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
diff --git a/keyboards/satan/keymaps/olligranlund_iso/readme.md b/keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/olligranlund_iso/readme.md
rename to keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md
diff --git a/keyboards/satan/keymaps/olligranlund_iso/rules.mk b/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/olligranlund_iso/rules.mk
rename to keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
diff --git a/keyboards/satan/keymaps/poker/keymap.c b/keyboards/gh60/satan/keymaps/poker/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/poker/keymap.c
rename to keyboards/gh60/satan/keymaps/poker/keymap.c
diff --git a/keyboards/satan/keymaps/rask63/keymap.c b/keyboards/gh60/satan/keymaps/rask63/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/rask63/keymap.c
rename to keyboards/gh60/satan/keymaps/rask63/keymap.c
diff --git a/keyboards/satan/keymaps/sethbc/keymap.c b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/sethbc/keymap.c
rename to keyboards/gh60/satan/keymaps/sethbc/keymap.c
diff --git a/keyboards/satan/keymaps/sethbc/readme.md b/keyboards/gh60/satan/keymaps/sethbc/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/sethbc/readme.md
rename to keyboards/gh60/satan/keymaps/sethbc/readme.md
diff --git a/keyboards/satan/keymaps/sethbc/rules.mk b/keyboards/gh60/satan/keymaps/sethbc/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/sethbc/rules.mk
rename to keyboards/gh60/satan/keymaps/sethbc/rules.mk
diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/gh60/satan/keymaps/smt/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/smt/keymap.c
rename to keyboards/gh60/satan/keymaps/smt/keymap.c
diff --git a/keyboards/satan/keymaps/smt/readme.md b/keyboards/gh60/satan/keymaps/smt/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/smt/readme.md
rename to keyboards/gh60/satan/keymaps/smt/readme.md
diff --git a/keyboards/satan/keymaps/smt/rules.mk b/keyboards/gh60/satan/keymaps/smt/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/smt/rules.mk
rename to keyboards/gh60/satan/keymaps/smt/rules.mk
diff --git a/keyboards/satan/keymaps/spacemanspiff/keymap.c b/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/spacemanspiff/keymap.c
rename to keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
diff --git a/keyboards/satan/keymaps/spacemanspiff/readme.md b/keyboards/gh60/satan/keymaps/spacemanspiff/readme.md
similarity index 100%
rename from keyboards/satan/keymaps/spacemanspiff/readme.md
rename to keyboards/gh60/satan/keymaps/spacemanspiff/readme.md
diff --git a/keyboards/satan/keymaps/stanleylai/config.h b/keyboards/gh60/satan/keymaps/stanleylai/config.h
similarity index 100%
rename from keyboards/satan/keymaps/stanleylai/config.h
rename to keyboards/gh60/satan/keymaps/stanleylai/config.h
diff --git a/keyboards/satan/keymaps/stanleylai/keymap.c b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/stanleylai/keymap.c
rename to keyboards/gh60/satan/keymaps/stanleylai/keymap.c
diff --git a/keyboards/satan/keymaps/unxmaal/README.md b/keyboards/gh60/satan/keymaps/unxmaal/README.md
similarity index 100%
rename from keyboards/satan/keymaps/unxmaal/README.md
rename to keyboards/gh60/satan/keymaps/unxmaal/README.md
diff --git a/keyboards/satan/keymaps/unxmaal/keymap.c b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
similarity index 100%
rename from keyboards/satan/keymaps/unxmaal/keymap.c
rename to keyboards/gh60/satan/keymaps/unxmaal/keymap.c
diff --git a/keyboards/satan/keymaps/unxmaal/rules.mk b/keyboards/gh60/satan/keymaps/unxmaal/rules.mk
similarity index 100%
rename from keyboards/satan/keymaps/unxmaal/rules.mk
rename to keyboards/gh60/satan/keymaps/unxmaal/rules.mk
diff --git a/keyboards/satan/readme.md b/keyboards/gh60/satan/readme.md
similarity index 82%
rename from keyboards/satan/readme.md
rename to keyboards/gh60/satan/readme.md
index 7eb272cf30..f6a56e4a80 100644
--- a/keyboards/satan/readme.md
+++ b/keyboards/gh60/satan/readme.md
@@ -8,7 +8,9 @@ Hardware Availability: https://www.1upkeyboards.com/shop/controllers/gh60-satan-
Make example for this keyboard (after setting up your build environment):
- make satan:default
+ make gh60/satan:default
+
+**Note:** This GH60 Satan firmware will not be compatible with the GH60 Rev C PCB. Conversely, the GH60 Rev C firmware will not be compatible with this PCB. Please ensure you have the correct firmware/pcb combination before flashing.
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).
diff --git a/keyboards/satan/rules.mk b/keyboards/gh60/satan/rules.mk
similarity index 97%
rename from keyboards/satan/rules.mk
rename to keyboards/gh60/satan/rules.mk
index 51161490e4..b6bb68391f 100644
--- a/keyboards/satan/rules.mk
+++ b/keyboards/gh60/satan/rules.mk
@@ -47,7 +47,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
diff --git a/keyboards/satan/satan.c b/keyboards/gh60/satan/satan.c
similarity index 100%
rename from keyboards/satan/satan.c
rename to keyboards/gh60/satan/satan.c
diff --git a/keyboards/satan/satan.h b/keyboards/gh60/satan/satan.h
similarity index 100%
rename from keyboards/satan/satan.h
rename to keyboards/gh60/satan/satan.h
diff --git a/keyboards/satan/keymaps/iso_split_rshift/resetboard.sh b/keyboards/satan/keymaps/iso_split_rshift/resetboard.sh
deleted file mode 100755
index d955ccf545..0000000000
--- a/keyboards/satan/keymaps/iso_split_rshift/resetboard.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-sudo dfu-programmer atmega32u4 erase --force
-sudo dfu-programmer atmega32u4 flash clear_flash.hex
-sudo dfu-programmer atmega32u4 reset