diff --git a/OpenRA.Utility/R8Reader.cs b/OpenRA.FileFormats/Graphics/R8Reader.cs
similarity index 97%
rename from OpenRA.Utility/R8Reader.cs
rename to OpenRA.FileFormats/Graphics/R8Reader.cs
index 7f9b1d0462..f341f92cef 100644
--- a/OpenRA.Utility/R8Reader.cs
+++ b/OpenRA.FileFormats/Graphics/R8Reader.cs
@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made 
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -10,13 +10,13 @@
  */
 #endregion
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System;
 
-namespace OpenRA.Utility
+namespace OpenRA.FileFormats
 {
 	public class R8Image
 	{
@@ -28,7 +28,7 @@ namespace OpenRA.Utility
 
 		public int ImageHandle;
 		public int PaletteHandle;
-		
+
 		public byte[] Image;
 
 		public int OffsetX;
@@ -70,7 +70,7 @@ namespace OpenRA.Utility
 			else
 				throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(Bpp));
 
-			
+
 			if (ID == 1 && PaletteHandle != 0)
 			{
 				// read and ignore custom palette
diff --git a/OpenRA.FileFormats/OpenRA.FileFormats.csproj b/OpenRA.FileFormats/OpenRA.FileFormats.csproj
index 3c846f7fe6..cc3d2264c1 100644
--- a/OpenRA.FileFormats/OpenRA.FileFormats.csproj
+++ b/OpenRA.FileFormats/OpenRA.FileFormats.csproj
@@ -146,6 +146,7 @@
     <Compile Include="StreamExts.cs" />
     <Compile Include="FileFormats\WavLoader.cs" />
     <Compile Include="Filesystem\D2kSoundResources.cs" />
+    <Compile Include="Graphics\R8Reader.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj
index 6261fdd2bf..d4b8cdf0c0 100644
--- a/OpenRA.Utility/OpenRA.Utility.csproj
+++ b/OpenRA.Utility/OpenRA.Utility.csproj
@@ -76,7 +76,6 @@
   <ItemGroup>
     <Compile Include="Command.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="R8Reader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>