From 8ecbceacc6235b2e042f3c0610c7209139c9735f Mon Sep 17 00:00:00 2001
From: Luca Maccarini <lucamaccarini22@gmail.com>
Date: Fri, 15 Aug 2025 03:46:25 +0200
Subject: [PATCH 1/4] fix runtimes copy, preserving runtimes folder structure

---
 .gitignore                                   |  3 ++-
 LLama/runtimes/build/LLamaSharpBackend.props | 18 ++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 206b0dac1..e692a8b99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -351,4 +351,5 @@ site/
 **/appsettings.Local.json
 /LLama/runtimes/deps
 /LLama/runtimes/deps.zip
-/LLama/runtimes/release_id.txt
\ No newline at end of file
+/LLama/runtimes/release_id.txt
+/Llama.Mobile/Resources/Raw
diff --git a/LLama/runtimes/build/LLamaSharpBackend.props b/LLama/runtimes/build/LLamaSharpBackend.props
index 49c95682b..9569a24be 100644
--- a/LLama/runtimes/build/LLamaSharpBackend.props
+++ b/LLama/runtimes/build/LLamaSharpBackend.props
@@ -1,18 +1,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!--
+    <!--
   NuGet packages.config doesn't support native assemblies automatically,
   so copy the native assemblies to the output directory.
   -->
-  <ItemGroup Condition="Exists('packages.config') OR
-                        Exists('$(MSBuildProjectName).packages.config') OR
-                        Exists('packages.$(MSBuildProjectName).config')">
-    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\**\*.*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Content>
-  </ItemGroup>
+    <ItemGroup>
+        <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\**\*.*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>false</Visible>
+            <Link>runtimes\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        </Content>
+    </ItemGroup>
 
     <!-- Start Android-->
     <ItemGroup

From e65b01bf0b24d40208e4bd3fce20eba7b3949aaf Mon Sep 17 00:00:00 2001
From: Luca Maccarini <lucamaccarini22@gmail.com>
Date: Fri, 15 Aug 2025 03:47:30 +0200
Subject: [PATCH 2/4] removed android runtimes manual copy

---
 LLama/runtimes/build/LLamaSharpBackend.props | 29 --------------------
 1 file changed, 29 deletions(-)

diff --git a/LLama/runtimes/build/LLamaSharpBackend.props b/LLama/runtimes/build/LLamaSharpBackend.props
index 9569a24be..f3b0cf39c 100644
--- a/LLama/runtimes/build/LLamaSharpBackend.props
+++ b/LLama/runtimes/build/LLamaSharpBackend.props
@@ -13,35 +13,6 @@
     </ItemGroup>
 
     <!-- Start Android-->
-    <ItemGroup
-        Condition="$(AndroidSupportedAbis.Contains('x86')) or $(RuntimeIdentifiers.Contains('android-x86'))">
-        <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libllama.so">
-            <Link>runtimes\android-x86\native\libllama.so</Link>
-            <Abi>x86</Abi>
-        </AndroidNativeLibrary>
-        <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libggml.so">
-            <Link>runtimes\android-x86\native\libggml.so</Link>
-            <Abi>x86</Abi>
-        </AndroidNativeLibrary>
-        <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libggml-base.so">
-            <Link>runtimes\android-x86\native\libggml-base.so</Link>
-            <Abi>x86</Abi>
-        </AndroidNativeLibrary>
-        <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libggml-cpu.so">
-            <Link>runtimes\android-x86\native\libggml-cpu.so</Link>
-            <Abi>x86</Abi>
-        </AndroidNativeLibrary>
-        <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libmtmd.so">
-            <Link>runtimes\android-x86\native\libmtmd.so</Link>
-            <Abi>x86</Abi>
-        </AndroidNativeLibrary>
-    </ItemGroup>
-
     <ItemGroup
         Condition="$(AndroidSupportedAbis.Contains('x86_64')) or $(RuntimeIdentifiers.Contains('android-x64'))">
         <AndroidNativeLibrary Visible="false"

From 3fbef0e467832e66bcaae87819e18b57d0f7c922 Mon Sep 17 00:00:00 2001
From: Luca Maccarini <lucamaccarini22@gmail.com>
Date: Fri, 15 Aug 2025 05:39:23 +0200
Subject: [PATCH 3/4] commented android dll not present in 0.24.0

---
 LLama/runtimes/build/LLamaSharpBackend.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/LLama/runtimes/build/LLamaSharpBackend.props b/LLama/runtimes/build/LLamaSharpBackend.props
index f3b0cf39c..82b12fdd7 100644
--- a/LLama/runtimes/build/LLamaSharpBackend.props
+++ b/LLama/runtimes/build/LLamaSharpBackend.props
@@ -35,11 +35,11 @@
             <Link>lib\x86_64\libggml-cpu.so</Link>
             <Abi>x86_64</Abi>
         </AndroidNativeLibrary>
-        <AndroidNativeLibrary Visible="false"
+        <!--<AndroidNativeLibrary Visible="false"
             Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libmtmd.so">
             <Link>lib\x86_64\libmtmd.so</Link>
             <Abi>x86_64</Abi>
-        </AndroidNativeLibrary>
+        </AndroidNativeLibrary>-->
     </ItemGroup>
 
     <ItemGroup
@@ -64,11 +64,11 @@
             <Link>lib\arm64-v8a\libggml-cpu.so</Link>
             <Abi>arm64-v8a</Abi>
         </AndroidNativeLibrary>
