diff --git a/ImageDecode/Properties/AssemblyInfo.cs b/ImageDecode/Properties/AssemblyInfo.cs
deleted file mode 100644
index 59ee034e96..0000000000
--- a/ImageDecode/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "ImageDecode" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "" )]
-[assembly: AssemblyProduct( "ImageDecode" )]
-[assembly: AssemblyCopyright( "Copyright ©  2007" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid( "f236056f-1b46-4a95-9d44-e2c77a9e91c0" )]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/MixBrowser/MixBrowser.csproj b/MixBrowser/MixBrowser.csproj
index d8dfbb520d..5b5f851a9d 100644
--- a/MixBrowser/MixBrowser.csproj
+++ b/MixBrowser/MixBrowser.csproj
@@ -29,22 +29,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MixDecrypt, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\debug\MixDecrypt.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Blowfish.cs" />
-    <Compile Include="MixEntry.cs" />
-    <Compile Include="MixFile.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRa.FileFormats</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MixBrowser/Program.cs b/MixBrowser/Program.cs
index af854a2ffd..3f98366ea0 100644
--- a/MixBrowser/Program.cs
+++ b/MixBrowser/Program.cs
@@ -4,6 +4,8 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
+using OpenRa.FileFormats;
+
 namespace MixBrowser
 {
 	class Program
diff --git a/MixBrowser/Blowfish.cs b/OpenRa.FileFormats/Blowfish.cs
similarity index 97%
rename from MixBrowser/Blowfish.cs
rename to OpenRa.FileFormats/Blowfish.cs
index 3212da25d2..5446449b56 100644
--- a/MixBrowser/Blowfish.cs
+++ b/OpenRa.FileFormats/Blowfish.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace MixBrowser
+namespace OpenRa.FileFormats
 {
 	class Blowfish
 	{
diff --git a/ImageDecode/Format40.cs b/OpenRa.FileFormats/Format40.cs
similarity index 93%
rename from ImageDecode/Format40.cs
rename to OpenRa.FileFormats/Format40.cs
index 71f022a210..dc6abd3bbc 100644
--- a/ImageDecode/Format40.cs
+++ b/OpenRa.FileFormats/Format40.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace ImageDecode
+namespace OpenRa.FileFormats
 {
 	public static class Format40
 	{
diff --git a/ImageDecode/Format80.cs b/OpenRa.FileFormats/Format80.cs
similarity index 95%
rename from ImageDecode/Format80.cs
rename to OpenRa.FileFormats/Format80.cs
index 17ec8d2fab..e24022b54e 100644
--- a/ImageDecode/Format80.cs
+++ b/OpenRa.FileFormats/Format80.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace ImageDecode
+namespace OpenRa.FileFormats
 {
 	public static class Format80
 	{
diff --git a/MixBrowser/MixEntry.cs b/OpenRa.FileFormats/MixEntry.cs
similarity index 92%
rename from MixBrowser/MixEntry.cs
rename to OpenRa.FileFormats/MixEntry.cs
index 34830cef95..642f5ec992 100644
--- a/MixBrowser/MixEntry.cs
+++ b/OpenRa.FileFormats/MixEntry.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace MixBrowser
+namespace OpenRa.FileFormats
 {
-	class MixEntry
+	public class MixEntry
 	{
 		public readonly uint Hash;
 		public readonly uint Offset;
diff --git a/MixBrowser/MixFile.cs b/OpenRa.FileFormats/MixFile.cs
similarity index 94%
rename from MixBrowser/MixFile.cs
rename to OpenRa.FileFormats/MixFile.cs
index d6956f6a09..c721b2ac9f 100644
--- a/MixBrowser/MixFile.cs
+++ b/OpenRa.FileFormats/MixFile.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace MixBrowser
+namespace OpenRa.FileFormats
 {
-	class MixFile
+	public class MixFile
 	{
 		readonly string filename;
 		readonly List<MixEntry> index;
diff --git a/ImageDecode/ImageDecode.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
similarity index 77%
rename from ImageDecode/ImageDecode.csproj
rename to OpenRa.FileFormats/OpenRa.FileFormats.csproj
index cd461a8b92..724b33e19a 100644
--- a/ImageDecode/ImageDecode.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -4,13 +4,11 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}</ProjectGuid>
+    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ImageDecode</RootNamespace>
-    <AssemblyName>ImageDecode</AssemblyName>
-    <StartupObject>
-    </StartupObject>
+    <RootNamespace>OpenRa.FileFormats</RootNamespace>
+    <AssemblyName>OpenRa.FileFormats</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,7 +18,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,7 +26,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -38,12 +34,21 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Blowfish.cs" />
     <Compile Include="Format40.cs" />
     <Compile Include="Format80.cs" />
+    <Compile Include="MixEntry.cs" />
+    <Compile Include="MixFile.cs" />
     <Compile Include="Palette.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ShpReader.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MixDecrypt\MixDecrypt.vcproj">
+      <Project>{6F5D4280-3D23-41FF-AE2A-511B5553E377}</Project>
+      <Name>MixDecrypt</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ImageDecode/Palette.cs b/OpenRa.FileFormats/Palette.cs
similarity index 90%
rename from ImageDecode/Palette.cs
rename to OpenRa.FileFormats/Palette.cs
index 5aa9f31fe9..b007667459 100644
--- a/ImageDecode/Palette.cs
+++ b/OpenRa.FileFormats/Palette.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.IO;
 using System.Drawing;
 
-namespace ImageDecode
+namespace OpenRa.FileFormats
 {
 	public class Palette
 	{
diff --git a/OpenRa.FileFormats/Properties/AssemblyInfo.cs b/OpenRa.FileFormats/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..9206bcde7c
--- /dev/null
+++ b/OpenRa.FileFormats/Properties/AssemblyInfo.cs
@@ -0,0 +1,17 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("OpenRa.FileFormats")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenRa.FileFormats")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ImageDecode/ShpReader.cs b/OpenRa.FileFormats/ShpReader.cs
similarity index 95%
rename from ImageDecode/ShpReader.cs
rename to OpenRa.FileFormats/ShpReader.cs
index 46db699288..1e756b2603 100644
--- a/ImageDecode/ShpReader.cs
+++ b/OpenRa.FileFormats/ShpReader.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Drawing;
 using System.IO;
 
-namespace ImageDecode
+namespace OpenRa.FileFormats
 {
 	public class ImageHeader
 	{
diff --git a/OpenRa.sln b/OpenRa.sln
index bbe10aaa7a..96f2c5c7a9 100644
--- a/OpenRa.sln
+++ b/OpenRa.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MixBrowser", "MixBrowser\MixBrowser.csproj", "{E183D00B-FD2C-4001-8336-DF345DE281DA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MixDecrypt", "MixDecrypt\MixDecrypt.vcproj", "{6F5D4280-3D23-41FF-AE2A-511B5553E377}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageDecode", "ImageDecode\ImageDecode.csproj", "{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShpViewer", "ShpViewer\ShpViewer.csproj", "{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.FileFormats", "OpenRa.FileFormats\OpenRa.FileFormats.csproj", "{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,16 +39,6 @@ Global
 		{6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Win32.ActiveCfg = Release|Win32
 		{6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Win32.Build.0 = Release|Win32
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}.Release|Win32.ActiveCfg = Release|Any CPU
 		{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -59,6 +49,16 @@ Global
 		{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Win32.ActiveCfg = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Win32.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ShpViewer/ShpViewForm.cs b/ShpViewer/ShpViewForm.cs
index 2564d31beb..7d0f9e37e5 100644
--- a/ShpViewer/ShpViewForm.cs
+++ b/ShpViewer/ShpViewForm.cs
@@ -5,9 +5,10 @@ using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using ImageDecode;
 using System.IO;
 
+using OpenRa.FileFormats;
+
 namespace ShpViewer
 {
 	public partial class ShpViewForm : Form
diff --git a/ShpViewer/ShpViewer.csproj b/ShpViewer/ShpViewer.csproj
index 7287f38e41..a28e9d3bce 100644
--- a/ShpViewer/ShpViewer.csproj
+++ b/ShpViewer/ShpViewer.csproj
@@ -66,9 +66,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImageDecode\ImageDecode.csproj">
-      <Project>{39352FD2-28B0-4DF5-97C7-499CE1AECCB9}</Project>
-      <Name>ImageDecode</Name>
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRa.FileFormats</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />