diff --git a/Makefile b/Makefile
index fcbf773a08..89e882a6fd 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,6 @@ BL_COMMON_SOURCES	:=	common/bl_common.c			\
 				lib/aarch64/misc_helpers.S		\
 				lib/aarch64/xlat_helpers.c		\
 				lib/stdlib/std.c			\
-				lib/io_storage.c			\
 				plat/common/aarch64/platform_helpers.S
 
 BUILD_BASE		:=	./build
@@ -180,6 +179,7 @@ INCLUDES		+=	-Iinclude/bl31			\
 				-Iinclude/common		\
 				-Iinclude/drivers		\
 				-Iinclude/drivers/arm		\
+				-Iinclude/drivers/io		\
 				-Iinclude/lib			\
 				-Iinclude/lib/aarch64		\
 				-Iinclude/plat/common		\
diff --git a/lib/io_storage.c b/drivers/io/io_storage.c
similarity index 100%
rename from lib/io_storage.c
rename to drivers/io/io_storage.c
diff --git a/include/drivers/io_driver.h b/include/drivers/io/io_driver.h
similarity index 100%
rename from include/drivers/io_driver.h
rename to include/drivers/io/io_driver.h
diff --git a/include/drivers/io_fip.h b/include/drivers/io/io_fip.h
similarity index 100%
rename from include/drivers/io_fip.h
rename to include/drivers/io/io_fip.h
diff --git a/include/drivers/io_memmap.h b/include/drivers/io/io_memmap.h
similarity index 100%
rename from include/drivers/io_memmap.h
rename to include/drivers/io/io_memmap.h
diff --git a/include/drivers/io_semihosting.h b/include/drivers/io/io_semihosting.h
similarity index 100%
rename from include/drivers/io_semihosting.h
rename to include/drivers/io/io_semihosting.h
diff --git a/include/lib/io_storage.h b/include/drivers/io/io_storage.h
similarity index 100%
rename from include/lib/io_storage.h
rename to include/drivers/io/io_storage.h
diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 8a33a608b7..ffed7e4e9a 100644
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -66,6 +66,7 @@ PLAT_BL_COMMON_SOURCES	:=	drivers/arm/pl011/pl011_console.S		\
 				drivers/io/io_fip.c				\
 				drivers/io/io_memmap.c				\
 				drivers/io/io_semihosting.c			\
+				drivers/io/io_storage.c				\
 				lib/aarch64/xlat_tables.c			\
 				lib/semihosting/semihosting.c			\
 				lib/semihosting/aarch64/semihosting_call.S	\