diff --git a/keyboards/bananasplit/README.md b/keyboards/bananasplit/README.md
deleted file mode 100644
index cd1e15d7755..00000000000
--- a/keyboards/bananasplit/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-BananaSplit60
-===
-
-A 60% PCB featuring a split spacebar.
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: BananaSplit60 PCB  
-Hardware Availability: https://thevankeyboards.com/products/gb-bananasplit-60-keyboard-kit?variant=42149104910
-
-Make example for this keyboard (after setting up your build environment):
-
-    make bananasplit:default
-
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
-
diff --git a/keyboards/roadkit/readme.md b/keyboards/roadkit/readme.md
deleted file mode 100644
index 691bd1f3e91..00000000000
--- a/keyboards/roadkit/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-roadkit
-=======
-
-A programmable macro pad.
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: Roadkit PCB  
-Hardware Availability: https://thevankeyboards.com/collections/catalog/products/road-kit-diy?variant=603645345806
-
-Make example for this keyboard (after setting up your build environment):
-
-    make roadkit:default
-
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/thevankeyboards/bananasplit/README.md b/keyboards/thevankeyboards/bananasplit/README.md
new file mode 100644
index 00000000000..41d0d407db0
--- /dev/null
+++ b/keyboards/thevankeyboards/bananasplit/README.md
@@ -0,0 +1,14 @@
+# BananaSplit60
+
+A 60% PCB featuring a split spacebar.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: BananaSplit60 PCB  
+Hardware Availability: https://thevankeyboards.com/products/gb-bananasplit-60-keyboard-kit?variant=42149104910
+
+Make example for this keyboard (after setting up your build environment):
+
+    make thevankeyboards/bananasplit: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).
+
diff --git a/keyboards/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c
similarity index 100%
rename from keyboards/bananasplit/bananasplit.c
rename to keyboards/thevankeyboards/bananasplit/bananasplit.c
diff --git a/keyboards/bananasplit/bananasplit.h b/keyboards/thevankeyboards/bananasplit/bananasplit.h
similarity index 100%
rename from keyboards/bananasplit/bananasplit.h
rename to keyboards/thevankeyboards/bananasplit/bananasplit.h
diff --git a/keyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
similarity index 100%
rename from keyboards/bananasplit/config.h
rename to keyboards/thevankeyboards/bananasplit/config.h
diff --git a/keyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json
similarity index 100%
rename from keyboards/bananasplit/info.json
rename to keyboards/thevankeyboards/bananasplit/info.json
diff --git a/keyboards/bananasplit/keymaps/0010/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h
similarity index 100%
rename from keyboards/bananasplit/keymaps/0010/config.h
rename to keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h
diff --git a/keyboards/bananasplit/keymaps/0010/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/0010/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
diff --git a/keyboards/bananasplit/keymaps/0010/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
similarity index 100%
rename from keyboards/bananasplit/keymaps/0010/rules.mk
rename to keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h
similarity index 100%
rename from keyboards/bananasplit/keymaps/coloneljesus/config.h
rename to keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/coloneljesus/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md
similarity index 100%
rename from keyboards/bananasplit/keymaps/coloneljesus/readme.md
rename to keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
similarity index 100%
rename from keyboards/bananasplit/keymaps/coloneljesus/rules.mk
rename to keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
diff --git a/keyboards/bananasplit/keymaps/default/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/default/config.h
similarity index 100%
rename from keyboards/bananasplit/keymaps/default/config.h
rename to keyboards/thevankeyboards/bananasplit/keymaps/default/config.h
diff --git a/keyboards/bananasplit/keymaps/default/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/default/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/default/keymap.c
diff --git a/keyboards/bananasplit/keymaps/default/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bananasplit/keymaps/default/readme.md
rename to keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md
diff --git a/keyboards/bananasplit/keymaps/default/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/bananasplit/keymaps/default/rules.mk
rename to keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
diff --git a/keyboards/bananasplit/keymaps/hhkbanana/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/hhkbanana/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/hhkbanana/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/hhkbanana/keymap.c
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
similarity index 100%
rename from keyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
rename to keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
similarity index 100%
rename from keyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
rename to keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
diff --git a/keyboards/bananasplit/keymaps/kamon/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
similarity index 100%
rename from keyboards/bananasplit/keymaps/kamon/config.h
rename to keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
diff --git a/keyboards/bananasplit/keymaps/kamon/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/kamon/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
diff --git a/keyboards/bananasplit/keymaps/kamon/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
similarity index 100%
rename from keyboards/bananasplit/keymaps/kamon/readme.md
rename to keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
diff --git a/keyboards/bananasplit/keymaps/kamon/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
similarity index 100%
rename from keyboards/bananasplit/keymaps/kamon/rules.mk
rename to keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
diff --git a/keyboards/bananasplit/keymaps/nic/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/nic/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
diff --git a/keyboards/bananasplit/keymaps/rask/README.md b/keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md
similarity index 100%
rename from keyboards/bananasplit/keymaps/rask/README.md
rename to keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md
diff --git a/keyboards/bananasplit/keymaps/rask/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/rask/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
diff --git a/keyboards/bananasplit/keymaps/talljoe/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
similarity index 100%
rename from keyboards/bananasplit/keymaps/talljoe/config.h
rename to keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
diff --git a/keyboards/bananasplit/keymaps/talljoe/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/keymap.c
similarity index 100%
rename from keyboards/bananasplit/keymaps/talljoe/keymap.c
rename to keyboards/thevankeyboards/bananasplit/keymaps/talljoe/keymap.c
diff --git a/keyboards/bananasplit/rules.mk b/keyboards/thevankeyboards/bananasplit/rules.mk
similarity index 100%
rename from keyboards/bananasplit/rules.mk
rename to keyboards/thevankeyboards/bananasplit/rules.mk
diff --git a/keyboards/tv44/config.h b/keyboards/thevankeyboards/minivan/config.h
similarity index 98%
rename from keyboards/tv44/config.h
rename to keyboards/thevankeyboards/minivan/config.h
index 0ae93c09570..726768e0ec9 100644
--- a/keyboards/tv44/config.h
+++ b/keyboards/thevankeyboards/minivan/config.h
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x8844
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Evan Sailer
-#define PRODUCT         TheVan 44
-#define DESCRIPTION     keyboard firmware for TV44
+#define PRODUCT         Minivan
+#define DESCRIPTION     keyboard firmware for Minivan
 
 /* key matrix size */
 #define MATRIX_ROWS 4
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
- 
+
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tv44/info.json b/keyboards/thevankeyboards/minivan/info.json
similarity index 100%
rename from keyboards/tv44/info.json
rename to keyboards/thevankeyboards/minivan/info.json
diff --git a/keyboards/tv44/keymaps/belak/config.h b/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/belak/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/belak/config.h
diff --git a/keyboards/tv44/keymaps/belak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
similarity index 97%
rename from keyboards/tv44/keymaps/belak/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
index 6c0ff1a1cf7..19051574a5d 100644
--- a/keyboards/tv44/keymaps/belak/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
@@ -1,7 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "debug.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 // Layer names. We stick to 3 letters if possible so MO(NAME) fits in 7
 // characters and doesn't mess with the grid.
