diff --git a/inc/Data/IpNoteQueries.php b/inc/Data/IpNoteQueries.php
index ba6fdb15..835b50c2 100644
--- a/inc/Data/IpNoteQueries.php
+++ b/inc/Data/IpNoteQueries.php
@@ -1,7 +1,7 @@
 <?php
 namespace Vichan\Data;
 
-use Vichan\Data\Driver\CacheDriver;
+use Vichan\Data\Driver\Cache\CacheDriver;
 
 
 class IpNoteQueries {
diff --git a/inc/cache.php b/inc/cache.php
index 182d6fda..56cf90e2 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -4,7 +4,7 @@
  *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
 
-use Vichan\Data\Driver\{CacheDriver, ApcuCacheDriver, ArrayCacheDriver, FsCacheDriver, MemcachedCacheDriver, NoneCacheDriver, RedisCacheDriver};
+use Vichan\Data\Driver\Cache\{CacheDriver, ApcuCacheDriver, ArrayCacheDriver, FsCacheDriver, MemcachedCacheDriver, NoneCacheDriver, RedisCacheDriver};
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/context.php b/inc/context.php
index 78812121..595a6aa0 100644
--- a/inc/context.php
+++ b/inc/context.php
@@ -2,7 +2,8 @@
 namespace Vichan;
 
 use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries, Flags};
-use Vichan\Data\Driver\{CacheDriver, ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
+use Vichan\Data\Driver\Cache\CacheDriver;
+use Vichan\Data\Driver\{ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
 use Vichan\Service\SearchService;
 
 defined('TINYBOARD') or exit;