livekit · MaxHeimbrock · Jun 26, 2026 · Jun 25, 2026 · Jun 25, 2026 · Jun 25, 2026
diff --git a/Runtime/Scripts/Audio.meta b/Runtime/Scripts/Audio.meta
diff --git a/Runtime/Scripts/AudioFrame.cs → Runtime/Scripts/Audio/AudioFrame.cs b/Runtime/Scripts/AudioFrame.cs → Runtime/Scripts/Audio/AudioFrame.cs
@@ -3,6 +3,7 @@
 using LiveKit.Internal;
 using Unity.Collections;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public class AudioFrame : IDisposable

diff --git a/Runtime/Scripts/AudioFrame.cs.meta → Runtime/Scripts/Audio/AudioFrame.cs.meta b/Runtime/Scripts/AudioFrame.cs.meta → Runtime/Scripts/Audio/AudioFrame.cs.meta
diff --git a/Runtime/Scripts/Internal/AudioProbe.cs → Runtime/Scripts/Audio/AudioProbe.cs b/Runtime/Scripts/Internal/AudioProbe.cs → Runtime/Scripts/Audio/AudioProbe.cs
diff --git a/Runtime/Scripts/Internal/AudioProbe.cs.meta → Runtime/Scripts/Audio/AudioProbe.cs.meta b/Runtime/Scripts/Internal/AudioProbe.cs.meta → Runtime/Scripts/Audio/AudioProbe.cs.meta
diff --git a/Runtime/Scripts/Internal/AudioResampler.cs → Runtime/Scripts/Audio/AudioResampler.cs b/Runtime/Scripts/Internal/AudioResampler.cs → Runtime/Scripts/Audio/AudioResampler.cs
@@ -1,8 +1,9 @@
 using System;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using LiveKit.Internal;
 using LiveKit.Proto;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public sealed class AudioResampler : IDisposable

diff --git a/...e/Scripts/Internal/AudioResampler.cs.meta → Runtime/Scripts/Audio/AudioResampler.cs.meta b/...e/Scripts/Internal/AudioResampler.cs.meta → Runtime/Scripts/Audio/AudioResampler.cs.meta
diff --git a/Runtime/Scripts/AudioStream.cs → Runtime/Scripts/Audio/AudioStream.cs b/Runtime/Scripts/AudioStream.cs → Runtime/Scripts/Audio/AudioStream.cs
@@ -3,8 +3,10 @@
 using LiveKit.Internal;
 using LiveKit.Proto;
 using System.Runtime.InteropServices;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 
+using LiveKit.Internal.Threading;
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/AudioStream.cs.meta → Runtime/Scripts/Audio/AudioStream.cs.meta b/Runtime/Scripts/AudioStream.cs.meta → Runtime/Scripts/Audio/AudioStream.cs.meta
diff --git a/Runtime/Scripts/BasicAudioSource.cs → Runtime/Scripts/Audio/BasicAudioSource.cs b/Runtime/Scripts/BasicAudioSource.cs → Runtime/Scripts/Audio/BasicAudioSource.cs
diff --git a/Runtime/Scripts/BasicAudioSource.cs.meta → ...me/Scripts/Audio/BasicAudioSource.cs.meta b/Runtime/Scripts/BasicAudioSource.cs.meta → ...me/Scripts/Audio/BasicAudioSource.cs.meta
diff --git a/Runtime/Scripts/MicrophoneSource.cs → Runtime/Scripts/Audio/MicrophoneSource.cs b/Runtime/Scripts/MicrophoneSource.cs → Runtime/Scripts/Audio/MicrophoneSource.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using LiveKit.Internal;
 
+using LiveKit.Internal.Threading;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/MicrophoneSource.cs.meta → ...me/Scripts/Audio/MicrophoneSource.cs.meta b/Runtime/Scripts/MicrophoneSource.cs.meta → ...me/Scripts/Audio/MicrophoneSource.cs.meta
diff --git a/Runtime/Scripts/PlatformAudio.cs → Runtime/Scripts/Audio/PlatformAudio.cs b/Runtime/Scripts/PlatformAudio.cs → Runtime/Scripts/Audio/PlatformAudio.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using LiveKit.Proto;
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 
 #if UNITY_IOS && !UNITY_EDITOR
 using System.Runtime.InteropServices;