diff --git a/keyboards/tv44/keymaps/belak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/belak/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/belak/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/belak/readme.md
diff --git a/keyboards/tv44/keymaps/belak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/belak/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
diff --git a/keyboards/tv44/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/budi/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/budi/config.h
diff --git a/keyboards/tv44/keymaps/budi/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
similarity index 100%
rename from keyboards/tv44/keymaps/budi/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
diff --git a/keyboards/tv44/keymaps/budi/readme.md b/keyboards/thevankeyboards/minivan/keymaps/budi/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/budi/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/budi/readme.md
diff --git a/keyboards/tv44/keymaps/core/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
similarity index 96%
rename from keyboards/tv44/keymaps/core/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
index d24049696e2..cf1e0d3f51e 100644
--- a/keyboards/tv44/keymaps/core/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 #define _QW 0
 #define _L1 1
diff --git a/keyboards/tv44/keymaps/core/readme.md b/keyboards/thevankeyboards/minivan/keymaps/core/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/core/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/core/readme.md
diff --git a/keyboards/tv44/keymaps/core/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/core/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
diff --git a/keyboards/roadkit/keymaps/default/config.h b/keyboards/thevankeyboards/minivan/keymaps/default/config.h
similarity index 100%
rename from keyboards/roadkit/keymaps/default/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/default/config.h
diff --git a/keyboards/tv44/keymaps/default/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/tv44/keymaps/default/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
index 6055cd74e20..90b188b55ff 100644
--- a/keyboards/tv44/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/default/readme.md b/keyboards/thevankeyboards/minivan/keymaps/default/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/default/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/default/readme.md
diff --git a/keyboards/roadkit/keymaps/default/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/roadkit/keymaps/default/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
diff --git a/keyboards/tv44/keymaps/jeebak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
similarity index 99%
rename from keyboards/tv44/keymaps/jeebak/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
index 5503e1f9ebf..0ec9485c724 100644
--- a/keyboards/tv44/keymaps/jeebak/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/jeebak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/jeebak/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
diff --git a/keyboards/roadkit/keymaps/flipphone/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
similarity index 100%
rename from keyboards/roadkit/keymaps/flipphone/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/config.h b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/jetpacktuxedo/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
similarity index 99%
rename from keyboards/tv44/keymaps/jetpacktuxedo/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
index 45bedaa977b..02ba6842166 100644
--- a/keyboards/tv44/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
@@ -1,4 +1,4 @@
-#include "tv44.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/jetpacktuxedo/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/jetpacktuxedo/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/tv44/keymaps/mjt/config.h b/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/mjt/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
diff --git a/keyboards/tv44/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
similarity index 98%
rename from keyboards/tv44/keymaps/mjt/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
index 25f8cfc52a5..8f0fba11dcc 100644
--- a/keyboards/tv44/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
@@ -1,8 +1,6 @@
 //Author: mike terhar
