diff --git a/animations/fft.h b/keyboards/betalupi_ergodox/animations/fft.h
similarity index 100%
rename from animations/fft.h
rename to keyboards/betalupi_ergodox/animations/fft.h
diff --git a/betalupi_ergodox.c b/keyboards/betalupi_ergodox/betalupi_ergodox.c
similarity index 100%
rename from betalupi_ergodox.c
rename to keyboards/betalupi_ergodox/betalupi_ergodox.c
diff --git a/betalupi_ergodox.h b/keyboards/betalupi_ergodox/betalupi_ergodox.h
similarity index 100%
rename from betalupi_ergodox.h
rename to keyboards/betalupi_ergodox/betalupi_ergodox.h
diff --git a/config.h b/keyboards/betalupi_ergodox/config.h
similarity index 100%
rename from config.h
rename to keyboards/betalupi_ergodox/config.h
diff --git a/info.json b/keyboards/betalupi_ergodox/info.json
similarity index 100%
rename from info.json
rename to keyboards/betalupi_ergodox/info.json
diff --git a/keymaps/default/config.h b/keyboards/betalupi_ergodox/keymaps/default/config.h
similarity index 100%
rename from keymaps/default/config.h
rename to keyboards/betalupi_ergodox/keymaps/default/config.h
diff --git a/keymaps/default/keymap.c b/keyboards/betalupi_ergodox/keymaps/default/keymap.c
similarity index 100%
rename from keymaps/default/keymap.c
rename to keyboards/betalupi_ergodox/keymaps/default/keymap.c
diff --git a/keymaps/default/keymap.h b/keyboards/betalupi_ergodox/keymaps/default/keymap.h
similarity index 100%
rename from keymaps/default/keymap.h
rename to keyboards/betalupi_ergodox/keymaps/default/keymap.h
diff --git a/keymaps/default/layers.h b/keyboards/betalupi_ergodox/keymaps/default/layers.h
similarity index 100%
rename from keymaps/default/layers.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers.h
diff --git a/keymaps/default/layers/arrows.h b/keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h
similarity index 100%
rename from keymaps/default/layers/arrows.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h
diff --git a/keymaps/default/layers/colemak.h b/keyboards/betalupi_ergodox/keymaps/default/layers/colemak.h
similarity index 100%
rename from keymaps/default/layers/colemak.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/colemak.h
diff --git a/keymaps/default/layers/desktop.h b/keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
similarity index 100%
rename from keymaps/default/layers/desktop.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
diff --git a/keymaps/default/layers/fkeys.h b/keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h
similarity index 100%
rename from keymaps/default/layers/fkeys.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h
diff --git a/keymaps/default/layers/keyboard.h b/keyboards/betalupi_ergodox/keymaps/default/layers/keyboard.h
similarity index 100%
rename from keymaps/default/layers/keyboard.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/keyboard.h
diff --git a/keymaps/default/layers/main.h b/keyboards/betalupi_ergodox/keymaps/default/layers/main.h
similarity index 100%
rename from keymaps/default/layers/main.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/main.h
diff --git a/keymaps/default/layers/numpad.h b/keyboards/betalupi_ergodox/keymaps/default/layers/numpad.h
similarity index 100%
rename from keymaps/default/layers/numpad.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/numpad.h
diff --git a/keymaps/default/layers/russian.h b/keyboards/betalupi_ergodox/keymaps/default/layers/russian.h
similarity index 100%
rename from keymaps/default/layers/russian.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/russian.h
diff --git a/keymaps/default/layers/symbols.h b/keyboards/betalupi_ergodox/keymaps/default/layers/symbols.h
similarity index 100%
rename from keymaps/default/layers/symbols.h
rename to keyboards/betalupi_ergodox/keymaps/default/layers/symbols.h
diff --git a/keymaps/default/rules.mk b/keyboards/betalupi_ergodox/keymaps/default/rules.mk
similarity index 100%
rename from keymaps/default/rules.mk
rename to keyboards/betalupi_ergodox/keymaps/default/rules.mk
diff --git a/keymaps/default/tapdance.h b/keyboards/betalupi_ergodox/keymaps/default/tapdance.h
similarity index 100%
rename from keymaps/default/tapdance.h
rename to keyboards/betalupi_ergodox/keymaps/default/tapdance.h
diff --git a/keymaps/default/tapdance/tapdance.c b/keyboards/betalupi_ergodox/keymaps/default/tapdance/tapdance.c
similarity index 100%
rename from keymaps/default/tapdance/tapdance.c
rename to keyboards/betalupi_ergodox/keymaps/default/tapdance/tapdance.c
diff --git a/keymaps/default/tapdance/wmlayout.c b/keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c
similarity index 100%
rename from keymaps/default/tapdance/wmlayout.c
rename to keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c
diff --git a/led_i2c.c b/keyboards/betalupi_ergodox/led_i2c.c
similarity index 100%
rename from led_i2c.c
rename to keyboards/betalupi_ergodox/led_i2c.c
diff --git a/matrix.c b/keyboards/betalupi_ergodox/matrix.c
similarity index 100%
rename from matrix.c
rename to keyboards/betalupi_ergodox/matrix.c
diff --git a/post_config.h b/keyboards/betalupi_ergodox/post_config.h
similarity index 100%
rename from post_config.h
rename to keyboards/betalupi_ergodox/post_config.h
diff --git a/rawhid.c b/keyboards/betalupi_ergodox/rawhid.c
similarity index 100%
rename from rawhid.c
rename to keyboards/betalupi_ergodox/rawhid.c
diff --git a/rawhid.h b/keyboards/betalupi_ergodox/rawhid.h
similarity index 100%
rename from rawhid.h
rename to keyboards/betalupi_ergodox/rawhid.h
diff --git a/readme.md b/keyboards/betalupi_ergodox/readme.md
similarity index 100%
rename from readme.md
rename to keyboards/betalupi_ergodox/readme.md
diff --git a/rgb_matrix_kb.inc b/keyboards/betalupi_ergodox/rgb_matrix_kb.inc
similarity index 100%
rename from rgb_matrix_kb.inc
rename to keyboards/betalupi_ergodox/rgb_matrix_kb.inc
diff --git a/rules.mk b/keyboards/betalupi_ergodox/rules.mk
similarity index 100%
rename from rules.mk
rename to keyboards/betalupi_ergodox/rules.mk
diff --git a/util/compile_keymap.py b/keyboards/betalupi_ergodox/util/compile_keymap.py
similarity index 100%
rename from util/compile_keymap.py
rename to keyboards/betalupi_ergodox/util/compile_keymap.py
diff --git a/util/readme.md b/keyboards/betalupi_ergodox/util/readme.md
similarity index 100%
rename from util/readme.md
rename to keyboards/betalupi_ergodox/util/readme.md