diff --git a/keyboards/id87/config.h b/keyboards/idobao/id87/v1/config.h
similarity index 100%
rename from keyboards/id87/config.h
rename to keyboards/idobao/id87/v1/config.h
diff --git a/keyboards/id87/info.json b/keyboards/idobao/id87/v1/info.json
similarity index 100%
rename from keyboards/id87/info.json
rename to keyboards/idobao/id87/v1/info.json
diff --git a/keyboards/id87/keymaps/default/keymap.c b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id87/keymaps/default/keymap.c
rename to keyboards/idobao/id87/v1/keymaps/default/keymap.c
diff --git a/keyboards/id87/keymaps/default/readme.md b/keyboards/idobao/id87/v1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/id87/keymaps/default/readme.md
rename to keyboards/idobao/id87/v1/keymaps/default/readme.md
diff --git a/keyboards/id87/keymaps/via/keymap.c b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/id87/keymaps/via/keymap.c
rename to keyboards/idobao/id87/v1/keymaps/via/keymap.c
diff --git a/keyboards/id87/keymaps/via/rules.mk b/keyboards/idobao/id87/v1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/id87/keymaps/via/rules.mk
rename to keyboards/idobao/id87/v1/keymaps/via/rules.mk
diff --git a/keyboards/id87/readme.md b/keyboards/idobao/id87/v1/readme.md
similarity index 91%
rename from keyboards/id87/readme.md
rename to keyboards/idobao/id87/v1/readme.md
index ee3604f84926..59814f81f709 100644
--- a/keyboards/id87/readme.md
+++ b/keyboards/idobao/id87/v1/readme.md
@@ -10,10 +10,10 @@ A TKL hotswap board from IDOBAO.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make id87:default
+    make idobao/id87/v1:default
 
 Flashing example for this keyboard:
 
-    make id87:default:flash
+    make idobao/id87/v1: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).
diff --git a/keyboards/id87/rules.mk b/keyboards/idobao/id87/v1/rules.mk
similarity index 100%
rename from keyboards/id87/rules.mk
rename to keyboards/idobao/id87/v1/rules.mk
diff --git a/keyboards/id87/id87.c b/keyboards/idobao/id87/v1/v1.c
similarity index 97%
rename from keyboards/id87/id87.c
rename to keyboards/idobao/id87/v1/v1.c
index 145edc163998..59dc3daab468 100644
--- a/keyboards/id87/id87.c
+++ b/keyboards/idobao/id87/v1/v1.c
@@ -12,4 +12,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "id87.h"
+#include "v1.h"
diff --git a/keyboards/id87/id87.h b/keyboards/idobao/id87/v1/v1.h
similarity index 100%
rename from keyboards/id87/id87.h
rename to keyboards/idobao/id87/v1/v1.h