diff --git a/Facepunch.Steamworks.Test/Client.cs b/Facepunch.Steamworks.Test/Client/Client.cs
similarity index 100%
rename from Facepunch.Steamworks.Test/Client.cs
rename to Facepunch.Steamworks.Test/Client/Client.cs
diff --git a/Facepunch.Steamworks.Test/Networking.cs b/Facepunch.Steamworks.Test/Client/Networking.cs
similarity index 100%
rename from Facepunch.Steamworks.Test/Networking.cs
rename to Facepunch.Steamworks.Test/Client/Networking.cs
diff --git a/Facepunch.Steamworks.Test/Serverlist.cs b/Facepunch.Steamworks.Test/Client/Serverlist.cs
similarity index 100%
rename from Facepunch.Steamworks.Test/Serverlist.cs
rename to Facepunch.Steamworks.Test/Client/Serverlist.cs
diff --git a/Facepunch.Steamworks.Test/Stats.cs b/Facepunch.Steamworks.Test/Client/Stats.cs
similarity index 100%
rename from Facepunch.Steamworks.Test/Stats.cs
rename to Facepunch.Steamworks.Test/Client/Stats.cs
diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
index b4f93b7..25e9e2b 100644
--- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
+++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
@@ -88,8 +88,8 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Compile Include="Client.cs" />
-    <Compile Include="Networking.cs" />
+    <Compile Include="Client\Client.cs" />
+    <Compile Include="Client\Networking.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Client\Friends.cs" />
   </ItemGroup>
@@ -100,8 +100,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Serverlist.cs" />
-    <Compile Include="Stats.cs" />
+    <Compile Include="Client\Serverlist.cs" />
+    <Compile Include="Client\Stats.cs" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
diff --git a/Facepunch.Steamworks/Client.Auth.cs b/Facepunch.Steamworks/Client/Auth.cs
similarity index 100%
rename from Facepunch.Steamworks/Client.Auth.cs
rename to Facepunch.Steamworks/Client/Auth.cs
diff --git a/Facepunch.Steamworks/Client/Friends.cs b/Facepunch.Steamworks/Client/Friends.cs
index 675d320..c0633ad 100644
--- a/Facepunch.Steamworks/Client/Friends.cs
+++ b/Facepunch.Steamworks/Client/Friends.cs
@@ -228,7 +228,7 @@ public Image GetAvatar( AvatarSize size, ulong steamid )
             throw new System.NotImplementedException( "Deferred Avatar Loading Todo" );
             // Add to image loading list
 
-            return img;
+            //return img;
         }
 
 
diff --git a/Facepunch.Steamworks/Client.Networking.cs b/Facepunch.Steamworks/Client/Networking.cs
similarity index 100%
rename from Facepunch.Steamworks/Client.Networking.cs
rename to Facepunch.Steamworks/Client/Networking.cs
diff --git a/Facepunch.Steamworks/Client.Overlay.cs b/Facepunch.Steamworks/Client/Overlay.cs
similarity index 100%
rename from Facepunch.Steamworks/Client.Overlay.cs
rename to Facepunch.Steamworks/Client/Overlay.cs
diff --git a/Facepunch.Steamworks/Client.ServerList.Request.cs b/Facepunch.Steamworks/Client/ServerList.Request.cs
similarity index 100%
rename from Facepunch.Steamworks/Client.ServerList.Request.cs
rename to Facepunch.Steamworks/Client/ServerList.Request.cs
diff --git a/Facepunch.Steamworks/Client.ServerList.Server.cs b/Facepunch.Steamworks/Client/ServerList.Server.cs
similarity index 100%
rename from Facepunch.Steamworks/Client.ServerList.Server.cs
rename to Facepunch.Steamworks/Client/ServerList.Server.cs
diff --git a/Facepunch.Steamworks/Client.ServerList.cs b/Facepunch.Steamworks/Client/ServerList.cs
similarity index 100%
rename from Facepunch.Steamworks/Client.ServerList.cs
rename to Facepunch.Steamworks/Client/ServerList.cs
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
index 0e39105..3a9c050 100644
--- a/Facepunch.Steamworks/Facepunch.Steamworks.csproj
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
@@ -113,13 +113,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Client.Networking.cs" />
-    <Compile Include="Client.Overlay.cs" />
-    <Compile Include="Client.ServerList.cs" />
-    <Compile Include="Client.ServerList.Request.cs" />
-    <Compile Include="Client.Auth.cs" />
+    <Compile Include="Client\Networking.cs" />
+    <Compile Include="Client\Overlay.cs" />
+    <Compile Include="Client\ServerList.cs" />
+    <Compile Include="Client\ServerList.Request.cs" />
+    <Compile Include="Client\Auth.cs" />
     <Compile Include="Client.cs" />
-    <Compile Include="Client.ServerList.Server.cs" />
+    <Compile Include="Client\ServerList.Server.cs" />
     <Compile Include="Client\App.cs" />
     <Compile Include="Client\Friends.cs" />
     <Compile Include="Client\Image.cs" />
@@ -130,7 +130,7 @@
     <Compile Include="Config.cs" />
     <Compile Include="Interop\ServerRules.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="steam_api_interop.cs" />
+    <Compile Include="Interop\steam_api_interop.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Facepunch.Steamworks/steam_api_interop.cs b/Facepunch.Steamworks/Interop/steam_api_interop.cs
similarity index 100%
rename from Facepunch.Steamworks/steam_api_interop.cs
rename to Facepunch.Steamworks/Interop/steam_api_interop.cs