-        <AndroidNativeLibrary Visible="false"
+        <!--<AndroidNativeLibrary Visible="false"
             Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libmtmd.so">
             <Link>lib\arm64-v8a\libmtmd.so</Link>
             <Abi>arm64-v8a</Abi>
-        </AndroidNativeLibrary>
+        </AndroidNativeLibrary>-->
     </ItemGroup>
     <!-- End Android -->
 

From 44a6085c66d411db7a203c2370bb20d1bb4d3644 Mon Sep 17 00:00:00 2001
From: Luca Maccarini <lucamaccarini22@gmail.com>
Date: Sun, 17 Aug 2025 16:20:37 +0200
Subject: [PATCH 4/4] improved issue solution in order to avoid extra
 installation step

---
 .../LLamaSharp.Backend.Cpu.Android.nuspec     |  20 +-
 .../build/LLamaSharp.Backend.Cpu.nuspec       | 200 +++++++++---------
 .../LLamaSharp.Backend.Cuda12.Linux.nuspec    |  10 +-
 .../LLamaSharp.Backend.Cuda12.Windows.nuspec  |  10 +-
 .../LLamaSharp.Backend.Vulkan.Linux.nuspec    |  10 +-
 .../LLamaSharp.Backend.Vulkan.Windows.nuspec  |  10 +-
 LLama/runtimes/build/LLamaSharpBackend.props  |  30 +--
 7 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/LLama/runtimes/build/LLamaSharp.Backend.Cpu.Android.nuspec b/LLama/runtimes/build/LLamaSharp.Backend.Cpu.Android.nuspec
index 2c538b3e3..1bea6a4d5 100644
--- a/LLama/runtimes/build/LLamaSharp.Backend.Cpu.Android.nuspec
+++ b/LLama/runtimes/build/LLamaSharp.Backend.Cpu.Android.nuspec
@@ -18,17 +18,17 @@
     <files>
         <file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cpu.Android.props" />
 
-        <file src="runtimes/deps/android-arm64-v8a/libllama.so" target="runtimes\android-arm64-v8a\native\libllama.so" />
-        <file src="runtimes/deps/android-arm64-v8a/libggml.so" target="runtimes\android-arm64-v8a\native\libggml.so" />
-        <file src="runtimes/deps/android-arm64-v8a/libggml-base.so" target="runtimes\android-arm64-v8a\native\libggml-base.so" />
-        <file src="runtimes/deps/android-arm64-v8a/libggml-cpu.so" target="runtimes\android-arm64-v8a\native\libggml-cpu.so" />
-        <file src="runtimes/deps/android-arm64-v8a/libmtmd.so" target="runtimes\android-arm64-v8a\native\libmtmd.so" />
+        <file src="../deps/android-arm64-v8a/libllama.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libllama.so" />
+        <file src="../deps/android-arm64-v8a/libggml.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libggml.so" />
+        <file src="../deps/android-arm64-v8a/libggml-base.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libggml-base.so" />
+        <file src="../deps/android-arm64-v8a/libggml-cpu.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libggml-cpu.so" />
+        <file src="../deps/android-arm64-v8a/libmtmd.so" target="LLamaSharpRuntimes\android-arm64-v8a\native\libmtmd.so" />
 
-        <file src="runtimes/deps/android-x86_64/libllama.so" target="runtimes\android-x86_64\native\libllama.so" />
-        <file src="runtimes/deps/android-x86_64/libggml.so" target="runtimes\android-x86_64\native\libggml.so" />
-        <file src="runtimes/deps/android-x86_64/libggml-base.so" target="runtimes\android-x86_64\native\libggml-base.so" />
-        <file src="runtimes/deps/android-x86_64/libggml-cpu.so" target="runtimes\android-x86_64\native\libggml-cpu.so" />
-        <file src="runtimes/deps/android-x86_64/libmtmd.so" target="runtimes\android-x86_64\native\libmtmd.so" />
+        <file src="../deps/android-x86_64/libllama.so" target="LLamaSharpRuntimes\android-x86_64\native\libllama.so" />
+        <file src="../deps/android-x86_64/libggml.so" target="LLamaSharpRuntimes\android-x86_64\native\libggml.so" />
+        <file src="../deps/android-x86_64/libggml-base.so" target="LLamaSharpRuntimes\android-x86_64\native\libggml-base.so" />
+        <file src="../deps/android-x86_64/libggml-cpu.so" target="LLamaSharpRuntimes\android-x86_64\native\libggml-cpu.so" />
+        <file src="../deps/android-x86_64/libmtmd.so" target="LLamaSharpRuntimes\android-x86_64\native\libmtmd.so" />
 
         <file src="icon512.png" target="icon512.png" />
     </files>
diff --git a/LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec b/LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec
index 8a9b19ed0..73fbdff84 100644
--- a/LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec
+++ b/LLama/runtimes/build/LLamaSharp.Backend.Cpu.nuspec
@@ -18,106 +18,106 @@
     <files>
         <file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cpu.props" />
 
