diff --git a/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift b/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
index bc8b865cc..7dcac5e9f 100644
--- a/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
@@ -33,7 +33,7 @@ public final class LokiFileServerAPI : LokiDotNetAPI {
             let queryParameters = "ids=\(hexEncodedPublicKeys.map { "@\($0)" }.joined(separator: ","))&include_user_annotations=1"
             let url = URL(string: "\(server)/users?\(queryParameters)")!
             let request = TSRequest(url: url)
-            return TSNetworkManager.shared().perform(request, withCompletionQueue: DispatchQueue.global()).map(on: DispatchQueue.global()) { $0.responseObject }.map(on: DispatchQueue.global()) { rawResponse -> Set<DeviceLink> in
+            return LokiFileServerProxy(for: server).perform(request, withCompletionQueue: DispatchQueue.global()).map(on: DispatchQueue.global()) { rawResponse -> Set<DeviceLink> in
                 guard let json = rawResponse as? JSON, let data = json["data"] as? [JSON] else {
                     print("[Loki] Couldn't parse device links for users: \(hexEncodedPublicKeys) from: \(rawResponse).")
                     throw LokiDotNetAPIError.parsingFailed
@@ -95,7 +95,7 @@ public final class LokiFileServerAPI : LokiDotNetAPI {
             let url = URL(string: "\(server)/users/me")!
             let request = TSRequest(url: url, method: "PATCH", parameters: parameters)
             request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
-            return TSNetworkManager.shared().perform(request).map { _ in }.retryingIfNeeded(maxRetryCount: 8).recover { error in
+            return LokiFileServerProxy(for: server).perform(request).map { _ in }.retryingIfNeeded(maxRetryCount: 8).recover { error in
                 print("Couldn't update device links due to error: \(error).")
                 throw error
             }
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiChannelInfo.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiChannelInfo.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiChannelInfo.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiChannelInfo.swift
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChat.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChat.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChat.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChat.swift
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatAPI.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatAPI.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatAPI.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatAPI.swift
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatInfo.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatInfo.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatInfo.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatInfo.swift
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatManager.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatManager.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatManager.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatManager.swift
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatMessage.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatMessage.swift
diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift b/SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatPoller.swift
similarity index 100%
rename from SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift
rename to SignalServiceKit/src/Loki/API/Public Chats/LokiPublicChatPoller.swift