@@ -13,6 +13,7 @@
 using UnityEngine.Android;
 #endif
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
 #if UNITY_IOS && !UNITY_EDITOR

diff --git a/Runtime/Scripts/PlatformAudio.cs.meta → Runtime/Scripts/Audio/PlatformAudio.cs.meta b/Runtime/Scripts/PlatformAudio.cs.meta → Runtime/Scripts/Audio/PlatformAudio.cs.meta
diff --git a/Runtime/Scripts/PlatformAudioSource.cs → Runtime/Scripts/Audio/PlatformAudioSource.cs b/Runtime/Scripts/PlatformAudioSource.cs → Runtime/Scripts/Audio/PlatformAudioSource.cs
@@ -1,8 +1,9 @@
 using System;
 using LiveKit.Proto;
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/PlatformAudioSource.cs.meta → ...Scripts/Audio/PlatformAudioSource.cs.meta b/Runtime/Scripts/PlatformAudioSource.cs.meta → ...Scripts/Audio/PlatformAudioSource.cs.meta
diff --git a/Runtime/Scripts/Internal/RingBuffer.cs → Runtime/Scripts/Audio/RingBuffer.cs b/Runtime/Scripts/Internal/RingBuffer.cs → Runtime/Scripts/Audio/RingBuffer.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Buffers;
-using LiveKit.Internal.FFIClients.Pools.Memory;
+using LiveKit.Internal.FFI.Pools.Memory;
 
-namespace LiveKit.Internal
+namespace LiveKit
 {
     // Basic RingBuffer implementation (used WebRtc_RingBuffer as reference)
     // The one from com.unity.collections is dealing element per element, which is not efficient when dealing with bytes

diff --git a/Runtime/Scripts/Internal/RingBuffer.cs.meta → Runtime/Scripts/Audio/RingBuffer.cs.meta b/Runtime/Scripts/Internal/RingBuffer.cs.meta → Runtime/Scripts/Audio/RingBuffer.cs.meta
diff --git a/Runtime/Scripts/RtcAudioSource.cs → Runtime/Scripts/Audio/RtcAudioSource.cs b/Runtime/Scripts/RtcAudioSource.cs → Runtime/Scripts/Audio/RtcAudioSource.cs
@@ -3,12 +3,13 @@
 using System.Collections.Generic;
 using LiveKit.Proto;
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using System.Diagnostics;
 using System.Threading;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/RtcAudioSource.cs.meta → Runtime/Scripts/Audio/RtcAudioSource.cs.meta b/Runtime/Scripts/RtcAudioSource.cs.meta → Runtime/Scripts/Audio/RtcAudioSource.cs.meta
diff --git a/Runtime/Scripts/Core.meta b/Runtime/Scripts/Core.meta
diff --git a/Runtime/Scripts/E2EE.cs → Runtime/Scripts/Core/E2EE.cs b/Runtime/Scripts/E2EE.cs → Runtime/Scripts/Core/E2EE.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using LiveKit.Proto;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public enum EncryptionType

diff --git a/Runtime/Scripts/E2EE.cs.meta → Runtime/Scripts/Core/E2EE.cs.meta b/Runtime/Scripts/E2EE.cs.meta → Runtime/Scripts/Core/E2EE.cs.meta
diff --git a/Runtime/Scripts/Participant.cs → Runtime/Scripts/Core/Participant.cs b/Runtime/Scripts/Participant.cs → Runtime/Scripts/Core/Participant.cs
@@ -4,9 +4,11 @@
 using System.Threading.Tasks;
 using LiveKit.Internal;
 using LiveKit.Proto;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using System.Diagnostics;
 
+using LiveKit.Internal.Threading;
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public delegate Task<string> RpcHandler(RpcInvocationData data);

diff --git a/Runtime/Scripts/Participant.cs.meta → Runtime/Scripts/Core/Participant.cs.meta b/Runtime/Scripts/Participant.cs.meta → Runtime/Scripts/Core/Participant.cs.meta
diff --git a/Runtime/Scripts/Room.cs → Runtime/Scripts/Core/Room.cs b/Runtime/Scripts/Room.cs → Runtime/Scripts/Core/Room.cs
@@ -3,9 +3,11 @@
 using LiveKit.Internal;
 using LiveKit.Proto;
 using System.Runtime.InteropServices;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using UnityEngine;
 
+using LiveKit.Internal.Threading;
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public enum IceTransportType
@@ -654,7 +656,7 @@ internal Participant GetParticipant(string identity)
         }
     }
 