-        <file src="runtimes/deps/noavx/ggml.dll" target="runtimes\win-x64\native\noavx\ggml.dll" />
-        <file src="runtimes/deps/noavx/ggml-base.dll" target="runtimes\win-x64\native\noavx\ggml-base.dll" />
-        <file src="runtimes/deps/noavx/ggml-cpu.dll" target="runtimes\win-x64\native\noavx\ggml-cpu.dll" />
-        <file src="runtimes/deps/noavx/llama.dll" target="runtimes\win-x64\native\noavx\llama.dll" />
-        <file src="runtimes/deps/noavx/mtmd.dll" target="runtimes\win-x64\native\noavx\mtmd.dll" />
-
-        <file src="runtimes/deps/avx/ggml.dll" target="runtimes\win-x64\native\avx\ggml.dll" />
-        <file src="runtimes/deps/avx/ggml-base.dll" target="runtimes\win-x64\native\avx\ggml-base.dll" />
-        <file src="runtimes/deps/avx/ggml-cpu.dll" target="runtimes\win-x64\native\avx\ggml-cpu.dll" />
-        <file src="runtimes/deps/avx/llama.dll" target="runtimes\win-x64\native\avx\llama.dll" />
-        <file src="runtimes/deps/avx/mtmd.dll" target="runtimes\win-x64\native\avx\mtmd.dll" />
-
-        <file src="runtimes/deps/avx2/ggml.dll" target="runtimes\win-x64\native\avx2\ggml.dll" />
-        <file src="runtimes/deps/avx2/ggml-base.dll" target="runtimes\win-x64\native\avx2\ggml-base.dll" />
-        <file src="runtimes/deps/avx2/ggml-cpu.dll" target="runtimes\win-x64\native\avx2\ggml-cpu.dll" />
-        <file src="runtimes/deps/avx2/llama.dll" target="runtimes\win-x64\native\avx2\llama.dll" />
-        <file src="runtimes/deps/avx2/mtmd.dll" target="runtimes\win-x64\native\avx2\mtmd.dll" />
-
-        <file src="runtimes/deps/avx512/ggml.dll" target="runtimes\win-x64\native\avx512\ggml.dll" />
-        <file src="runtimes/deps/avx512/ggml-base.dll" target="runtimes\win-x64\native\avx512\ggml-base.dll" />
-        <file src="runtimes/deps/avx512/ggml-cpu.dll" target="runtimes\win-x64\native\avx512\ggml-cpu.dll" />
-        <file src="runtimes/deps/avx512/llama.dll" target="runtimes\win-x64\native\avx512\llama.dll" />
-        <file src="runtimes/deps/avx512/mtmd.dll" target="runtimes\win-x64\native\avx512\mtmd.dll" />
-
-    <file src="runtimes/deps/noavx/libggml.so" target="runtimes\linux-x64\native\noavx\libggml.so" />
-    <file src="runtimes/deps/noavx/libggml-base.so" target="runtimes\linux-x64\native\noavx\libggml-base.so" />
-    <file src="runtimes/deps/noavx/libggml-cpu.so" target="runtimes\linux-x64\native\noavx\libggml-cpu.so" />
-    <file src="runtimes/deps/noavx/libllama.so" target="runtimes\linux-x64\native\noavx\libllama.so" />
-    <file src="runtimes/deps/noavx/libmtmd.so" target="runtimes\linux-x64\native\noavx\libmtmd.so" />
-      
-    <file src="runtimes/deps/avx/libggml.so" target="runtimes\linux-x64\native\avx\libggml.so" />
-    <file src="runtimes/deps/avx/libggml-base.so" target="runtimes\linux-x64\native\avx\libggml-base.so" />
-    <file src="runtimes/deps/avx/libggml-cpu.so" target="runtimes\linux-x64\native\avx\libggml-cpu.so" />
-    <file src="runtimes/deps/avx/libllama.so" target="runtimes\linux-x64\native\avx\libllama.so" />
-    <file src="runtimes/deps/avx/libmtmd.so" target="runtimes\linux-x64\native\avx\libmtmd.so" />
-      
-    <file src="runtimes/deps/avx2/libggml.so" target="runtimes\linux-x64\native\avx2\libggml.so" />
-    <file src="runtimes/deps/avx2/libggml-base.so" target="runtimes\linux-x64\native\avx2\libggml-base.so" />
-    <file src="runtimes/deps/avx2/libggml-cpu.so" target="runtimes\linux-x64\native\avx2\libggml-cpu.so" />
-    <file src="runtimes/deps/avx2/libllama.so" target="runtimes\linux-x64\native\avx2\libllama.so" />
-    <file src="runtimes/deps/avx2/libmtmd.so" target="runtimes\linux-x64\native\avx2\libmtmd.so" />
-      
-    <file src="runtimes/deps/avx512/libggml.so" target="runtimes\linux-x64\native\avx512\libggml.so" />
-    <file src="runtimes/deps/avx512/libggml-base.so" target="runtimes\linux-x64\native\avx512\libggml-base.so" />
-    <file src="runtimes/deps/avx512/libggml-cpu.so" target="runtimes\linux-x64\native\avx512\libggml-cpu.so" />
-    <file src="runtimes/deps/avx512/libllama.so" target="runtimes\linux-x64\native\avx512\libllama.so" />
-    <file src="runtimes/deps/avx512/libmtmd.so" target="runtimes\linux-x64\native\avx512\libmtmd.so" />
-    
-    <file src="runtimes/deps/linux-arm64/libggml.so" target="runtimes\linux-arm64\native\libggml.so" />
-    <file src="runtimes/deps/linux-arm64/libggml-base.so" target="runtimes\linux-arm64\native\libggml-base.so" />
-    <file src="runtimes/deps/linux-arm64/libggml-cpu.so" target="runtimes\linux-arm64\native\libggml-cpu.so" />
-    <file src="runtimes/deps/linux-arm64/libllama.so" target="runtimes\linux-arm64\native\libllama.so" />
-    <file src="runtimes/deps/linux-arm64/libmtmd.so" target="runtimes\linux-arm64\native\libmtmd.so" />
-
-	  <file src="runtimes/deps/musl-noavx/libggml.so" target="runtimes\linux-musl-x64\native\noavx\libggml.so" />
-    <file src="runtimes/deps/musl-noavx/libggml-base.so" target="runtimes\linux-musl-x64\native\noavx\libggml-base.so" />
-    <file src="runtimes/deps/musl-noavx/libggml-cpu.so" target="runtimes\linux-musl-x64\native\noavx\libggml-cpu.so" />
-    <file src="runtimes/deps/musl-noavx/libllama.so" target="runtimes\linux-musl-x64\native\noavx\libllama.so" />
-    <file src="runtimes/deps/musl-noavx/libmtmd.so" target="runtimes\linux-musl-x64\native\noavx\libmtmd.so" />
-      
-    <file src="runtimes/deps/musl-avx/libggml.so" target="runtimes\linux-musl-x64\native\avx\libggml.so" />
-    <file src="runtimes/deps/musl-avx/libggml-base.so" target="runtimes\linux-musl-x64\native\avx\libggml-base.so" />
-    <file src="runtimes/deps/musl-avx/libggml-cpu.so" target="runtimes\linux-musl-x64\native\avx\libggml-cpu.so" />
-    <file src="runtimes/deps/musl-avx/libllama.so" target="runtimes\linux-musl-x64\native\avx\libllama.so" />
-    <file src="runtimes/deps/musl-avx/libmtmd.so" target="runtimes\linux-musl-x64\native\avx\libmtmd.so" />
-      
-    <file src="runtimes/deps/musl-avx2/libggml.so" target="runtimes\linux-musl-x64\native\avx2\libggml.so" />
-    <file src="runtimes/deps/musl-avx2/libggml-base.so" target="runtimes\linux-musl-x64\native\avx2\libggml-base.so" />
-    <file src="runtimes/deps/musl-avx2/libggml-cpu.so" target="runtimes\linux-musl-x64\native\avx2\libggml-cpu.so" />
-    <file src="runtimes/deps/musl-avx2/libllama.so" target="runtimes\linux-musl-x64\native\avx2\libllama.so" />
-    <file src="runtimes/deps/musl-avx2/libmtmd.so" target="runtimes\linux-musl-x64\native\avx2\libmtmd.so" />
-      
-    <file src="runtimes/deps/musl-avx512/libggml.so" target="runtimes\linux-musl-x64\native\avx512\libggml.so" />
-    <file src="runtimes/deps/musl-avx512/libggml-base.so" target="runtimes\linux-musl-x64\native\avx512\libggml-base.so" />
-    <file src="runtimes/deps/musl-avx512/libggml-cpu.so" target="runtimes\linux-musl-x64\native\avx512\libggml-cpu.so" />
-    <file src="runtimes/deps/musl-avx512/libllama.so" target="runtimes\linux-musl-x64\native\avx512\libllama.so" />
-    <file src="runtimes/deps/musl-avx512/libmtmd.so" target="runtimes\linux-musl-x64\native\avx512\libmtmd.so" />
-	
-    <file src="runtimes/deps/osx-x64/libggml.dylib" target="runtimes\osx-x64\native\libggml.dylib" />
-    <file src="runtimes/deps/osx-x64/libggml-base.dylib" target="runtimes\osx-x64\native\libggml-base.dylib" />
-    <file src="runtimes/deps/osx-x64/libggml-cpu.dylib" target="runtimes\osx-x64\native\libggml-cpu.dylib" />
-    <file src="runtimes/deps/osx-x64/libggml-blas.dylib" target="runtimes\osx-x64\native\libggml-blas.dylib" />
-    <file src="runtimes/deps/osx-x64/libllama.dylib" target="runtimes\osx-x64\native\libllama.dylib" />
-    <file src="runtimes/deps/osx-x64/libmtmd.dylib" target="runtimes\osx-x64\native\libmtmd.dylib" />
-
-        <file src="runtimes/deps/osx-x64-rosetta2/libggml.dylib" target="runtimes\osx-x64\native\rosetta2\libggml.dylib" />
-        <file src="runtimes/deps/osx-x64-rosetta2/libggml-base.dylib" target="runtimes\osx-x64\native\rosetta2\libggml-base.dylib" />
-        <file src="runtimes/deps/osx-x64-rosetta2/libggml-cpu.dylib" target="runtimes\osx-x64\native\rosetta2\libggml-cpu.dylib" />
-        <file src="runtimes/deps/osx-x64-rosetta2/libggml-blas.dylib" target="runtimes\osx-x64\native\rosetta2\libggml-blas.dylib" />
-        <file src="runtimes/deps/osx-x64-rosetta2/libllama.dylib" target="runtimes\osx-x64\native\rosetta2\libllama.dylib" />
-        <file src="runtimes/deps/osx-x64-rosetta2/libmtmd.dylib" target="runtimes\osx-x64\native\rosetta2\libmtmd.dylib" />
-
-        <file src="runtimes/deps/osx-arm64/libggml.dylib" target="runtimes\osx-arm64\native\libggml.dylib" />
-        <file src="runtimes/deps/osx-arm64/libggml-base.dylib" target="runtimes\osx-arm64\native\libggml-base.dylib" />
-        <file src="runtimes/deps/osx-arm64/libggml-cpu.dylib" target="runtimes\osx-arm64\native\libggml-cpu.dylib" />
-        <file src="runtimes/deps/osx-arm64/libggml-blas.dylib" target="runtimes\osx-arm64\native\libggml-blas.dylib" />
-        <file src="runtimes/deps/osx-arm64/libggml-metal.dylib" target="runtimes\osx-arm64\native\libggml-metal.dylib" />
-        <file src="runtimes/deps/osx-arm64/ggml-metal.metal" target="runtimes\osx-arm64\native\ggml-metal.metal" />
-        <file src="runtimes/deps/osx-arm64/libllama.dylib" target="runtimes\osx-arm64\native\libllama.dylib" />
-        <file src="runtimes/deps/osx-arm64/libmtmd.dylib" target="runtimes\osx-arm64\native\libmtmd.dylib" />
+        <file src="../deps/noavx/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\noavx\ggml.dll" />
+        <file src="../deps/noavx/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\noavx\ggml-base.dll" />
+        <file src="../deps/noavx/ggml-cpu.dll" target="LLamaSharpRuntimes\win-x64\native\noavx\ggml-cpu.dll" />
+        <file src="../deps/noavx/llama.dll" target="LLamaSharpRuntimes\win-x64\native\noavx\llama.dll" />
+        <file src="../deps/noavx/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\noavx\mtmd.dll" />
+
+        <file src="../deps/avx/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\avx\ggml-base.dll" />
+        <file src="../deps/avx/ggml-cpu.dll" target="LLamaSharpRuntimes\win-x64\native\avx\ggml-cpu.dll" />
+        <file src="../deps/avx/llama.dll" target="LLamaSharpRuntimes\win-x64\native\avx\llama.dll" />
+        <file src="../deps/avx/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\avx\ggml.dll" />
+        <file src="../deps/avx/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\avx\mtmd.dll" />
+
+        <file src="../deps/avx2/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\avx2\ggml.dll" />
+        <file src="../deps/avx2/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\avx2\ggml-base.dll" />
+        <file src="../deps/avx2/ggml-cpu.dll" target="LLamaSharpRuntimes\win-x64\native\avx2\ggml-cpu.dll" />
+        <file src="../deps/avx2/llama.dll" target="LLamaSharpRuntimes\win-x64\native\avx2\llama.dll" />
+        <file src="../deps/avx2/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\avx2\mtmd.dll" />
+
+        <file src="../deps/avx512/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\avx512\ggml.dll" />
+        <file src="../deps/avx512/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\avx512\ggml-base.dll" />
+        <file src="../deps/avx512/ggml-cpu.dll" target="LLamaSharpRuntimes\win-x64\native\avx512\ggml-cpu.dll" />
+        <file src="../deps/avx512/llama.dll" target="LLamaSharpRuntimes\win-x64\native\avx512\llama.dll" />
+        <file src="../deps/avx512/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\avx512\mtmd.dll" />
+
+        <file src="../deps/noavx/libggml.so" target="LLamaSharpRuntimes\linux-x64\native\noavx\libggml.so" />
+        <file src="../deps/noavx/libggml-base.so" target="LLamaSharpRuntimes\linux-x64\native\noavx\libggml-base.so" />
+        <file src="../deps/noavx/libggml-cpu.so" target="LLamaSharpRuntimes\linux-x64\native\noavx\libggml-cpu.so" />
+        <file src="../deps/noavx/libllama.so" target="LLamaSharpRuntimes\linux-x64\native\noavx\libllama.so" />
+        <file src="../deps/noavx/libmtmd.so" target="LLamaSharpRuntimes\linux-x64\native\noavx\libmtmd.so" />
+
+        <file src="../deps/avx/libggml.so" target="LLamaSharpRuntimes\linux-x64\native\avx\libggml.so" />
+        <file src="../deps/avx/libggml-base.so" target="LLamaSharpRuntimes\linux-x64\native\avx\libggml-base.so" />
+        <file src="../deps/avx/libggml-cpu.so" target="LLamaSharpRuntimes\linux-x64\native\avx\libggml-cpu.so" />
+        <file src="../deps/avx/libllama.so" target="LLamaSharpRuntimes\linux-x64\native\avx\libllama.so" />
+        <file src="../deps/avx/libmtmd.so" target="LLamaSharpRuntimes\linux-x64\native\avx\libmtmd.so" />
+
+        <file src="../deps/avx2/libggml.so" target="LLamaSharpRuntimes\linux-x64\native\avx2\libggml.so" />
+        <file src="../deps/avx2/libggml-base.so" target="LLamaSharpRuntimes\linux-x64\native\avx2\libggml-base.so" />
+        <file src="../deps/avx2/libggml-cpu.so" target="LLamaSharpRuntimes\linux-x64\native\avx2\libggml-cpu.so" />
+        <file src="../deps/avx2/libllama.so" target="LLamaSharpRuntimes\linux-x64\native\avx2\libllama.so" />
+        <file src="../deps/avx2/libmtmd.so" target="LLamaSharpRuntimes\linux-x64\native\avx2\libmtmd.so" />
+
+        <file src="../deps/avx512/libggml.so" target="LLamaSharpRuntimes\linux-x64\native\avx512\libggml.so" />
+        <file src="../deps/avx512/libggml-base.so" target="LLamaSharpRuntimes\linux-x64\native\avx512\libggml-base.so" />
+        <file src="../deps/avx512/libggml-cpu.so" target="LLamaSharpRuntimes\linux-x64\native\avx512\libggml-cpu.so" />
+        <file src="../deps/avx512/libllama.so" target="LLamaSharpRuntimes\linux-x64\native\avx512\libllama.so" />
+        <file src="../deps/avx512/libmtmd.so" target="LLamaSharpRuntimes\linux-x64\native\avx512\libmtmd.so" />
+
+        <file src="../deps/linux-arm64/libggml.so" target="LLamaSharpRuntimes\linux-arm64\native\libggml.so" />
+        <file src="../deps/linux-arm64/libggml-base.so" target="LLamaSharpRuntimes\linux-arm64\native\libggml-base.so" />
+        <file src="../deps/linux-arm64/libggml-cpu.so" target="LLamaSharpRuntimes\linux-arm64\native\libggml-cpu.so" />
+        <file src="../deps/linux-arm64/libllama.so" target="LLamaSharpRuntimes\linux-arm64\native\libllama.so" />
+        <file src="../deps/linux-arm64/libmtmd.so" target="LLamaSharpRuntimes\linux-arm64\native\libmtmd.so" />
+
+        <file src="../deps/musl-noavx/libggml.so" target="LLamaSharpRuntimes\linux-musl-x64\native\noavx\libggml.so" />
+        <file src="../deps/musl-noavx/libggml-base.so" target="LLamaSharpRuntimes\linux-musl-x64\native\noavx\libggml-base.so" />
+        <file src="../deps/musl-noavx/libggml-cpu.so" target="LLamaSharpRuntimes\linux-musl-x64\native\noavx\libggml-cpu.so" />
+        <file src="../deps/musl-noavx/libllama.so" target="LLamaSharpRuntimes\linux-musl-x64\native\noavx\libllama.so" />
+        <file src="../deps/musl-noavx/libmtmd.so" target="LLamaSharpRuntimes\linux-musl-x64\native\noavx\libmtmd.so" />
+
+        <file src="../deps/musl-avx/libggml.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx\libggml.so" />
+        <file src="../deps/musl-avx/libggml-base.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx\libggml-base.so" />
+        <file src="../deps/musl-avx/libggml-cpu.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx\libggml-cpu.so" />
+        <file src="../deps/musl-avx/libllama.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx\libllama.so" />
+        <file src="../deps/musl-avx/libmtmd.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx\libmtmd.so" />
+
+        <file src="../deps/musl-avx2/libggml.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx2\libggml.so" />
+        <file src="../deps/musl-avx2/libggml-base.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx2\libggml-base.so" />
+        <file src="../deps/musl-avx2/libggml-cpu.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx2\libggml-cpu.so" />
+        <file src="../deps/musl-avx2/libllama.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx2\libllama.so" />
+        <file src="../deps/musl-avx2/libmtmd.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx2\libmtmd.so" />
+
+        <file src="../deps/musl-avx512/libggml.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx512\libggml.so" />
+        <file src="../deps/musl-avx512/libggml-base.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx512\libggml-base.so" />
+        <file src="../deps/musl-avx512/libggml-cpu.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx512\libggml-cpu.so" />
+        <file src="../deps/musl-avx512/libllama.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx512\libllama.so" />
+        <file src="../deps/musl-avx512/libmtmd.so" target="LLamaSharpRuntimes\linux-musl-x64\native\avx512\libmtmd.so" />
+
+        <file src="../deps/osx-x64/libggml.dylib" target="LLamaSharpRuntimes\osx-x64\native\libggml.dylib" />
+        <file src="../deps/osx-x64/libggml-base.dylib" target="LLamaSharpRuntimes\osx-x64\native\libggml-base.dylib" />
+        <file src="../deps/osx-x64/libggml-cpu.dylib" target="LLamaSharpRuntimes\osx-x64\native\libggml-cpu.dylib" />
+        <file src="../deps/osx-x64/libggml-blas.dylib" target="LLamaSharpRuntimes\osx-x64\native\libggml-blas.dylib" />
+        <file src="../deps/osx-x64/libllama.dylib" target="LLamaSharpRuntimes\osx-x64\native\libllama.dylib" />
+        <file src="../deps/osx-x64/libmtmd.dylib" target="LLamaSharpRuntimes\osx-x64\native\libmtmd.dylib" />
+
+        <file src="../deps/osx-x64-rosetta2/libggml.dylib" target="LLamaSharpRuntimes\osx-x64\native\rosetta2\libggml.dylib" />
+        <file src="../deps/osx-x64-rosetta2/libggml-base.dylib" target="LLamaSharpRuntimes\osx-x64\native\rosetta2\libggml-base.dylib" />
+        <file src="../deps/osx-x64-rosetta2/libggml-cpu.dylib" target="LLamaSharpRuntimes\osx-x64\native\rosetta2\libggml-cpu.dylib" />
+        <file src="../deps/osx-x64-rosetta2/libggml-blas.dylib" target="LLamaSharpRuntimes\osx-x64\native\rosetta2\libggml-blas.dylib" />
+        <file src="../deps/osx-x64-rosetta2/libllama.dylib" target="LLamaSharpRuntimes\osx-x64\native\rosetta2\libllama.dylib" />
+        <file src="../deps/osx-x64-rosetta2/libmtmd.dylib" target="LLamaSharpRuntimes\osx-x64\native\rosetta2\libmtmd.dylib" />
+
+        <file src="../deps/osx-arm64/libggml.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml.dylib" />
+        <file src="../deps/osx-arm64/libggml-base.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-base.dylib" />
+        <file src="../deps/osx-arm64/libggml-cpu.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-cpu.dylib" />
+        <file src="../deps/osx-arm64/libggml-blas.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-blas.dylib" />
+        <file src="../deps/osx-arm64/libggml-metal.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libggml-metal.dylib" />
+        <file src="../deps/osx-arm64/ggml-metal.metal" target="LLamaSharpRuntimes\osx-arm64\native\ggml-metal.metal" />
+        <file src="../deps/osx-arm64/libllama.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libllama.dylib" />
+        <file src="../deps/osx-arm64/libmtmd.dylib" target="LLamaSharpRuntimes\osx-arm64\native\libmtmd.dylib" />
 
         <file src="icon512.png" target="icon512.png" />
     </files>
