diff --git a/keyboards/yushakobo/helix_4r/common/glcdfont.c b/keyboards/helix/rev3/4rows/common/glcdfont.c
similarity index 100%
rename from keyboards/yushakobo/helix_4r/common/glcdfont.c
rename to keyboards/helix/rev3/4rows/common/glcdfont.c
diff --git a/keyboards/yushakobo/helix_4r/config.h b/keyboards/helix/rev3/4rows/config.h
similarity index 100%
rename from keyboards/yushakobo/helix_4r/config.h
rename to keyboards/helix/rev3/4rows/config.h
diff --git a/keyboards/yushakobo/helix_4r/helix_4r.c b/keyboards/helix/rev3/4rows/helix_4r.c
similarity index 100%
rename from keyboards/yushakobo/helix_4r/helix_4r.c
rename to keyboards/helix/rev3/4rows/helix_4r.c
diff --git a/keyboards/yushakobo/helix_4r/helix_4r.h b/keyboards/helix/rev3/4rows/helix_4r.h
similarity index 100%
rename from keyboards/yushakobo/helix_4r/helix_4r.h
rename to keyboards/helix/rev3/4rows/helix_4r.h
diff --git a/keyboards/yushakobo/helix_4r/info.json b/keyboards/helix/rev3/4rows/info.json
similarity index 100%
rename from keyboards/yushakobo/helix_4r/info.json
rename to keyboards/helix/rev3/4rows/info.json
diff --git a/keyboards/yushakobo/helix_4r/keymaps/default/config.h b/keyboards/helix/rev3/4rows/keymaps/default/config.h
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/default/config.h
rename to keyboards/helix/rev3/4rows/keymaps/default/config.h
diff --git a/keyboards/yushakobo/helix_4r/keymaps/default/keymap.c b/keyboards/helix/rev3/4rows/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/default/keymap.c
rename to keyboards/helix/rev3/4rows/keymaps/default/keymap.c
diff --git a/keyboards/yushakobo/helix_4r/keymaps/default/readme.md b/keyboards/helix/rev3/4rows/keymaps/default/readme.md
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/default/readme.md
rename to keyboards/helix/rev3/4rows/keymaps/default/readme.md
diff --git a/keyboards/yushakobo/helix_4r/keymaps/via/config.h b/keyboards/helix/rev3/4rows/keymaps/via/config.h
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/via/config.h
rename to keyboards/helix/rev3/4rows/keymaps/via/config.h
diff --git a/keyboards/yushakobo/helix_4r/keymaps/via/keymap.c b/keyboards/helix/rev3/4rows/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/via/keymap.c
rename to keyboards/helix/rev3/4rows/keymaps/via/keymap.c
diff --git a/keyboards/yushakobo/helix_4r/keymaps/via/readme.md b/keyboards/helix/rev3/4rows/keymaps/via/readme.md
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/via/readme.md
rename to keyboards/helix/rev3/4rows/keymaps/via/readme.md
diff --git a/keyboards/yushakobo/helix_4r/keymaps/via/rules.mk b/keyboards/helix/rev3/4rows/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/yushakobo/helix_4r/keymaps/via/rules.mk
rename to keyboards/helix/rev3/4rows/keymaps/via/rules.mk
diff --git a/keyboards/yushakobo/helix_4r/readme.md b/keyboards/helix/rev3/4rows/readme.md
similarity index 100%
rename from keyboards/yushakobo/helix_4r/readme.md
rename to keyboards/helix/rev3/4rows/readme.md
diff --git a/keyboards/yushakobo/helix_4r/rules.mk b/keyboards/helix/rev3/4rows/rules.mk
similarity index 100%
rename from keyboards/yushakobo/helix_4r/rules.mk
rename to keyboards/helix/rev3/4rows/rules.mk
diff --git a/keyboards/yushakobo/helix_5r/common/glcdfont.c b/keyboards/helix/rev3/5rows/common/glcdfont.c
similarity index 100%
rename from keyboards/yushakobo/helix_5r/common/glcdfont.c
rename to keyboards/helix/rev3/5rows/common/glcdfont.c
diff --git a/keyboards/yushakobo/helix_5r/config.h b/keyboards/helix/rev3/5rows/config.h
similarity index 100%
rename from keyboards/yushakobo/helix_5r/config.h
rename to keyboards/helix/rev3/5rows/config.h
diff --git a/keyboards/yushakobo/helix_5r/helix_5r.c b/keyboards/helix/rev3/5rows/helix_5r.c
similarity index 100%
rename from keyboards/yushakobo/helix_5r/helix_5r.c
rename to keyboards/helix/rev3/5rows/helix_5r.c
diff --git a/keyboards/yushakobo/helix_5r/helix_5r.h b/keyboards/helix/rev3/5rows/helix_5r.h
similarity index 100%
rename from keyboards/yushakobo/helix_5r/helix_5r.h
rename to keyboards/helix/rev3/5rows/helix_5r.h
diff --git a/keyboards/yushakobo/helix_5r/info.json b/keyboards/helix/rev3/5rows/info.json
similarity index 100%
rename from keyboards/yushakobo/helix_5r/info.json
rename to keyboards/helix/rev3/5rows/info.json
diff --git a/keyboards/yushakobo/helix_5r/keymaps/default/config.h b/keyboards/helix/rev3/5rows/keymaps/default/config.h
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/default/config.h
rename to keyboards/helix/rev3/5rows/keymaps/default/config.h
diff --git a/keyboards/yushakobo/helix_5r/keymaps/default/keymap.c b/keyboards/helix/rev3/5rows/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/default/keymap.c
rename to keyboards/helix/rev3/5rows/keymaps/default/keymap.c
diff --git a/keyboards/yushakobo/helix_5r/keymaps/default/readme.md b/keyboards/helix/rev3/5rows/keymaps/default/readme.md
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/default/readme.md
rename to keyboards/helix/rev3/5rows/keymaps/default/readme.md
diff --git a/keyboards/yushakobo/helix_5r/keymaps/via/config.h b/keyboards/helix/rev3/5rows/keymaps/via/config.h
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/via/config.h
rename to keyboards/helix/rev3/5rows/keymaps/via/config.h
diff --git a/keyboards/yushakobo/helix_5r/keymaps/via/keymap.c b/keyboards/helix/rev3/5rows/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/via/keymap.c
rename to keyboards/helix/rev3/5rows/keymaps/via/keymap.c
diff --git a/keyboards/yushakobo/helix_5r/keymaps/via/readme.md b/keyboards/helix/rev3/5rows/keymaps/via/readme.md
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/via/readme.md
rename to keyboards/helix/rev3/5rows/keymaps/via/readme.md
diff --git a/keyboards/yushakobo/helix_5r/keymaps/via/rules.mk b/keyboards/helix/rev3/5rows/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/yushakobo/helix_5r/keymaps/via/rules.mk
rename to keyboards/helix/rev3/5rows/keymaps/via/rules.mk
diff --git a/keyboards/yushakobo/helix_5r/readme.md b/keyboards/helix/rev3/5rows/readme.md
similarity index 100%
rename from keyboards/yushakobo/helix_5r/readme.md
rename to keyboards/helix/rev3/5rows/readme.md
diff --git a/keyboards/yushakobo/helix_5r/rules.mk b/keyboards/helix/rev3/5rows/rules.mk
similarity index 100%
rename from keyboards/yushakobo/helix_5r/rules.mk
rename to keyboards/helix/rev3/5rows/rules.mk