-    public sealed class ConnectInstruction : YieldInstruction
+    public sealed class ConnectInstruction : LiveKit.Internal.Threading.YieldInstruction
     {
         private ulong _asyncId;
         private Room _room;

diff --git a/Runtime/Scripts/Room.cs.meta → Runtime/Scripts/Core/Room.cs.meta b/Runtime/Scripts/Room.cs.meta → Runtime/Scripts/Core/Room.cs.meta
diff --git a/Runtime/Scripts/Rpc.cs → Runtime/Scripts/Core/Rpc.cs b/Runtime/Scripts/Rpc.cs → Runtime/Scripts/Core/Rpc.cs
diff --git a/Runtime/Scripts/Rpc.cs.meta → Runtime/Scripts/Core/Rpc.cs.meta b/Runtime/Scripts/Rpc.cs.meta → Runtime/Scripts/Core/Rpc.cs.meta
diff --git a/Runtime/Scripts/RtcSource.cs → Runtime/Scripts/Core/RtcSource.cs b/Runtime/Scripts/RtcSource.cs → Runtime/Scripts/Core/RtcSource.cs
diff --git a/Runtime/Scripts/RtcSource.cs.meta → Runtime/Scripts/Core/RtcSource.cs.meta b/Runtime/Scripts/RtcSource.cs.meta → Runtime/Scripts/Core/RtcSource.cs.meta
diff --git a/Runtime/Scripts/Track.cs → Runtime/Scripts/Core/Track.cs b/Runtime/Scripts/Track.cs → Runtime/Scripts/Core/Track.cs
@@ -1,8 +1,10 @@
 using System;
 using LiveKit.Proto;
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 
+using LiveKit.Internal.Threading;
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public interface ITrack

diff --git a/Runtime/Scripts/Track.cs.meta → Runtime/Scripts/Core/Track.cs.meta b/Runtime/Scripts/Track.cs.meta → Runtime/Scripts/Core/Track.cs.meta
diff --git a/Runtime/Scripts/TrackPublication.cs → Runtime/Scripts/Core/TrackPublication.cs b/Runtime/Scripts/TrackPublication.cs → Runtime/Scripts/Core/TrackPublication.cs
@@ -1,7 +1,8 @@
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using LiveKit.Proto;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     public class TrackPublication

diff --git a/Runtime/Scripts/TrackPublication.cs.meta → ...ime/Scripts/Core/TrackPublication.cs.meta b/Runtime/Scripts/TrackPublication.cs.meta → ...ime/Scripts/Core/TrackPublication.cs.meta
diff --git a/Runtime/Scripts/DataStreams.meta b/Runtime/Scripts/DataStreams.meta
diff --git a/Runtime/Scripts/ByteDataStream.cs → ...ime/Scripts/DataStreams/ByteDataStream.cs b/Runtime/Scripts/ByteDataStream.cs → ...ime/Scripts/DataStreams/ByteDataStream.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using LiveKit.Internal;
 using LiveKit.Proto;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/ByteDataStream.cs.meta → ...cripts/DataStreams/ByteDataStream.cs.meta b/Runtime/Scripts/ByteDataStream.cs.meta → ...cripts/DataStreams/ByteDataStream.cs.meta
diff --git a/Runtime/Scripts/DataStream.cs → Runtime/Scripts/DataStreams/DataStream.cs b/Runtime/Scripts/DataStream.cs → Runtime/Scripts/DataStreams/DataStream.cs
@@ -4,6 +4,8 @@
 using LiveKit.Internal;
 using LiveKit.Proto;
 
+using LiveKit.Internal.Threading;
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/DataStream.cs.meta → ...me/Scripts/DataStreams/DataStream.cs.meta b/Runtime/Scripts/DataStream.cs.meta → ...me/Scripts/DataStreams/DataStream.cs.meta
diff --git a/Runtime/Scripts/DataTrack.cs → Runtime/Scripts/DataStreams/DataTrack.cs b/Runtime/Scripts/DataTrack.cs → Runtime/Scripts/DataStreams/DataTrack.cs
@@ -1,9 +1,11 @@
 using System;
 using LiveKit.Internal;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using LiveKit.Proto;
 using UnityEngine;
 
+using LiveKit.Internal.Threading;
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/DataTrack.cs.meta → ...ime/Scripts/DataStreams/DataTrack.cs.meta b/Runtime/Scripts/DataTrack.cs.meta → ...ime/Scripts/DataStreams/DataTrack.cs.meta
diff --git a/Runtime/Scripts/TextDataStream.cs → ...ime/Scripts/DataStreams/TextDataStream.cs b/Runtime/Scripts/TextDataStream.cs → ...ime/Scripts/DataStreams/TextDataStream.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using LiveKit.Internal.FFIClients.Requests;
+using LiveKit.Internal.FFI.Requests;
 using LiveKit.Internal;
 using LiveKit.Proto;
 
+using LiveKit.Internal.FFI;
 namespace LiveKit
 {
     /// <summary>

diff --git a/Runtime/Scripts/TextDataStream.cs.meta → ...cripts/DataStreams/TextDataStream.cs.meta b/Runtime/Scripts/TextDataStream.cs.meta → ...cripts/DataStreams/TextDataStream.cs.meta
diff --git a/Runtime/Scripts/Internal/FFIClients.meta → Runtime/Scripts/Internal/FFI.meta b/Runtime/Scripts/Internal/FFIClients.meta → Runtime/Scripts/Internal/FFI.meta
diff --git a/Runtime/Scripts/Internal/FFIClient.cs → Runtime/Scripts/Internal/FFI/FFIClient.cs b/Runtime/Scripts/Internal/FFIClient.cs → Runtime/Scripts/Internal/FFI/FFIClient.cs
@@ -4,16 +4,16 @@
 using UnityEngine;
 using Google.Protobuf;
 using System.Threading;
-using LiveKit.Internal.FFIClients;
-using LiveKit.Internal.FFIClients.Pools;
-using LiveKit.Internal.FFIClients.Pools.Memory;
+using LiveKit.Internal.FFI;
+using LiveKit.Internal.FFI.Pools;
+using LiveKit.Internal.FFI.Pools.Memory;
 using UnityEngine.Pool;
 
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 
-namespace LiveKit.Internal
+namespace LiveKit.Internal.FFI
 {
 #if UNITY_EDITOR
     [InitializeOnLoad]
@@ -64,7 +64,7 @@ internal sealed class FfiClient : IFFIClient
         // Data Track
         public event DataTrackStreamEventReceivedDelegate? DataTrackStreamEventReceived;
 
-        public FfiClient() : this(Pools.NewFfiResponsePool(), new ArrayMemoryPool())
+        public FfiClient() : this(PoolFactory.NewFfiResponsePool(), new ArrayMemoryPool())
         {
         }
 

diff --git a/Runtime/Scripts/Internal/FFIClient.cs.meta → ...me/Scripts/Internal/FFI/FFIClient.cs.meta b/Runtime/Scripts/Internal/FFIClient.cs.meta → ...me/Scripts/Internal/FFI/FFIClient.cs.meta
diff --git a/.../Scripts/Internal/FFIClients/FFIEvents.cs → Runtime/Scripts/Internal/FFI/FFIEvents.cs b/.../Scripts/Internal/FFIClients/FFIEvents.cs → Runtime/Scripts/Internal/FFI/FFIEvents.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using LiveKit.Proto;
 
-namespace LiveKit.Internal
+namespace LiveKit.Internal.FFI
 {
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 

diff --git a/...pts/Internal/FFIClients/FFIEvents.cs.meta → ...me/Scripts/Internal/FFI/FFIEvents.cs.meta b/...pts/Internal/FFIClients/FFIEvents.cs.meta → ...me/Scripts/Internal/FFI/FFIEvents.cs.meta
diff --git a/Runtime/Scripts/Internal/FFIHandle.cs → Runtime/Scripts/Internal/FFI/FFIHandle.cs b/Runtime/Scripts/Internal/FFIHandle.cs → Runtime/Scripts/Internal/FFI/FFIHandle.cs
@@ -3,7 +3,7 @@
 using System.Runtime.ConstrainedExecution;
 using LiveKit.Proto;
 
-namespace LiveKit.Internal
+namespace LiveKit.Internal.FFI
 {
     public class FfiHandle : SafeHandle
     {

diff --git a/Runtime/Scripts/Internal/FFIHandle.cs.meta → ...me/Scripts/Internal/FFI/FFIHandle.cs.meta b/Runtime/Scripts/Internal/FFIHandle.cs.meta → ...me/Scripts/Internal/FFI/FFIHandle.cs.meta
diff --git a/Runtime/Scripts/Internal/FfiInstruction.cs → ...me/Scripts/Internal/FFI/FfiInstruction.cs b/Runtime/Scripts/Internal/FfiInstruction.cs → ...me/Scripts/Internal/FFI/FfiInstruction.cs
@@ -2,7 +2,8 @@
 using LiveKit.Internal;
 using LiveKit.Proto;
 
-namespace LiveKit
+using LiveKit.Internal.Threading;
+namespace LiveKit.Internal.FFI
 {
     /// <summary>
     /// Generic yield instruction for one-shot FFI callbacks that follow the standard pattern:

diff --git a/...e/Scripts/Internal/FfiInstruction.cs.meta → ...ripts/Internal/FFI/FfiInstruction.cs.meta b/...e/Scripts/Internal/FfiInstruction.cs.meta → ...ripts/Internal/FFI/FfiInstruction.cs.meta
diff --git a/...ternal/FFIClients/FfiRequestExtensions.cs → ...ipts/Internal/FFI/FfiRequestExtensions.cs b/...ternal/FFIClients/FfiRequestExtensions.cs → ...ipts/Internal/FFI/FfiRequestExtensions.cs
@@ -5,7 +5,7 @@
 using System.Reflection;
 using LiveKit.Proto;
 
-namespace LiveKit.Internal.FFIClients
+namespace LiveKit.Internal.FFI
 {
     public static class FfiRequestExtensions
     {

diff --git a/...l/FFIClients/FfiRequestExtensions.cs.meta → ...Internal/FFI/FfiRequestExtensions.cs.meta b/...l/FFIClients/FfiRequestExtensions.cs.meta → ...Internal/FFI/FfiRequestExtensions.cs.meta
diff --git a/...ts/Internal/FFIClients/FfiResponseWrap.cs → ...e/Scripts/Internal/FFI/FfiResponseWrap.cs b/...ts/Internal/FFIClients/FfiResponseWrap.cs → ...e/Scripts/Internal/FFI/FfiResponseWrap.cs
@@ -1,7 +1,7 @@
 using System;
 using LiveKit.Proto;
 
-namespace LiveKit.Internal.FFIClients
+namespace LiveKit.Internal.FFI
 {
     public readonly struct FfiResponseWrap : IDisposable
     {

diff --git a/...ternal/FFIClients/FfiResponseWrap.cs.meta → ...ipts/Internal/FFI/FfiResponseWrap.cs.meta b/...ternal/FFIClients/FfiResponseWrap.cs.meta → ...ipts/Internal/FFI/FfiResponseWrap.cs.meta
diff --git a/...Scripts/Internal/FFIClients/IFFIClient.cs → Runtime/Scripts/Internal/FFI/IFFIClient.cs b/...Scripts/Internal/FFIClients/IFFIClient.cs → Runtime/Scripts/Internal/FFI/IFFIClient.cs
@@ -1,7 +1,7 @@
 using System;
 using LiveKit.Proto;
 
-namespace LiveKit.Internal.FFIClients
+namespace LiveKit.Internal.FFI
 {
     /// <summary>
     /// Thread-safe interface for sending requests to the FFI layer

diff --git a/...ts/Internal/FFIClients/IFFIClient.cs.meta → ...e/Scripts/Internal/FFI/IFFIClient.cs.meta b/...ts/Internal/FFIClients/IFFIClient.cs.meta → ...e/Scripts/Internal/FFI/IFFIClient.cs.meta
diff --git a/Runtime/Scripts/Internal/NativeMethods.cs → ...ime/Scripts/Internal/FFI/NativeMethods.cs b/Runtime/Scripts/Internal/NativeMethods.cs → ...ime/Scripts/Internal/FFI/NativeMethods.cs
@@ -5,7 +5,7 @@
 
 using FfiHandleId = System.IntPtr;
 
-namespace LiveKit.Internal
+namespace LiveKit.Internal.FFI
 {
     [SuppressUnmanagedCodeSecurity]
     internal static class NativeMethods

diff --git a/...me/Scripts/Internal/NativeMethods.cs.meta → ...cripts/Internal/FFI/NativeMethods.cs.meta b/...me/Scripts/Internal/NativeMethods.cs.meta → ...cripts/Internal/FFI/NativeMethods.cs.meta
diff --git a/...me/Scripts/Internal/FFIClients/Pools.meta → Runtime/Scripts/Internal/FFI/Pools.meta b/...me/Scripts/Internal/FFIClients/Pools.meta → Runtime/Scripts/Internal/FFI/Pools.meta
diff --git a/...s/Internal/FFIClients/Pools/IMultiPool.cs → .../Scripts/Internal/FFI/Pools/IMultiPool.cs b/...s/Internal/FFIClients/Pools/IMultiPool.cs → .../Scripts/Internal/FFI/Pools/IMultiPool.cs
@@ -1,4 +1,4 @@
-namespace LiveKit.Internal.FFIClients.Pools
+namespace LiveKit.Internal.FFI.Pools
 {
     public interface IMultiPool
     {

diff --git a/...ernal/FFIClients/Pools/IMultiPool.cs.meta → ...pts/Internal/FFI/Pools/IMultiPool.cs.meta b/...ernal/FFIClients/Pools/IMultiPool.cs.meta → ...pts/Internal/FFI/Pools/IMultiPool.cs.meta
diff --git a/...pts/Internal/FFIClients/Pools/Memory.meta → ...me/Scripts/Internal/FFI/Pools/Memory.meta b/...pts/Internal/FFIClients/Pools/Memory.meta → ...me/Scripts/Internal/FFI/Pools/Memory.meta
diff --git a/...FIClients/Pools/Memory/ArrayMemoryPool.cs → ...ernal/FFI/Pools/Memory/ArrayMemoryPool.cs b/...FIClients/Pools/Memory/ArrayMemoryPool.cs → ...ernal/FFI/Pools/Memory/ArrayMemoryPool.cs
@@ -1,6 +1,6 @@
 using System.Buffers;
 
-namespace LiveKit.Internal.FFIClients.Pools.Memory
+namespace LiveKit.Internal.FFI.Pools.Memory
 {
     public class ArrayMemoryPool : IMemoryPool
     {

diff --git a/...ents/Pools/Memory/ArrayMemoryPool.cs.meta → .../FFI/Pools/Memory/ArrayMemoryPool.cs.meta b/...ents/Pools/Memory/ArrayMemoryPool.cs.meta → .../FFI/Pools/Memory/ArrayMemoryPool.cs.meta
diff --git a/...al/FFIClients/Pools/Memory/IMemoryPool.cs → .../Internal/FFI/Pools/Memory/IMemoryPool.cs b/...al/FFIClients/Pools/Memory/IMemoryPool.cs → .../Internal/FFI/Pools/Memory/IMemoryPool.cs
@@ -1,6 +1,6 @@
 using Google.Protobuf;
 
-namespace LiveKit.Internal.FFIClients.Pools.Memory
+namespace LiveKit.Internal.FFI.Pools.Memory
 {
     public interface IMemoryPool
     {

diff --git a/...IClients/Pools/Memory/IMemoryPool.cs.meta → ...rnal/FFI/Pools/Memory/IMemoryPool.cs.meta b/...IClients/Pools/Memory/IMemoryPool.cs.meta → ...rnal/FFI/Pools/Memory/IMemoryPool.cs.meta
diff --git a/...nal/FFIClients/Pools/Memory/MemoryWrap.cs → ...s/Internal/FFI/Pools/Memory/MemoryWrap.cs b/...nal/FFIClients/Pools/Memory/MemoryWrap.cs → ...s/Internal/FFI/Pools/Memory/MemoryWrap.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LiveKit.Internal.FFIClients.Pools.Memory
+namespace LiveKit.Internal.FFI.Pools.Memory
 {
     public readonly struct MemoryWrap : IDisposable
     {

diff --git a/...FIClients/Pools/Memory/MemoryWrap.cs.meta → ...ernal/FFI/Pools/Memory/MemoryWrap.cs.meta b/...FIClients/Pools/Memory/MemoryWrap.cs.meta → ...ernal/FFI/Pools/Memory/MemoryWrap.cs.meta
diff --git a/...cripts/Internal/FFIClients/Pools/Pools.cs → ...Scripts/Internal/FFI/Pools/PoolFactory.cs b/...cripts/Internal/FFIClients/Pools/Pools.cs → ...Scripts/Internal/FFI/Pools/PoolFactory.cs
@@ -1,11 +1,10 @@
 using System;
-using LiveKit.Internal.FFIClients.Pools.ObjectPool;
 using LiveKit.Proto;
 using UnityEngine.Pool;
 
-namespace LiveKit.Internal.FFIClients.Pools//
+namespace LiveKit.Internal.FFI.Pools
 {
-    public static class Pools
+    public static class PoolFactory
     {
         public static IObjectPool<FfiResponse> NewFfiResponsePool()
         {

diff --git a/...s/Internal/FFIClients/Pools/Pools.cs.meta → ...ts/Internal/FFI/Pools/PoolFactory.cs.meta b/...s/Internal/FFIClients/Pools/Pools.cs.meta → ...ts/Internal/FFI/Pools/PoolFactory.cs.meta
diff --git a/...l/FFIClients/Pools/ThreadSafeMultiPool.cs → ...Internal/FFI/Pools/ThreadSafeMultiPool.cs b/...l/FFIClients/Pools/ThreadSafeMultiPool.cs → ...Internal/FFI/Pools/ThreadSafeMultiPool.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Concurrent;
-using LiveKit.Internal.FFIClients.Pools.ObjectPool;
 using UnityEngine.Pool;
 
-namespace LiveKit.Internal.FFIClients.Pools
+namespace LiveKit.Internal.FFI.Pools
 {
     public class ThreadSafeMultiPool : IMultiPool
     {

diff --git a/...Clients/Pools/ThreadSafeMultiPool.cs.meta → ...nal/FFI/Pools/ThreadSafeMultiPool.cs.meta b/...Clients/Pools/ThreadSafeMultiPool.cs.meta → ...nal/FFI/Pools/ThreadSafeMultiPool.cs.meta
diff --git a/.../Pools/ObjectPool/ThreadSafeObjectPool.cs → ...nternal/FFI/Pools/ThreadSafeObjectPool.cs b/.../Pools/ObjectPool/ThreadSafeObjectPool.cs → ...nternal/FFI/Pools/ThreadSafeObjectPool.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using UnityEngine.Pool;
 
-namespace LiveKit.Internal.FFIClients.Pools.ObjectPool
+namespace LiveKit.Internal.FFI.Pools
 {
     public class ThreadSafeObjectPool<T> : IObjectPool<T> where T : class
     {

diff --git a/...s/ObjectPool/ThreadSafeObjectPool.cs.meta → ...al/FFI/Pools/ThreadSafeObjectPool.cs.meta b/...s/ObjectPool/ThreadSafeObjectPool.cs.meta → ...al/FFI/Pools/ThreadSafeObjectPool.cs.meta
diff --git a/...Scripts/Internal/FFIClients/Requests.meta → Runtime/Scripts/Internal/FFI/Requests.meta b/...Scripts/Internal/FFIClients/Requests.meta → Runtime/Scripts/Internal/FFI/Requests.meta