diff --git a/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Linux.nuspec b/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Linux.nuspec
index 409327d96..34111357c 100644
--- a/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Linux.nuspec
+++ b/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Linux.nuspec
@@ -22,12 +22,12 @@
     <files>
         <file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cuda12.props" />
 
-        <file src="runtimes/deps/cu12.4.0/libggml.so" target="runtimes/linux-x64/native/cuda12/libggml.so" />
-        <file src="runtimes/deps/cu12.4.0/libggml-base.so" target="runtimes/linux-x64/native/cuda12/libggml-base.so" />
-        <file src="runtimes/deps/cu12.4.0/libggml-cuda.so" target="runtimes/linux-x64/native/cuda12/libggml-cuda.so" />
+        <file src="../deps/cu12.4.0/libggml.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libggml.so" />
+        <file src="../deps/cu12.4.0/libggml-base.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libggml-base.so" />
+        <file src="../deps/cu12.4.0/libggml-cuda.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libggml-cuda.so" />
 
-        <file src="runtimes/deps/cu12.4.0/libllama.so" target="runtimes/linux-x64/native/cuda12/libllama.so" />
-        <file src="runtimes/deps/cu12.4.0/libmtmd.so" target="runtimes/linux-x64/native/cuda12/libmtmd.so" />
+        <file src="../deps/cu12.4.0/libllama.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libllama.so" />
+        <file src="../deps/cu12.4.0/libmtmd.so" target="LLamaSharpRuntimes/linux-x64/native/cuda12/libmtmd.so" />
         
         <file src="icon512.png" target="icon512.png" />
     </files>
