diff --git a/inc/Data/Driver/ApcuCacheDriver.php b/inc/Data/Driver/Cache/ApcuCacheDriver.php
similarity index 93%
rename from inc/Data/Driver/ApcuCacheDriver.php
rename to inc/Data/Driver/Cache/ApcuCacheDriver.php
index a39bb656..4aeb64cd 100644
--- a/inc/Data/Driver/ApcuCacheDriver.php
+++ b/inc/Data/Driver/Cache/ApcuCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/ArrayCacheDriver.php b/inc/Data/Driver/Cache/ArrayCacheDriver.php
similarity index 93%
rename from inc/Data/Driver/ArrayCacheDriver.php
rename to inc/Data/Driver/Cache/ArrayCacheDriver.php
index bb0cd310..1918bb62 100644
--- a/inc/Data/Driver/ArrayCacheDriver.php
+++ b/inc/Data/Driver/Cache/ArrayCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/CacheDriver.php b/inc/Data/Driver/Cache/CacheDriver.php
similarity index 96%
rename from inc/Data/Driver/CacheDriver.php
rename to inc/Data/Driver/Cache/CacheDriver.php
index 083ed652..124cbf71 100644
--- a/inc/Data/Driver/CacheDriver.php
+++ b/inc/Data/Driver/Cache/CacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/CacheDriverTrait.php b/inc/Data/Driver/Cache/CacheDriverTrait.php
similarity index 92%
rename from inc/Data/Driver/CacheDriverTrait.php
rename to inc/Data/Driver/Cache/CacheDriverTrait.php
index 16e56ce0..c834b572 100644
--- a/inc/Data/Driver/CacheDriverTrait.php
+++ b/inc/Data/Driver/Cache/CacheDriverTrait.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 
 trait CacheDriverTrait {
diff --git a/inc/Data/Driver/FsCachedriver.php b/inc/Data/Driver/Cache/FsCachedriver.php
similarity index 99%
rename from inc/Data/Driver/FsCachedriver.php
rename to inc/Data/Driver/Cache/FsCachedriver.php
index b543cfa6..a6ca727f 100644
--- a/inc/Data/Driver/FsCachedriver.php
+++ b/inc/Data/Driver/Cache/FsCachedriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/MemcacheCacheDriver.php b/inc/Data/Driver/Cache/MemcacheCacheDriver.php
similarity index 98%
rename from inc/Data/Driver/MemcacheCacheDriver.php
rename to inc/Data/Driver/Cache/MemcacheCacheDriver.php
index 22330108..24dbb792 100644
--- a/inc/Data/Driver/MemcacheCacheDriver.php
+++ b/inc/Data/Driver/Cache/MemcacheCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/NoneCacheDriver.php b/inc/Data/Driver/Cache/NoneCacheDriver.php
similarity index 91%
rename from inc/Data/Driver/NoneCacheDriver.php
rename to inc/Data/Driver/Cache/NoneCacheDriver.php
index 8b260a50..92d0394b 100644
--- a/inc/Data/Driver/NoneCacheDriver.php
+++ b/inc/Data/Driver/Cache/NoneCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/RedisCacheDriver.php b/inc/Data/Driver/Cache/RedisCacheDriver.php
similarity index 97%
rename from inc/Data/Driver/RedisCacheDriver.php
rename to inc/Data/Driver/Cache/RedisCacheDriver.php
index c71c8779..b49d8e55 100644
--- a/inc/Data/Driver/RedisCacheDriver.php
+++ b/inc/Data/Driver/Cache/RedisCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;