+#include QMK_KEYBOARD_H
 
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
 #ifdef BACKLIGHT_ENABLE
   #include "backlight.h"
 #endif
diff --git a/keyboards/tv44/keymaps/mjt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/mjt/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
diff --git a/keyboards/tv44/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/mjt/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
diff --git a/keyboards/tv44/keymaps/smt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
similarity index 99%
rename from keyboards/tv44/keymaps/smt/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
index 0e1484e82d0..ee117e47bd7 100644
--- a/keyboards/tv44/keymaps/smt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/smt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/smt/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/smt/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/smt/readme.md
diff --git a/keyboards/roadkit/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
similarity index 100%
rename from keyboards/roadkit/keymaps/mjt/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
diff --git a/keyboards/tv44/keymaps/tong92/config.h b/keyboards/thevankeyboards/minivan/keymaps/tong92/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/tong92/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/tong92/config.h
diff --git a/keyboards/tv44/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
similarity index 99%
rename from keyboards/tv44/keymaps/tong92/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
index 758c3bb15cc..220cc8c61b1 100644
--- a/keyboards/tv44/keymaps/tong92/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
@@ -1,8 +1,6 @@
 //Author: tong92 <tong92power@gmail.com>
+#include QMK_KEYBOARD_H
 
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
 #ifdef BACKLIGHT_ENABLE
   #include "backlight.h"
 #endif