diff --git a/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Windows.nuspec b/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Windows.nuspec
index 84c7773ca..db15e711a 100644
--- a/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Windows.nuspec
+++ b/LLama/runtimes/build/LLamaSharp.Backend.Cuda12.Windows.nuspec
@@ -22,12 +22,12 @@
     <files>
         <file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Cuda12.props" />
 
-        <file src="runtimes/deps/cu12.4.0/ggml.dll" target="runtimes\win-x64\native\cuda12\ggml.dll" />
-        <file src="runtimes/deps/cu12.4.0/ggml-base.dll" target="runtimes\win-x64\native\cuda12\ggml-base.dll" />
-        <file src="runtimes/deps/cu12.4.0/ggml-cuda.dll" target="runtimes\win-x64\native\cuda12\ggml-cuda.dll" />
+        <file src="../deps/cu12.4.0/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\ggml.dll" />
+        <file src="../deps/cu12.4.0/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\ggml-base.dll" />
+        <file src="../deps/cu12.4.0/ggml-cuda.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\ggml-cuda.dll" />
         
-        <file src="runtimes/deps/cu12.4.0/llama.dll" target="runtimes\win-x64\native\cuda12\llama.dll" />
-        <file src="runtimes/deps/cu12.4.0/mtmd.dll" target="runtimes\win-x64\native\cuda12\mtmd.dll" />
+        <file src="../deps/cu12.4.0/llama.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\llama.dll" />
+        <file src="../deps/cu12.4.0/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\cuda12\mtmd.dll" />
         
         <file src="icon512.png" target="icon512.png" />
     </files>
