diff --git a/OpenRA.Server/OpenRA.Server.csproj b/OpenRA.Server/OpenRA.Server.csproj
index 5f486b4d5d..58d23e8a2f 100644
--- a/OpenRA.Server/OpenRA.Server.csproj
+++ b/OpenRA.Server/OpenRA.Server.csproj
@@ -54,10 +54,6 @@
-
- {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}
- OpenRa.DataStructures
-
{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}
OpenRa.FileFormats
diff --git a/OpenRa.DataStructures/OpenRa.DataStructures.csproj b/OpenRa.DataStructures/OpenRa.DataStructures.csproj
deleted file mode 100644
index b0d2c9ca21..0000000000
--- a/OpenRa.DataStructures/OpenRa.DataStructures.csproj
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}
- Library
- Properties
- OpenRa
- OpenRa.DataStructures
-
-
- 2.0
-
-
- v3.5
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- full
- x86
- prompt
-
-
- bin\x86\Release\
- TRACE
- true
- pdbonly
- x86
- prompt
-
-
-
- False
- ..\Ijw.DirectX\Release\IjwFramework.dll
-
-
-
- 3.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OpenRa.DataStructures/Properties/AssemblyInfo.cs b/OpenRa.DataStructures/Properties/AssemblyInfo.cs
deleted file mode 100644
index cf7fc180e0..0000000000
--- a/OpenRa.DataStructures/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( "OpenRa.DataStructures" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "" )]
-[assembly: AssemblyProduct( "OpenRa.DataStructures" )]
-[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( "fdbd08da-dde2-4eaf-9a8c-4bc63ac5b074" )]
-
-// 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/OpenRa.DataStructures/AssetInfo.cs b/OpenRa.FileFormats/AssetInfo.cs
similarity index 92%
rename from OpenRa.DataStructures/AssetInfo.cs
rename to OpenRa.FileFormats/AssetInfo.cs
index b0e2d46862..e78bdc8727 100644
--- a/OpenRa.DataStructures/AssetInfo.cs
+++ b/OpenRa.FileFormats/AssetInfo.cs
@@ -2,7 +2,7 @@
using System.Linq;
using System.Security.Cryptography;
-namespace OpenRa
+namespace OpenRa.FileFormats
{
public class AssetInfo
{
diff --git a/OpenRa.DataStructures/DisposableAction.cs b/OpenRa.FileFormats/DisposableAction.cs
similarity index 100%
rename from OpenRa.DataStructures/DisposableAction.cs
rename to OpenRa.FileFormats/DisposableAction.cs
diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index 57a2d72322..a41a7b86f3 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -35,6 +35,10 @@
prompt
+
+ False
+ ..\Ijw.DirectX\Ijw.Framework\IjwFramework\bin\Release\IjwFramework.dll
+
3.5
@@ -44,19 +48,23 @@
+
+
+
+
@@ -73,14 +81,10 @@
+
+
-
-
- {2F9E7A23-56C0-4286-9C8E-1060A9B2F073}
- OpenRa.DataStructures
-
-