diff --git a/keyboards/tv44/keymaps/tong92/readme.md b/keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/tong92/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md
diff --git a/keyboards/tv44/keymaps/tong92/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/tong92/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
diff --git a/keyboards/roadkit/keymaps/flipphone/config.h b/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
similarity index 100%
rename from keyboards/roadkit/keymaps/flipphone/config.h
rename to keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
similarity index 98%
rename from keyboards/tv44/keymaps/xyverz/keymap.c
rename to keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
index bbdb9093e14..ec0d270070b 100644
--- a/keyboards/tv44/keymaps/xyverz/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/xyverz/readme.md b/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
similarity index 100%
rename from keyboards/tv44/keymaps/xyverz/readme.md
rename to keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
diff --git a/keyboards/roadkit/keymaps/singles/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
similarity index 100%
rename from keyboards/roadkit/keymaps/singles/rules.mk
rename to keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
diff --git a/keyboards/tv44/tv44.c b/keyboards/thevankeyboards/minivan/minivan.c
similarity index 96%
rename from keyboards/tv44/tv44.c
rename to keyboards/thevankeyboards/minivan/minivan.c
index 6dc0efd28ea..b260195cec0 100644
--- a/keyboards/tv44/tv44.c
+++ b/keyboards/thevankeyboards/minivan/minivan.c
@@ -1,4 +1,4 @@
-#include "tv44.h"
+#include "minivan.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/tv44/tv44.h b/keyboards/thevankeyboards/minivan/minivan.h
similarity index 98%
rename from keyboards/tv44/tv44.h
rename to keyboards/thevankeyboards/minivan/minivan.h
index aea6179d9e6..27a35836579 100644
--- a/keyboards/tv44/tv44.h
+++ b/keyboards/thevankeyboards/minivan/minivan.h
@@ -1,5 +1,5 @@
-#ifndef TV44_H
-#define TV44_H
+#ifndef MINIVAN_H
+#define MINIVAN_H
 
 #include "quantum.h"
 