diff --git a/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Linux.nuspec b/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Linux.nuspec
index 5204fe7cc..0e5065709 100644
--- a/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Linux.nuspec
+++ b/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Linux.nuspec
@@ -22,12 +22,12 @@
     <files>
         <file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Vulkan.props" />
 
-        <file src="runtimes/deps/vulkan/libggml.so" target="runtimes/linux-x64/native/vulkan/libggml.so" />
-        <file src="runtimes/deps/vulkan/libggml-base.so" target="runtimes/linux-x64/native/vulkan/libggml-base.so" />
-        <file src="runtimes/deps/vulkan/libggml-vulkan.so" target="runtimes/linux-x64/native/vulkan/libggml-vulkan.so" />
+        <file src="../deps/vulkan/libggml.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libggml.so" />
+        <file src="../deps/vulkan/libggml-base.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libggml-base.so" />
+        <file src="../deps/vulkan/libggml-vulkan.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libggml-vulkan.so" />
 
-        <file src="runtimes/deps/vulkan/libllama.so" target="runtimes/linux-x64/native/vulkan/libllama.so" />
-        <file src="runtimes/deps/vulkan/libmtmd.so" target="runtimes/linux-x64/native/vulkan/libmtmd.so" />
+        <file src="../deps/vulkan/libllama.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libllama.so" />
+        <file src="../deps/vulkan/libmtmd.so" target="LLamaSharpRuntimes/linux-x64/native/vulkan/libmtmd.so" />
         
         <file src="icon512.png" target="icon512.png" />
     </files>
