diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index 0141466a19..c1479e0dd0 100644
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -5,6 +5,7 @@ using System.Drawing;
 using OpenRa.FileFormats;
 
 using System.Windows.Forms;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/ConstructionYard.cs b/OpenRa.Game/ConstructionYard.cs
deleted file mode 100644
index dd1e5f4078..0000000000
--- a/OpenRa.Game/ConstructionYard.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-
-namespace OpenRa.Game
-{
-	class ConstructionYard : Building
-	{
-		public ConstructionYard( int2 location, Player owner, Game game )
-			: base( "fact", location, owner, game )
-		{
-			animation.PlayThen("make", () => animation.PlayRepeating("build"));
-		}
-	}
-}
diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index 2926879fbd..e23b35d36f 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenRa.FileFormats;
 
-using System.Drawing;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
@@ -45,10 +44,9 @@ namespace OpenRa.Game
 
 			network = new Network();
 
-			buildingCreation.Add("fact", (location, owner) => new ConstructionYard(location, owner, this));
 			buildingCreation.Add("proc", (location, owner) => new Refinery(location, owner, this));
 
-			string[] buildings = { "powr", "apwr", "weap", "barr", "atek", "stek", "dome" };
+			string[] buildings = { "fact", "powr", "apwr", "weap", "barr", "atek", "stek", "dome" };
 			foreach (string s in buildings)
 				AddBuilding(s);
 		}
diff --git a/OpenRa.Game/Animation.cs b/OpenRa.Game/Graphics/Animation.cs
similarity index 78%
rename from OpenRa.Game/Animation.cs
rename to OpenRa.Game/Graphics/Animation.cs
index ee2a505b5d..d1debfef51 100644
--- a/OpenRa.Game/Animation.cs
+++ b/OpenRa.Game/Graphics/Animation.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Animation
 	{
@@ -19,6 +16,7 @@ namespace OpenRa.Game
 		}
 
 		public Sprite[] Images { get { return new Sprite[] { currentSequence.GetSprite( frame ) }; } }
+		public float2 Center { get { return 0.25f * new float2(currentSequence.GetSprite(0).bounds.Size); } }
 
 		public void Play( string sequenceName )
 		{
@@ -35,13 +33,13 @@ namespace OpenRa.Game
 			tickAlways = false;
 			currentSequence = SequenceProvider.GetSequence( name, sequenceName );
 			frame = 0;
-			tickFunc = _ =>
+			tickFunc = () =>
 			{
 				++frame;
 				if( frame >= currentSequence.Length )
 				{
 					frame = currentSequence.Length - 1;
-					tickFunc = t => { };
+					tickFunc = () => { };
 					after();
 				}
 			};
@@ -52,22 +50,22 @@ namespace OpenRa.Game
 			tickAlways = true;
 			currentSequence = SequenceProvider.GetSequence( name, sequenceName );
 			frame = func();
-			tickFunc = t => frame = func();
+			tickFunc = () => frame = func();
 		}
 
 		int timeUntilNextFrame;
+		Action tickFunc;
 