diff --git a/keyboards/thevankeyboards/minivan/readme.md b/keyboards/thevankeyboards/minivan/readme.md
new file mode 100644
index 00000000000..03a868a1628
--- /dev/null
+++ b/keyboards/thevankeyboards/minivan/readme.md
@@ -0,0 +1,13 @@
+# Minivan (tv44)
+
+A compact 44% keyboard.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Minivan PCB  
+Hardware Availability: https://thevankeyboards.com/collections/catalog/products/minivan-diy?variant=609138376718
+
+Make example for this keyboard (after setting up your build environment):
+
+    make thevankeyboards/minivan: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).
diff --git a/keyboards/tv44/rules.mk b/keyboards/thevankeyboards/minivan/rules.mk
similarity index 100%
rename from keyboards/tv44/rules.mk
rename to keyboards/thevankeyboards/minivan/rules.mk
diff --git a/keyboards/thevankeyboards/readme.md b/keyboards/thevankeyboards/readme.md
new file mode 100644
index 00000000000..5dfd74e5744
--- /dev/null
+++ b/keyboards/thevankeyboards/readme.md
@@ -0,0 +1,3 @@
+# TheVan Keyboards
+
+[TheVan Keyboards](https://thevankeyboards.com/) is based in the United States and is responsible for boards such as the minivan. 
\ No newline at end of file
diff --git a/keyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
similarity index 100%
rename from keyboards/roadkit/config.h
rename to keyboards/thevankeyboards/roadkit/config.h
diff --git a/keyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json
similarity index 100%
rename from keyboards/roadkit/info.json
rename to keyboards/thevankeyboards/roadkit/info.json
diff --git a/keyboards/roadkit/keymaps/mjt/config.h b/keyboards/thevankeyboards/roadkit/keymaps/default/config.h
similarity index 100%
rename from keyboards/roadkit/keymaps/mjt/config.h
rename to keyboards/thevankeyboards/roadkit/keymaps/default/config.h
diff --git a/keyboards/roadkit/keymaps/default/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/roadkit/keymaps/default/keymap.c
rename to keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
diff --git a/keyboards/roadkit/keymaps/default/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/default/readme.md
similarity index 100%
rename from keyboards/roadkit/keymaps/default/readme.md
rename to keyboards/thevankeyboards/roadkit/keymaps/default/readme.md
diff --git a/keyboards/tv44/keymaps/default/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/default/rules.mk
rename to keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
diff --git a/keyboards/roadkit/keymaps/singles/config.h b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h
similarity index 100%
rename from keyboards/roadkit/keymaps/singles/config.h
rename to keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h
diff --git a/keyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
similarity index 100%
rename from keyboards/roadkit/keymaps/flipphone/keymap.c
rename to keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
diff --git a/keyboards/roadkit/keymaps/flipphone/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md
similarity index 100%
rename from keyboards/roadkit/keymaps/flipphone/readme.md
rename to keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md
diff --git a/keyboards/tv44/keymaps/jeebak/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/jeebak/rules.mk
rename to keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
diff --git a/keyboards/roadkit/keymaps/khord/config.h b/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
similarity index 100%
rename from keyboards/roadkit/keymaps/khord/config.h
rename to keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
diff --git a/keyboards/roadkit/keymaps/khord/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
similarity index 100%
rename from keyboards/roadkit/keymaps/khord/keymap.c
rename to keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
diff --git a/keyboards/roadkit/keymaps/khord/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
similarity index 100%
rename from keyboards/roadkit/keymaps/khord/rules.mk
rename to keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
diff --git a/keyboards/tv44/keymaps/default/config.h b/keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/default/config.h
rename to keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h
diff --git a/keyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
similarity index 100%
rename from keyboards/roadkit/keymaps/mjt/keymap.c
rename to keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
diff --git a/keyboards/roadkit/keymaps/mjt/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md
similarity index 100%
rename from keyboards/roadkit/keymaps/mjt/readme.md
rename to keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md
diff --git a/keyboards/tv44/keymaps/smt/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/smt/rules.mk
rename to keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
diff --git a/keyboards/tv44/keymaps/xyverz/config.h b/keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
similarity index 100%
rename from keyboards/tv44/keymaps/xyverz/config.h
rename to keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
diff --git a/keyboards/roadkit/keymaps/singles/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
similarity index 100%
rename from keyboards/roadkit/keymaps/singles/keymap.c
rename to keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
diff --git a/keyboards/roadkit/keymaps/singles/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
similarity index 100%
rename from keyboards/roadkit/keymaps/singles/readme.md
rename to keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
diff --git a/keyboards/tv44/keymaps/xyverz/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
similarity index 100%
rename from keyboards/tv44/keymaps/xyverz/rules.mk
rename to keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
diff --git a/keyboards/roadkit/keymaps/singlesBrent/config.h b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
similarity index 100%
rename from keyboards/roadkit/keymaps/singlesBrent/config.h
rename to keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
diff --git a/keyboards/roadkit/keymaps/singlesBrent/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
similarity index 100%
rename from keyboards/roadkit/keymaps/singlesBrent/keymap.c
rename to keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
diff --git a/keyboards/roadkit/keymaps/singlesBrent/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
similarity index 100%
rename from keyboards/roadkit/keymaps/singlesBrent/readme.md
rename to keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
diff --git a/keyboards/roadkit/keymaps/singlesBrent/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
similarity index 100%
rename from keyboards/roadkit/keymaps/singlesBrent/rules.mk
rename to keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
diff --git a/keyboards/thevankeyboards/roadkit/readme.md b/keyboards/thevankeyboards/roadkit/readme.md
new file mode 100644
index 00000000000..e4af2dcc009
--- /dev/null
+++ b/keyboards/thevankeyboards/roadkit/readme.md
@@ -0,0 +1,13 @@
+# Roadkit
+
+A programmable macro pad.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Roadkit PCB  
+Hardware Availability: https://thevankeyboards.com/collections/catalog/products/road-kit-diy?variant=603645345806
+
+Make example for this keyboard (after setting up your build environment):
+
+    make thevankeyboards/roadkit: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).
diff --git a/keyboards/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c
similarity index 100%
rename from keyboards/roadkit/roadkit.c
rename to keyboards/thevankeyboards/roadkit/roadkit.c
diff --git a/keyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h
similarity index 100%
rename from keyboards/roadkit/roadkit.h
rename to keyboards/thevankeyboards/roadkit/roadkit.h
diff --git a/keyboards/roadkit/rules.mk b/keyboards/thevankeyboards/roadkit/rules.mk
similarity index 100%
rename from keyboards/roadkit/rules.mk
rename to keyboards/thevankeyboards/roadkit/rules.mk
diff --git a/keyboards/tv44/readme.md b/keyboards/tv44/readme.md
deleted file mode 100644
index 28185f455bf..00000000000
--- a/keyboards/tv44/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-The Van 44
-==========
-
-A compact 44% keyboard.
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: The Van PCB  
-Hardware Availability: https://thevankeyboards.com/collections/catalog/products/minivan-diy?variant=609138376718
-
-Make example for this keyboard (after setting up your build environment):
-
-    make tv44:default
-
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.