diff --git a/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Windows.nuspec b/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Windows.nuspec
index 7d86e2a0c..59b753809 100644
--- a/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Windows.nuspec
+++ b/LLama/runtimes/build/LLamaSharp.Backend.Vulkan.Windows.nuspec
@@ -22,12 +22,12 @@
     <files>
         <file src="LLamaSharpBackend.props" target="build/netstandard2.0/LLamaSharp.Backend.Vulkan.props" />
         
-        <file src="runtimes/deps/vulkan/ggml.dll" target="runtimes\win-x64\native\vulkan\ggml.dll" />
-        <file src="runtimes/deps/vulkan/ggml-base.dll" target="runtimes\win-x64\native\vulkan\ggml-base.dll" />
-        <file src="runtimes/deps/vulkan/ggml-vulkan.dll" target="runtimes\win-x64\native\vulkan\ggml-vulkan.dll" />
+        <file src="../deps/vulkan/ggml.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\ggml.dll" />
+        <file src="../deps/vulkan/ggml-base.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\ggml-base.dll" />
+        <file src="../deps/vulkan/ggml-vulkan.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\ggml-vulkan.dll" />
 
-        <file src="runtimes/deps/vulkan/llama.dll" target="runtimes\win-x64\native\vulkan\llama.dll" />
-        <file src="runtimes/deps/vulkan/mtmd.dll" target="runtimes\win-x64\native\vulkan\mtmd.dll" />
+        <file src="../deps/vulkan/llama.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\llama.dll" />
+        <file src="../deps/vulkan/mtmd.dll" target="LLamaSharpRuntimes\win-x64\native\vulkan\mtmd.dll" />
         
         <file src="icon512.png" target="icon512.png" />
     </files>