-		Action<int> tickFunc;
 		public void Tick( int t )
 		{
 			if( tickAlways )
-				tickFunc( t );
+				tickFunc();
 			else
 			{
 				timeUntilNextFrame -= t;
 				while( timeUntilNextFrame <= 0 )
 				{
-					tickFunc( 40 );
+					tickFunc();
 					timeUntilNextFrame += 40; // 25 fps == 40 ms
 				}
 			}
diff --git a/OpenRa.Game/Graphics/Graphics.cd b/OpenRa.Game/Graphics/Graphics.cd
new file mode 100644
index 0000000000..54372aa050
--- /dev/null
+++ b/OpenRa.Game/Graphics/Graphics.cd
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+  <Class Name="OpenRa.Game.Graphics.Animation">
+    <Position X="15.75" Y="9" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAQCgACAAAAAAAAAAAAAAAAAAAAEABAEgAAAAQQIQAA=</HashCode>
+      <FileName>Graphics\Animation.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Property Name="Images" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.Viewport">
+    <Position X="4.25" Y="0.5" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAQAABAAAgAAAAIYAAEAAAABCAAAAAABgAAAAgAE=</HashCode>
+      <FileName>Graphics\Viewport.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="renderer" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.HardwarePalette">
+    <Position X="9.75" Y="10" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAQAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAQAAAAA=</HashCode>
+      <FileName>Graphics\HardwarePalette.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.Region" Collapsed="true">
+    <Position X="18.25" Y="0.5" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AIQAAAAAAAAAggAABAIAIAQCAAAAAGAAAAAAAAAQAAA=</HashCode>
+      <FileName>Graphics\Region.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.Renderer">
+    <Position X="4.25" Y="5.75" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>QACAEAAGAAAAAgMAAAAAAAAAAAAAAAAAAAAAAEAAAAA=</HashCode>
+      <FileName>Graphics\Renderer.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.Sheet">
+    <Position X="9.75" Y="6" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAACAgAAACAgAAAAIAAAAAgAAAAIAAAAggAA=</HashCode>
+      <FileName>Graphics\Sheet.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="renderer" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.SheetBuilder">
+    <Position X="1.25" Y="6" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AQIACAAAAAAAIQAAAAAAAAAAgAAAAIAAAEAAAAACgAA=</HashCode>
+      <FileName>Graphics\SheetBuilder.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="renderer" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.Sprite">
+    <Position X="12.75" Y="6.25" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAQAAIAAAAIAAAAAAAAAAAAABAAACAAAEAgA=</HashCode>
+      <FileName>Graphics\Sprite.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="sheet" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.SpriteRenderer">
+    <Position X="6.75" Y="5.75" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAQQAAAAECAAAAAAAAAAAAAABAQABAAAAAAAACIwAQ=</HashCode>
+      <FileName>Graphics\SpriteRenderer.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="currentSheet" />
+      <Field Name="renderer" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.SpriteSheetBuilder">
+    <Position X="12.75" Y="3.5" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAACAAAA=</HashCode>
+      <FileName>Graphics\SpriteSheetBuilder.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Field Name="sprites" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.TerrainRenderer">
+    <Position X="7" Y="2.25" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AACQEAAAAAAAAgAAAAAACAAAABgAAAAAAAAAAAAAgAA=</HashCode>
+      <FileName>Graphics\TerrainRenderer.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="renderer" />
+      <Field Name="terrainSheet" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="OpenRa.Game.Graphics.UnitSheetBuilder">
+    <Position X="15.75" Y="6" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAgAAAAAAAAAAAAAAAAQAAAAAAAQAAAACAAAA=</HashCode>
+      <FileName>Graphics\UnitSheetBuilder.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Field Name="sprites" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Struct Name="OpenRa.Game.Graphics.Vertex" Collapsed="true">
+    <Position X="18.25" Y="1.75" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAgAAACAAFJgAQAAAAA=</HashCode>
+      <FileName>Graphics\Vertex.cs</FileName>
+    </TypeIdentifier>
+  </Struct>
+  <Enum Name="OpenRa.Game.Graphics.TextureChannel" Collapsed="true">
+    <Position X="18.25" Y="3" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAACAAAAAAAAAgAAAAAAAAAAAAAAABAAAAAAABAAAAA=</HashCode>
+      <FileName>Graphics\Sprite.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Font Name="Segoe UI" Size="9" />
+</ClassDiagram>
\ No newline at end of file
diff --git a/OpenRa.Game/HardwarePalette.cs b/OpenRa.Game/Graphics/HardwarePalette.cs
similarity index 92%
rename from OpenRa.Game/HardwarePalette.cs
rename to OpenRa.Game/Graphics/HardwarePalette.cs
index a0c7e256bd..f1a6a2c4bd 100644
--- a/OpenRa.Game/HardwarePalette.cs
+++ b/OpenRa.Game/Graphics/HardwarePalette.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.IO;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class HardwarePalette : Sheet
 	{
diff --git a/OpenRa.Game/Region.cs b/OpenRa.Game/Graphics/Region.cs
similarity index 83%
rename from OpenRa.Game/Region.cs
rename to OpenRa.Game/Graphics/Region.cs
index 9f787b8ff7..6a35060fc0 100644
--- a/OpenRa.Game/Region.cs
+++ b/OpenRa.Game/Graphics/Region.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Region
 	{
@@ -13,15 +11,10 @@ namespace OpenRa.Game
 
 		public float2 Location
 		{
-			get { return location + viewport.Location; }
+			get { return location + viewport.Location; }	// WTF HACK HACK HACK
 		}
 
-		float2 size;
-
-		public float2 Size
-		{
-			get { return size; }
-		}
+		public readonly float2 Size;
 
 		Action drawFunction;
 		MouseEventHandler mouseHandler;
@@ -71,7 +64,7 @@ namespace OpenRa.Game
 		Region(int2 location, int2 size, Viewport viewport, Action drawFunction, MouseEventHandler mouseHandler)
 		{
 			this.location = location;
-			this.size = size;
+			this.Size = size;
 			this.drawFunction = drawFunction;
 			this.viewport = viewport;
 			this.mouseHandler = mouseHandler;
@@ -82,7 +75,7 @@ namespace OpenRa.Game
 
 		public void Draw(Renderer renderer)
 		{
-			renderer.Device.EnableScissor((int)location.X, (int)location.Y, (int)size.X, (int)size.Y);
+			renderer.Device.EnableScissor((int)location.X, (int)location.Y, (int)Size.X, (int)Size.Y);
 			drawFunction();
 			renderer.Device.DisableScissor();
 		}
diff --git a/OpenRa.Game/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs
similarity index 90%
rename from OpenRa.Game/Renderer.cs
rename to OpenRa.Game/Graphics/Renderer.cs
index 6715cad2dd..b6d40272ee 100644
--- a/OpenRa.Game/Renderer.cs
+++ b/OpenRa.Game/Graphics/Renderer.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
 using System.Drawing;
+using System.Windows.Forms;
 using Ijw.DirectX;
-using System.IO;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Renderer
 	{
diff --git a/OpenRa.Game/Sequence.cs b/OpenRa.Game/Graphics/Sequence.cs
similarity index 87%
rename from OpenRa.Game/Sequence.cs
rename to OpenRa.Game/Graphics/Sequence.cs
index ab16c512ed..c9fe749d10 100644
--- a/OpenRa.Game/Sequence.cs
+++ b/OpenRa.Game/Graphics/Sequence.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Ijw.DirectX;
 using System.Xml;
+using Ijw.DirectX;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Sequence
 	{
diff --git a/OpenRa.Game/SequenceProvider.cs b/OpenRa.Game/Graphics/SequenceProvider.cs
similarity index 91%
rename from OpenRa.Game/SequenceProvider.cs
rename to OpenRa.Game/Graphics/SequenceProvider.cs
index f0dab18c30..c233ff2780 100644
--- a/OpenRa.Game/SequenceProvider.cs
+++ b/OpenRa.Game/Graphics/SequenceProvider.cs
@@ -1,10 +1,8 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	static class SequenceProvider
 	{
diff --git a/OpenRa.Game/Sheet.cs b/OpenRa.Game/Graphics/Sheet.cs
similarity index 86%
rename from OpenRa.Game/Sheet.cs
rename to OpenRa.Game/Graphics/Sheet.cs
index 15ca490893..57fcda9fea 100644
--- a/OpenRa.Game/Sheet.cs
+++ b/OpenRa.Game/Graphics/Sheet.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using System.IO;
 using Ijw.DirectX;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Sheet
 	{
diff --git a/OpenRa.Game/SheetBuilder.cs b/OpenRa.Game/Graphics/SheetBuilder.cs
similarity index 88%
rename from OpenRa.Game/SheetBuilder.cs
rename to OpenRa.Game/Graphics/SheetBuilder.cs
index 65885109e9..480288e2c0 100644
--- a/OpenRa.Game/SheetBuilder.cs
+++ b/OpenRa.Game/Graphics/SheetBuilder.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
-using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	static class SheetBuilder
 	{
@@ -16,7 +12,6 @@ namespace OpenRa.Game
 		public static Sprite Add(byte[] src, Size size)
 		{
 			Sprite rect = AddImage(size);
-			//Util.CopyIntoChannel(rect, src);
 			Util.FastCopyIntoChannel(rect, src);
 			return rect;
 		}
diff --git a/OpenRa.Game/Sprite.cs b/OpenRa.Game/Graphics/Sprite.cs
similarity index 93%
rename from OpenRa.Game/Sprite.cs
rename to OpenRa.Game/Graphics/Sprite.cs
index 7c978c3314..054bed7647 100644
--- a/OpenRa.Game/Sprite.cs
+++ b/OpenRa.Game/Graphics/Sprite.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Sprite
 	{
diff --git a/OpenRa.Game/SpriteRenderer.cs b/OpenRa.Game/Graphics/SpriteRenderer.cs
similarity index 94%
rename from OpenRa.Game/SpriteRenderer.cs
rename to OpenRa.Game/Graphics/SpriteRenderer.cs
index 5534121f4f..8b3d3433c5 100644
--- a/OpenRa.Game/SpriteRenderer.cs
+++ b/OpenRa.Game/Graphics/SpriteRenderer.cs
@@ -5,7 +5,7 @@ using OpenRa.FileFormats;
 using System.Drawing;
 using Ijw.DirectX;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class SpriteRenderer
 	{
diff --git a/OpenRa.Game/SpriteSheetBuilder.cs b/OpenRa.Game/Graphics/SpriteSheetBuilder.cs
similarity index 85%
rename from OpenRa.Game/SpriteSheetBuilder.cs
rename to OpenRa.Game/Graphics/SpriteSheetBuilder.cs
index 784f917bc6..5813c74e4e 100644
--- a/OpenRa.Game/SpriteSheetBuilder.cs
+++ b/OpenRa.Game/Graphics/SpriteSheetBuilder.cs
@@ -1,9 +1,7 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	static class SpriteSheetBuilder
 	{
diff --git a/OpenRa.Game/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs
similarity index 92%
rename from OpenRa.Game/TerrainRenderer.cs
rename to OpenRa.Game/Graphics/TerrainRenderer.cs
index 8681d2476c..cb6dca3f60 100644
--- a/OpenRa.Game/TerrainRenderer.cs
+++ b/OpenRa.Game/Graphics/TerrainRenderer.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-
 using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
 using Ijw.DirectX;
 using IjwFramework.Collections;
+using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class TerrainRenderer
 	{
diff --git a/OpenRa.Game/TreeCache.cs b/OpenRa.Game/Graphics/TreeCache.cs
similarity index 84%
rename from OpenRa.Game/TreeCache.cs
rename to OpenRa.Game/Graphics/TreeCache.cs
index 86dcf7fe70..f6c95890fb 100644
--- a/OpenRa.Game/TreeCache.cs
+++ b/OpenRa.Game/Graphics/TreeCache.cs
@@ -1,10 +1,7 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenRa.FileFormats;
-using System.Drawing;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class TreeCache
 	{
diff --git a/OpenRa.Game/UnitSheetBuilder.cs b/OpenRa.Game/Graphics/UnitSheetBuilder.cs
similarity index 88%
rename from OpenRa.Game/UnitSheetBuilder.cs
rename to OpenRa.Game/Graphics/UnitSheetBuilder.cs
index df46fd16bd..96b0b23860 100644
--- a/OpenRa.Game/UnitSheetBuilder.cs
+++ b/OpenRa.Game/Graphics/UnitSheetBuilder.cs
@@ -1,12 +1,8 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-using System.Drawing;
 using Ijw.DirectX;
+using OpenRa.FileFormats;
 
-
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	static class UnitSheetBuilder
 	{
diff --git a/OpenRa.Game/Util.cs b/OpenRa.Game/Graphics/Util.cs
similarity index 93%
rename from OpenRa.Game/Util.cs
rename to OpenRa.Game/Graphics/Util.cs
index 346127eb96..2d76597447 100644
--- a/OpenRa.Game/Util.cs
+++ b/OpenRa.Game/Graphics/Util.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-using System.Drawing;
-using System.IO;
 using System.Drawing.Imaging;
+using System.IO;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	static class Util
 	{
diff --git a/OpenRa.Game/Vertex.cs b/OpenRa.Game/Graphics/Vertex.cs
similarity index 75%
rename from OpenRa.Game/Vertex.cs
rename to OpenRa.Game/Graphics/Vertex.cs
index e32a5a9ef8..e9d0a054f0 100644
--- a/OpenRa.Game/Vertex.cs
+++ b/OpenRa.Game/Graphics/Vertex.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
-using System.Drawing;
 using Ijw.DirectX;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	[StructLayout(LayoutKind.Sequential)]
 	struct Vertex
diff --git a/OpenRa.Game/Viewport.cs b/OpenRa.Game/Graphics/Viewport.cs
similarity index 87%
rename from OpenRa.Game/Viewport.cs
rename to OpenRa.Game/Graphics/Viewport.cs
index 062a487c0a..9ba0db84db 100644
--- a/OpenRa.Game/Viewport.cs
+++ b/OpenRa.Game/Graphics/Viewport.cs
@@ -1,10 +1,6 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Drawing;
-using System.Windows.Forms;
 
-namespace OpenRa.Game
+namespace OpenRa.Game.Graphics
 {
 	class Viewport
 	{
diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs
index a9ee92a1ec..d541db0fae 100644
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -1,15 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
 using System.Drawing;
-
+using System.Windows.Forms;
 using OpenRa.FileFormats;
-using System.IO;
+using OpenRa.Game.Graphics;
 using OpenRa.TechTree;
 
 namespace OpenRa.Game
 {
+	using GRegion = OpenRa.Game.Graphics.Region;
+
 	class MainWindow : Form
 	{
 		readonly Renderer renderer;
@@ -74,7 +72,7 @@ namespace OpenRa.Game
 			lastPos = new int2(e.Location);
 
 			if (e.Button == MouseButtons.Left)
-				foreach (Region region in game.viewport.Regions)
+				foreach (GRegion region in game.viewport.Regions)
 					if (region.Contains(lastPos))
 						region.Clicked(e);
 		}
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 14368f039b..4fb47ae327 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -71,53 +71,53 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Actor.cs" />
-    <Compile Include="Animation.cs" />
+    <Compile Include="Graphics\Animation.cs" />
     <Compile Include="Building.cs" />
     <Compile Include="Game.cs" />
     <Compile Include="IOrderGenerator.cs" />
-    <Compile Include="Item.cs" />
+    <Compile Include="TechTree\Item.cs" />
     <Compile Include="Network\Packet.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="PlayerOwned.cs" />
     <Compile Include="Race.cs" />
     <Compile Include="Rules.cs" />
     <Compile Include="SharedResources.cs" />
-    <Compile Include="Sheet.cs" />
-    <Compile Include="Log.cs" />
+    <Compile Include="Graphics\Sheet.cs" />
+    <Compile Include="Support\Log.cs" />
     <Compile Include="Network\Network.cs" />
     <Compile Include="PathFinder.cs" />
-    <Compile Include="Sequence.cs" />
-    <Compile Include="ConstructionYard.cs" />
+    <Compile Include="Graphics\Sequence.cs" />
     <Compile Include="MoveOrder.cs" />
-    <Compile Include="Region.cs" />
-    <Compile Include="SequenceProvider.cs" />
-    <Compile Include="SheetBuilder.cs" />
-    <Compile Include="HardwarePalette.cs" />
+    <Compile Include="Graphics\Region.cs" />
+    <Compile Include="Graphics\SequenceProvider.cs" />
+    <Compile Include="Graphics\SheetBuilder.cs" />
+    <Compile Include="Graphics\HardwarePalette.cs" />
     <Compile Include="MainWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Program.cs" />
+    <Compile Include="Support\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Refinery.cs" />
-    <Compile Include="Renderer.cs" />
-    <Compile Include="Settings.cs" />
+    <Compile Include="Graphics\Renderer.cs" />
+    <Compile Include="Support\Settings.cs" />
     <Compile Include="Sidebar.cs" />
     <Compile Include="SidebarItem.cs" />
-    <Compile Include="Sprite.cs" />
-    <Compile Include="SpriteRenderer.cs" />
-    <Compile Include="SpriteSheetBuilder.cs" />
-    <Compile Include="TechTree.cs" />
+    <Compile Include="Graphics\Sprite.cs" />
+    <Compile Include="Graphics\SpriteRenderer.cs" />
+    <Compile Include="Graphics\SpriteSheetBuilder.cs" />
+    <Compile Include="TechTree\TechTree.cs" />
     <Compile Include="TerrainCosts.cs" />
-    <Compile Include="TerrainRenderer.cs" />
+    <Compile Include="Graphics\TerrainRenderer.cs" />
     <Compile Include="Tree.cs" />
-    <Compile Include="TreeCache.cs" />
+    <Compile Include="Graphics\TreeCache.cs" />
     <Compile Include="UiOverlay.cs" />
     <Compile Include="Unit.cs" />
+    <Compile Include="UnitInfo.cs" />
     <Compile Include="UnitMissions.cs" />
-    <Compile Include="UnitSheetBuilder.cs" />
-    <Compile Include="Util.cs" />
-    <Compile Include="Vertex.cs" />
-    <Compile Include="Viewport.cs" />
+    <Compile Include="Graphics\UnitSheetBuilder.cs" />
+    <Compile Include="Graphics\Util.cs" />
+    <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="Graphics\Viewport.cs" />
     <Compile Include="World.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -148,7 +148,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ClassDiagram1.cd" />
+    <None Include="Graphics\Graphics.cd" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OpenRa.Game/PathFinder.cs b/OpenRa.Game/PathFinder.cs
index 751a1269f5..abe8a81b2c 100644
--- a/OpenRa.Game/PathFinder.cs
+++ b/OpenRa.Game/PathFinder.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-using System.Windows.Forms;
 using IjwFramework.Collections;
+using OpenRa.FileFormats;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Player.cs b/OpenRa.Game/Player.cs
index 3fd049fbf4..cdac3c29be 100644
--- a/OpenRa.Game/Player.cs
+++ b/OpenRa.Game/Player.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/PlayerOwned.cs b/OpenRa.Game/PlayerOwned.cs
index c1dda4eb2f..06e969abaf 100644
--- a/OpenRa.Game/PlayerOwned.cs
+++ b/OpenRa.Game/PlayerOwned.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Rules.cs b/OpenRa.Game/Rules.cs
index 8d2cfa64e0..6699cc5e91 100644
--- a/OpenRa.Game/Rules.cs
+++ b/OpenRa.Game/Rules.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using OpenRa.FileFormats;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
@@ -32,21 +33,4 @@ namespace OpenRa.Game
 			return unitInfos[ name.ToUpperInvariant() ];
 		}
 	}
-
-	class UnitInfo
-	{
-		public readonly int Speed;
-		public readonly SupportedMissions supportedMissions;
-
-		public UnitInfo( string unitName, IniSection ini )
-		{
-			Speed = int.Parse( ini.GetValue( "Speed", "0" ) );
-
-			supportedMissions = SupportedMissions.Stop;
-			if( unitName == "MCV" )
-				supportedMissions |= SupportedMissions.Deploy;
-			if( unitName == "HARV" )
-				supportedMissions |= SupportedMissions.Harvest;
-		}
-	}
 }
diff --git a/OpenRa.Game/SharedResources.cs b/OpenRa.Game/SharedResources.cs
index a9c82b7322..efc22425dd 100644
--- a/OpenRa.Game/SharedResources.cs
+++ b/OpenRa.Game/SharedResources.cs
@@ -1,14 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using IjwFramework.Types;
 using OpenRa.FileFormats;
-using IjwFramework.Types;
 
 namespace OpenRa.Game
 {
     class SharedResources
     {
-        static Lazy<IniFile> rules = new Lazy<IniFile>( () => new IniFile( FileSystem.Open( "rules.ini" )));
+        static Lazy<IniFile> rules = new Lazy<IniFile>( 
+			() => new IniFile( FileSystem.Open( "rules.ini" )));
+
         public static IniFile Rules { get { return rules.Value; } }
     }
 }
diff --git a/OpenRa.Game/Sidebar.cs b/OpenRa.Game/Sidebar.cs
index eb884493f2..888ac68a60 100644
--- a/OpenRa.Game/Sidebar.cs
+++ b/OpenRa.Game/Sidebar.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OpenRa.TechTree;
-using Ijw.DirectX;
-using OpenRa.FileFormats;
 using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
+using OpenRa.FileFormats;
+using OpenRa.Game.Graphics;
+using OpenRa.TechTree;
 
 namespace OpenRa.Game
 {
+	using GRegion = OpenRa.Game.Graphics.Region;
+
 	class Sidebar
 	{
 		TechTree.TechTree techTree;
@@ -17,11 +17,11 @@ namespace OpenRa.Game
 		SpriteRenderer spriteRenderer, clockRenderer;
 		Sprite blank;
 		Game game;
-		readonly Region region;
+		readonly GRegion region;
 
 		Animation clockAnimation = new Animation("clock");
 
-		public Region Region { get { return region; } }
+		public GRegion Region { get { return region; } }
 		public float Width { get { return spriteWidth * 2; } }
 
 		Dictionary<string, Sprite> sprites = new Dictionary<string,Sprite>();
@@ -33,7 +33,7 @@ namespace OpenRa.Game
 		{
 			this.techTree = game.players[ game.localPlayerIndex ].TechTree;
 			this.game = game;
-			region = Region.Create(game.viewport, DockStyle.Right, 128, Paint, MouseHandler);
+			region = GRegion.Create(game.viewport, DockStyle.Right, 128, Paint, MouseHandler);
 			game.viewport.AddRegion( region );
 			spriteRenderer = new SpriteRenderer(renderer, false);
 			clockRenderer = new SpriteRenderer(renderer, true);
diff --git a/OpenRa.Game/SidebarItem.cs b/OpenRa.Game/SidebarItem.cs
index 92b8fda8f8..9dd4e530bc 100644
--- a/OpenRa.Game/SidebarItem.cs
+++ b/OpenRa.Game/SidebarItem.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using OpenRa.Game.Graphics;
 using OpenRa.TechTree;
 
 namespace OpenRa.Game
diff --git a/OpenRa.Game/Log.cs b/OpenRa.Game/Support/Log.cs
similarity index 100%
rename from OpenRa.Game/Log.cs
rename to OpenRa.Game/Support/Log.cs
diff --git a/OpenRa.Game/Program.cs b/OpenRa.Game/Support/Program.cs
similarity index 100%
rename from OpenRa.Game/Program.cs
rename to OpenRa.Game/Support/Program.cs
diff --git a/OpenRa.Game/Settings.cs b/OpenRa.Game/Support/Settings.cs
similarity index 92%
rename from OpenRa.Game/Settings.cs
rename to OpenRa.Game/Support/Settings.cs
index a6730390fc..89f28ec471 100644
--- a/OpenRa.Game/Settings.cs
+++ b/OpenRa.Game/Support/Settings.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace OpenRa.Game
diff --git a/OpenRa.Game/Item.cs b/OpenRa.Game/TechTree/Item.cs
similarity index 95%
rename from OpenRa.Game/Item.cs
rename to OpenRa.Game/TechTree/Item.cs
index b5c1855ee4..30c31799b8 100644
--- a/OpenRa.Game/Item.cs
+++ b/OpenRa.Game/TechTree/Item.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Text;
 using OpenRa.FileFormats;
 
 namespace OpenRa.TechTree
diff --git a/OpenRa.Game/TechTree.cs b/OpenRa.Game/TechTree/TechTree.cs
similarity index 100%
rename from OpenRa.Game/TechTree.cs
rename to OpenRa.Game/TechTree/TechTree.cs
diff --git a/OpenRa.Game/TerrainCosts.cs b/OpenRa.Game/TerrainCosts.cs
index 8ca4308229..d9af77aa54 100644
--- a/OpenRa.Game/TerrainCosts.cs
+++ b/OpenRa.Game/TerrainCosts.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using OpenRa.FileFormats;
 using System.IO;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Tree.cs b/OpenRa.Game/Tree.cs
index 68d8a2b3e4..14b82f361d 100644
--- a/OpenRa.Game/Tree.cs
+++ b/OpenRa.Game/Tree.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using OpenRa.FileFormats;
 using System.Drawing;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/UiOverlay.cs b/OpenRa.Game/UiOverlay.cs
index 37599c376a..037b18ccb1 100644
--- a/OpenRa.Game/UiOverlay.cs
+++ b/OpenRa.Game/UiOverlay.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
diff --git a/OpenRa.Game/Unit.cs b/OpenRa.Game/Unit.cs
index e83de31321..34651138d7 100644
--- a/OpenRa.Game/Unit.cs
+++ b/OpenRa.Game/Unit.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
@@ -23,12 +22,12 @@ namespace OpenRa.Game
 			: base( game, name, cell )
 		{
 			fromCell = toCell = cell;
-			this.renderOffset = new float2( 12, 12 ); // TODO: pull this from the sprite
+
 			this.owner = owner;
 			this.unitInfo = Rules.UnitInfo( name );
 
-			animation = new Animation( name );
 			animation.PlayFetchIndex( "idle", () => facing );
+			renderOffset = animation.Center;
 		}
 
 		static float2[] fvecs = Util.MakeArray<float2>(32,
diff --git a/OpenRa.Game/UnitInfo.cs b/OpenRa.Game/UnitInfo.cs
new file mode 100644
index 0000000000..a08271a3e4
--- /dev/null
+++ b/OpenRa.Game/UnitInfo.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using OpenRa.FileFormats;
+
+namespace OpenRa.Game
+{
+	class UnitInfo
+	{
+		public readonly int Speed;
+		public readonly SupportedMissions supportedMissions;
+
+		public UnitInfo(string unitName, IniSection ini)
+		{
+			Speed = int.Parse(ini.GetValue("Speed", "0"));
+
+			supportedMissions = SupportedMissions.Stop;
+			if (unitName == "MCV")
+				supportedMissions |= SupportedMissions.Deploy;
+			if (unitName == "HARV")
+				supportedMissions |= SupportedMissions.Harvest;
+		}
+	}
+}
diff --git a/OpenRa.Game/UnitMissions.cs b/OpenRa.Game/UnitMissions.cs
index 87a442aa7f..64c4e62c6f 100644
--- a/OpenRa.Game/UnitMissions.cs
+++ b/OpenRa.Game/UnitMissions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenRa.Game
 {
@@ -102,7 +101,7 @@ namespace OpenRa.Game
 				game.world.AddFrameEndTask( _ =>
 				{
 					game.world.Remove( unit );
-					game.world.Add( new ConstructionYard( unit.fromCell - new int2( 1, 1 ), unit.owner, game ) );
+					game.world.Add( new Building("fact", unit.fromCell - new int2( 1, 1 ), unit.owner, game ) );
 				} );
 				unit.currentOrder = null;
 			};
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index 771ae1355b..d07f81c5e8 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-using System.Drawing;
 using System.Windows.Forms;
 using Ijw.DirectX;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
@@ -51,7 +49,7 @@ namespace OpenRa.Game
 			int dt = t - lastTime;
 			lastTime = t;
 
-			Range<float2> range = new Range<float2>(region.Location, region.Location + region.Size);
+			var range = new Range<float2>(region.Location, region.Location + region.Size);
 			
 			foreach (Actor a in actors)
 			{
@@ -70,10 +68,7 @@ namespace OpenRa.Game
 					spriteRenderer.DrawSprite(image, loc, (a.owner != null) ? a.owner.Palette : 0);
 			}
 
-			foreach( Action<World> a in frameEndActions )
-			{
-				a( this );
-			}
+			foreach (Action<World> a in frameEndActions) a(this);
 			frameEndActions.Clear();
 
 			uiOverlay.Draw();