diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt
index 285dd007d6f..e344d53fc14 100644
--- a/drivers/base/bootvid/CMakeLists.txt
+++ b/drivers/base/bootvid/CMakeLists.txt
@@ -3,9 +3,9 @@ spec2def(bootvid.dll bootvid.spec ADD_IMPORTLIB)
 
 if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64"))
     list(APPEND SOURCE
-        i386/bootvid.c
-        i386/bootdata.c
-        i386/vga.c)
+        i386/pc/bootvid.c
+        i386/pc/bootdata.c
+        i386/pc/vga.c)
 elseif(ARCH STREQUAL "arm")
     list(APPEND SOURCE
         arm/bootvid.c)
diff --git a/drivers/base/bootvid/i386/bootdata.c b/drivers/base/bootvid/i386/pc/bootdata.c
similarity index 100%
rename from drivers/base/bootvid/i386/bootdata.c
rename to drivers/base/bootvid/i386/pc/bootdata.c
diff --git a/drivers/base/bootvid/i386/bootvid.c b/drivers/base/bootvid/i386/pc/bootvid.c
similarity index 100%
rename from drivers/base/bootvid/i386/bootvid.c
rename to drivers/base/bootvid/i386/pc/bootvid.c
diff --git a/drivers/base/bootvid/cmdcnst.h b/drivers/base/bootvid/i386/pc/cmdcnst.h
similarity index 100%
rename from drivers/base/bootvid/cmdcnst.h
rename to drivers/base/bootvid/i386/pc/cmdcnst.h
diff --git a/drivers/base/bootvid/i386/vga.c b/drivers/base/bootvid/i386/pc/vga.c
similarity index 100%
rename from drivers/base/bootvid/i386/vga.c
rename to drivers/base/bootvid/i386/pc/vga.c
diff --git a/drivers/base/bootvid/vga.h b/drivers/base/bootvid/i386/pc/vga.h
similarity index 100%
rename from drivers/base/bootvid/vga.h
rename to drivers/base/bootvid/i386/pc/vga.h
diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h
index 8fcc753b662..0a55332643f 100644
--- a/drivers/base/bootvid/precomp.h
+++ b/drivers/base/bootvid/precomp.h
@@ -12,7 +12,7 @@
 #define BOOTCHAR_WIDTH  8 // Each character line is encoded in a UCHAR.
 
 #ifndef _M_ARM
-#include "vga.h"
+#include "i386/pc/vga.h"
 #endif /* _M_ARM */
 
 /* Bitmap Header */