diff --git a/LLama/runtimes/build/LLamaSharpBackend.props b/LLama/runtimes/build/LLamaSharpBackend.props
index 82b12fdd7..cd5dc8023 100644
--- a/LLama/runtimes/build/LLamaSharpBackend.props
+++ b/LLama/runtimes/build/LLamaSharpBackend.props
@@ -5,7 +5,7 @@
   so copy the native assemblies to the output directory.
   -->
     <ItemGroup>
-        <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\**\*.*">
+        <Content Include="$(MSBuildThisFileDirectory)\..\..\LLamaSharpRuntimes\**\*.*">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Visible>false</Visible>
             <Link>runtimes\%(RecursiveDir)%(Filename)%(Extension)</Link>
@@ -16,59 +16,59 @@
     <ItemGroup
         Condition="$(AndroidSupportedAbis.Contains('x86_64')) or $(RuntimeIdentifiers.Contains('android-x64'))">
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libllama.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libllama.so">
             <Link>lib\x86_64\libllama.so</Link>
             <Abi>x86_64</Abi>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libggml.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libggml.so">
             <Link>lib\x86_64\libggml.so</Link>
             <Abi>x86_64</Abi>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libggml-base.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libggml-base.so">
             <Link>lib\x86_64\libggml-base.so</Link>
             <Abi>x86_64</Abi>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libggml-cpu.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libggml-cpu.so">
             <Link>lib\x86_64\libggml-cpu.so</Link>
             <Abi>x86_64</Abi>
         </AndroidNativeLibrary>
-        <!--<AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86_64\native\libmtmd.so">
+        <AndroidNativeLibrary Visible="false"
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-x86_64\native\libmtmd.so">
             <Link>lib\x86_64\libmtmd.so</Link>
             <Abi>x86_64</Abi>
-        </AndroidNativeLibrary>-->
+        </AndroidNativeLibrary>
     </ItemGroup>
 
     <ItemGroup
         Condition="$(AndroidSupportedAbis.Contains('arm64-v8a')) or $(RuntimeIdentifiers.Contains('android-arm64'))">
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libllama.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libllama.so">
             <Link>lib\arm64-v8a\libllama.so</Link>
             <Abi>arm64-v8a</Abi>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libggml.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libggml.so">
             <Link>lib\arm64-v8a\libggml.so</Link>
             <Abi>arm64-v8a</Abi>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libggml-base.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libggml-base.so">
             <Link>lib\arm64-v8a\libggml-base.so</Link>
             <Abi>arm64-v8a</Abi>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libggml-cpu.so">
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libggml-cpu.so">
             <Link>lib\arm64-v8a\libggml-cpu.so</Link>
             <Abi>arm64-v8a</Abi>
         </AndroidNativeLibrary>
-        <!--<AndroidNativeLibrary Visible="false"
-            Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64-v8a\native\libmtmd.so">
+        <AndroidNativeLibrary Visible="false"
+            Include="$(MSBuildThisFileDirectory)..\..\LLamaSharpRuntimes\android-arm64-v8a\native\libmtmd.so">
             <Link>lib\arm64-v8a\libmtmd.so</Link>
             <Abi>arm64-v8a</Abi>
-        </AndroidNativeLibrary>-->
+        </AndroidNativeLibrary>
     </ItemGroup>
     <!-- End Android -->