diff --git a/src/LibRyujinx/AndroidLogTarget.cs b/src/LibRyujinx/Android/AndroidLogTarget.cs
similarity index 100%
rename from src/LibRyujinx/AndroidLogTarget.cs
rename to src/LibRyujinx/Android/AndroidLogTarget.cs
diff --git a/src/LibRyujinx/Audio/Oboe/OboeAudioBuffer.cs b/src/LibRyujinx/Android/Audio/Oboe/OboeAudioBuffer.cs
similarity index 100%
rename from src/LibRyujinx/Audio/Oboe/OboeAudioBuffer.cs
rename to src/LibRyujinx/Android/Audio/Oboe/OboeAudioBuffer.cs
diff --git a/src/LibRyujinx/Audio/Oboe/OboeHardwareDeviceDriver.cs b/src/LibRyujinx/Android/Audio/Oboe/OboeHardwareDeviceDriver.cs
similarity index 100%
rename from src/LibRyujinx/Audio/Oboe/OboeHardwareDeviceDriver.cs
rename to src/LibRyujinx/Android/Audio/Oboe/OboeHardwareDeviceDriver.cs
diff --git a/src/LibRyujinx/Audio/Oboe/OboeHardwareDeviceSession.cs b/src/LibRyujinx/Android/Audio/Oboe/OboeHardwareDeviceSession.cs
similarity index 100%
rename from src/LibRyujinx/Audio/Oboe/OboeHardwareDeviceSession.cs
rename to src/LibRyujinx/Android/Audio/Oboe/OboeHardwareDeviceSession.cs
diff --git a/src/LibRyujinx/Audio/Oboe/OboeInterop.cs b/src/LibRyujinx/Android/Audio/Oboe/OboeInterop.cs
similarity index 100%
rename from src/LibRyujinx/Audio/Oboe/OboeInterop.cs
rename to src/LibRyujinx/Android/Audio/Oboe/OboeInterop.cs
diff --git a/src/LibRyujinx/JniExportedMethods.cs b/src/LibRyujinx/Android/JniExportedMethods.cs
similarity index 98%
rename from src/LibRyujinx/JniExportedMethods.cs
rename to src/LibRyujinx/Android/JniExportedMethods.cs
index efbc61e37..128e50886 100644
--- a/src/LibRyujinx/JniExportedMethods.cs
+++ b/src/LibRyujinx/Android/JniExportedMethods.cs
@@ -230,7 +230,10 @@ namespace LibRyujinx
         }
 
         [UnmanagedCallersOnly(EntryPoint = "Java_org_ryujinx_android_RyujinxNative_graphicsInitializeRenderer")]
-        public unsafe static JBoolean JniInitializeGraphicsRendererNative(JEnvRef jEnv, JObjectLocalRef jObj, JArrayLocalRef extensionsArray, JLong surfacePtr)
+        public unsafe static JBoolean JniInitializeGraphicsRendererNative(JEnvRef jEnv,
+                                                                          JObjectLocalRef jObj,
+                                                                          JArrayLocalRef extensionsArray,
+                                                                          JLong surfacePtr)
         {
             if (Renderer != null)
             {
diff --git a/src/LibRyujinx/LibRyujinx.csproj b/src/LibRyujinx/LibRyujinx.csproj
index b8e09365b..4f3e97580 100644
--- a/src/LibRyujinx/LibRyujinx.csproj
+++ b/src/LibRyujinx/LibRyujinx.csproj
@@ -30,10 +30,10 @@
         <RdXmlFile Include="rd.xml" />
     </ItemGroup>
     <ItemGroup>
-		  <PackageReference Include="Rxmxnx.PInvoke.Extensions"/>        
+		  <PackageReference Include="Rxmxnx.PInvoke.Extensions" />        
       <PackageReference Include="Silk.NET.Vulkan" />
       <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
-      <LinkerArg  Condition="'$(RuntimeIdentifier)'=='linux-bionic-arm64'" Include="-llog" />
+      <LinkerArg Condition="'$(RuntimeIdentifier)'=='linux-bionic-arm64'" Include="-llog" />
     </ItemGroup>
     <ItemGroup>
       <Folder Include="Jni\" />