diff --git a/cache/src/main/java/net/runelite/cache/downloader/CacheClient.java b/cache/src/main/java/net/runelite/cache/client/CacheClient.java
similarity index 97%
rename from cache/src/main/java/net/runelite/cache/downloader/CacheClient.java
rename to cache/src/main/java/net/runelite/cache/client/CacheClient.java
index d517271316..cc474f891b 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/CacheClient.java
+++ b/cache/src/main/java/net/runelite/cache/client/CacheClient.java
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.downloader;
+package net.runelite.cache.client;
 
 import com.google.common.base.Stopwatch;
 import io.netty.bootstrap.Bootstrap;
@@ -43,9 +43,9 @@ import java.util.ArrayDeque;
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import net.runelite.cache.downloader.requests.ConnectionInfo;
-import net.runelite.cache.downloader.requests.FileRequest;
-import net.runelite.cache.downloader.requests.HelloHandshake;
+import net.runelite.cache.client.requests.ConnectionInfo;
+import net.runelite.cache.client.requests.FileRequest;
+import net.runelite.cache.client.requests.HelloHandshake;
 import net.runelite.cache.fs.Archive;
 import net.runelite.cache.fs.Index;
 import net.runelite.cache.fs.Store;
diff --git a/cache/src/main/java/net/runelite/cache/downloader/CacheClientHandler.java b/cache/src/main/java/net/runelite/cache/client/CacheClientHandler.java
similarity index 98%
rename from cache/src/main/java/net/runelite/cache/downloader/CacheClientHandler.java
rename to cache/src/main/java/net/runelite/cache/client/CacheClientHandler.java
index ba54a591d8..9cd9b0c6b4 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/CacheClientHandler.java
+++ b/cache/src/main/java/net/runelite/cache/client/CacheClientHandler.java
@@ -22,14 +22,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.downloader;
+package net.runelite.cache.client;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.util.ReferenceCountUtil;
-import net.runelite.cache.downloader.requests.HelloHandshake;
+import net.runelite.cache.client.requests.HelloHandshake;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/cache/src/main/java/net/runelite/cache/downloader/ClientState.java b/cache/src/main/java/net/runelite/cache/client/ClientState.java
similarity index 97%
rename from cache/src/main/java/net/runelite/cache/downloader/ClientState.java
rename to cache/src/main/java/net/runelite/cache/client/ClientState.java
index 9fffbe93e5..5c859aa61c 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/ClientState.java
+++ b/cache/src/main/java/net/runelite/cache/client/ClientState.java
@@ -22,8 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.runelite.cache.downloader;
+package net.runelite.cache.client;
 
 public enum ClientState
 {
diff --git a/cache/src/main/java/net/runelite/cache/downloader/FileResult.java b/cache/src/main/java/net/runelite/cache/client/FileResult.java
similarity index 98%
rename from cache/src/main/java/net/runelite/cache/downloader/FileResult.java
rename to cache/src/main/java/net/runelite/cache/client/FileResult.java
index 59bb096a41..4b7bffb76f 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/FileResult.java
+++ b/cache/src/main/java/net/runelite/cache/client/FileResult.java
@@ -22,8 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.runelite.cache.downloader;
+package net.runelite.cache.client;
 
 import java.io.IOException;
 import net.runelite.cache.fs.DataFile;
diff --git a/cache/src/main/java/net/runelite/cache/downloader/PendingFileRequest.java b/cache/src/main/java/net/runelite/cache/client/PendingFileRequest.java
similarity index 95%
rename from cache/src/main/java/net/runelite/cache/downloader/PendingFileRequest.java
rename to cache/src/main/java/net/runelite/cache/client/PendingFileRequest.java
index 1bb252bb03..6c23b93a9a 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/PendingFileRequest.java
+++ b/cache/src/main/java/net/runelite/cache/client/PendingFileRequest.java
@@ -22,11 +22,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.runelite.cache.downloader;
+package net.runelite.cache.client;
 
 import java.util.concurrent.CompletableFuture;
-import net.runelite.cache.downloader.requests.FileRequest;
+import net.runelite.cache.client.requests.FileRequest;
 
 public class PendingFileRequest
 {
diff --git a/cache/src/main/java/net/runelite/cache/downloader/requests/ConnectionInfo.java b/cache/src/main/java/net/runelite/cache/client/requests/ConnectionInfo.java
similarity index 97%
rename from cache/src/main/java/net/runelite/cache/downloader/requests/ConnectionInfo.java
rename to cache/src/main/java/net/runelite/cache/client/requests/ConnectionInfo.java
index caaee113eb..49b23358c0 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/requests/ConnectionInfo.java
+++ b/cache/src/main/java/net/runelite/cache/client/requests/ConnectionInfo.java
@@ -22,8 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.runelite.cache.downloader.requests;
+package net.runelite.cache.client.requests;
 
 public class ConnectionInfo
 {
diff --git a/cache/src/main/java/net/runelite/cache/downloader/requests/FileRequest.java b/cache/src/main/java/net/runelite/cache/client/requests/FileRequest.java
similarity index 97%
rename from cache/src/main/java/net/runelite/cache/downloader/requests/FileRequest.java
rename to cache/src/main/java/net/runelite/cache/client/requests/FileRequest.java
index 73dbaa2445..ff4d010cfd 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/requests/FileRequest.java
+++ b/cache/src/main/java/net/runelite/cache/client/requests/FileRequest.java
@@ -22,8 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.runelite.cache.downloader.requests;
+package net.runelite.cache.client.requests;
 
 public class FileRequest
 {
diff --git a/cache/src/main/java/net/runelite/cache/downloader/requests/HelloHandshake.java b/cache/src/main/java/net/runelite/cache/client/requests/HelloHandshake.java
similarity index 98%
rename from cache/src/main/java/net/runelite/cache/downloader/requests/HelloHandshake.java
rename to cache/src/main/java/net/runelite/cache/client/requests/HelloHandshake.java
index 528f4b6378..6cda7577e8 100644
--- a/cache/src/main/java/net/runelite/cache/downloader/requests/HelloHandshake.java
+++ b/cache/src/main/java/net/runelite/cache/client/requests/HelloHandshake.java
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.downloader.requests;
+package net.runelite.cache.client.requests;
 
 public class HelloHandshake
 {
diff --git a/cache/src/main/java/net/runelite/cache/server/CacheServerHandler.java b/cache/src/main/java/net/runelite/cache/server/CacheServerHandler.java
index 83c304ae45..20588ca7c1 100644
--- a/cache/src/main/java/net/runelite/cache/server/CacheServerHandler.java
+++ b/cache/src/main/java/net/runelite/cache/server/CacheServerHandler.java
@@ -31,8 +31,8 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import java.io.IOException;
 import java.util.Arrays;
-import net.runelite.cache.downloader.requests.ConnectionInfo;
-import net.runelite.cache.downloader.requests.HelloHandshake;
+import net.runelite.cache.client.requests.ConnectionInfo;
+import net.runelite.cache.client.requests.HelloHandshake;
 import net.runelite.cache.fs.Archive;
 import net.runelite.cache.fs.CompressionType;
 import net.runelite.cache.fs.DataFile;
diff --git a/cache/src/test/java/net/runelite/cache/downloader/CacheClientTest.java b/cache/src/test/java/net/runelite/cache/client/CacheClientTest.java
similarity index 98%
rename from cache/src/test/java/net/runelite/cache/downloader/CacheClientTest.java
rename to cache/src/test/java/net/runelite/cache/client/CacheClientTest.java
index 2fbb6ccada..fc60965415 100644
--- a/cache/src/test/java/net/runelite/cache/downloader/CacheClientTest.java
+++ b/cache/src/test/java/net/runelite/cache/client/CacheClientTest.java
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.downloader;
+package net.runelite.cache.client;
 
 import java.io.File;
 import java.util.concurrent.CompletableFuture;
diff --git a/cache/src/test/java/net/runelite/cache/server/CacheServerTest.java b/cache/src/test/java/net/runelite/cache/server/CacheServerTest.java
index f71b4bc804..3abfb12713 100644
--- a/cache/src/test/java/net/runelite/cache/server/CacheServerTest.java
+++ b/cache/src/test/java/net/runelite/cache/server/CacheServerTest.java
@@ -26,7 +26,7 @@ package net.runelite.cache.server;
 
 import java.io.FileNotFoundException;
 import net.runelite.cache.StoreLocation;
-import net.runelite.cache.downloader.CacheClient;
+import net.runelite.cache.client.CacheClient;
 import net.runelite.cache.fs.Archive;
 import net.runelite.cache.fs.File;
 import net.runelite.cache.fs.Index;