renamed OpenRa.Game.* to OpenRa.*; a few other bits

OpenRa.Game/Actor.cs

@@ -2,14 +2,14 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class Actor
+	public class Actor
 	{
 		[Sync]
 		public readonly TypeDictionary traits = new TypeDictionary();

OpenRa.Game/BuildingInfluenceMap.cs

@@ -1,9 +1,9 @@
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class BuildingInfluenceMap
+	public class BuildingInfluenceMap
 	{
 		bool[,] blocked = new bool[128, 128];
 		Actor[,] influence = new Actor[128, 128];

OpenRa.Game/Chat.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	class Chat
 	{

OpenRa.Game/Chrome.cs

@@ -4,12 +4,12 @@ using System.Drawing;
 using System.Linq;
 using IjwFramework.Types;
 using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
-using OpenRa.Game.Support;
+using OpenRa.Support;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	class Chrome : IHandleInput
 	{
@@ -126,7 +126,7 @@ namespace OpenRa.Game
 			
 			tabImageNames = groups.Select(
 				(g, i) => Pair.New(g,
-					OpenRa.Game.Graphics.Util.MakeArray(3,
+					OpenRa.Graphics.Util.MakeArray(3,
 						n => i.ToString())))
 				.ToDictionary(a => a.First, a => a.Second);
 

OpenRa.Game/Combat.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Combat			/* some utility bits that are shared between various things */
 	{

OpenRa.Game/Controller.cs

@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using IjwFramework.Collections;
 using IjwFramework.Types;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class Controller : IHandleInput
+	public class Controller : IHandleInput
 	{
 		public IOrderGenerator orderGenerator;
 

OpenRa.Game/Cursor.cs

@@ -1,8 +1,8 @@
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class Cursor
+	public class Cursor
 	{
 		CursorSequence sequence;
 		Cursor(string cursor)

OpenRa.Game/Effects/Bullet.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class Bullet : IEffect
 	{

OpenRa.Game/Effects/Corpse.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class Corpse : IEffect
 	{

OpenRa.Game/Effects/DelayedAction.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class DelayedAction : IEffect
 	{

OpenRa.Game/Effects/Explosion.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class Explosion : IEffect
 	{

OpenRa.Game/Effects/FlashTarget.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class FlashTarget : IEffect
 	{

OpenRa.Game/Effects/GpsSatellite.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class GpsSatellite : IEffect
 	{

OpenRa.Game/Effects/IEffect.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
-	interface IEffect
+	public interface IEffect
 	{
 		void Tick();
 		IEnumerable<Renderable> Render();

OpenRa.Game/Effects/InvulnEffect.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class InvulnEffect : IEffect
 	{

OpenRa.Game/Effects/Missile.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 using System;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class Missile : IEffect
 	{

OpenRa.Game/Effects/MoveFlash.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class MoveFlash : IEffect
 	{

OpenRa.Game/Effects/PowerDownIndicator.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class PowerDownIndicator : IEffect
 	{

OpenRa.Game/Effects/RepairIndicator.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class RepairIndicator : IEffect
 	{

OpenRa.Game/Effects/SatelliteLaunch.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class SatelliteLaunch : IEffect
 	{

OpenRa.Game/Effects/Smoke.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class Smoke : IEffect
 	{

OpenRa.Game/Effects/TeslaZap.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Effects
+namespace OpenRa.Effects
 {
 	class TeslaZap : IEffect
 	{

OpenRa.Game/Exts.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Exts
 	{

OpenRa.Game/Game.cs

@@ -4,28 +4,28 @@ using System.Drawing;
 using System.Linq;
 using System.Net.Sockets;
 using OpenRa.FileFormats;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
-using OpenRa.Game.Support;
+using OpenRa.Support;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 using IjwFramework.Types;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	static class Game
+	public static class Game
 	{
 		public static readonly int CellSize = 24;
 
 		public static World world;
-		public static Viewport viewport;
+		internal static Viewport viewport;
 		public static PathFinder PathFinder;
-		public static WorldRenderer worldRenderer;
+		internal static WorldRenderer worldRenderer;
 		public static Controller controller;
-		public static Chrome chrome;
+		internal static Chrome chrome;
 		public static UserSettings Settings;
 		
-		public static OrderManager orderManager;
+		internal static OrderManager orderManager;
 
 		static int localPlayerIndex;
 
@@ -50,9 +50,9 @@ namespace OpenRa.Game
 		static int2 clientSize;
 		static HardwarePalette palette;
 		static string mapName;
-		public static Minimap minimap;
+		internal static Minimap minimap;
-		public static Session LobbyInfo = new Session();
+		internal static Session LobbyInfo = new Session();
-		public static int2[] SpawnPoints;
+		internal static int2[] SpawnPoints;
 		static bool changePending;
 
 		public static void ChangeMap(string mapName)
@@ -115,7 +115,7 @@ namespace OpenRa.Game
 				.ToArray();
 		}
 
-		public static void Initialize(string mapName, Renderer renderer, int2 clientSize, 
+		internal static void Initialize(string mapName, Renderer renderer, int2 clientSize, 
 			int localPlayer, bool useAftermath, Controller controller)
 		{
 			localPlayerIndex = localPlayer;
@@ -169,7 +169,7 @@ namespace OpenRa.Game
 		static int oreTicks;
 		public static int RenderFrame = 0;
 
-		public static Chat chat = new Chat();
+		internal static Chat chat = new Chat();
 
 		public static void Tick()
 		{

OpenRa.Game/GameRules/AftermathInfo.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class AftermathInfo
 	{

OpenRa.Game/GameRules/ArmorType.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	public enum ArmorType
 	{

OpenRa.Game/GameRules/Footprint.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	static class Footprint
 	{

OpenRa.Game/GameRules/GeneralInfo.cs

@@ -1,6 +1,6 @@
 
 using System;
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class GeneralInfo
 	{

OpenRa.Game/GameRules/InfoLoader.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 using IjwFramework.Types;
 using System.Collections;
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class InfoLoader<T> : IEnumerable<KeyValuePair<string, T>>
 	{

OpenRa.Game/GameRules/NewUnitInfo.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRa.FileFormats;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
-	class NewUnitInfo
+	public class NewUnitInfo
 	{
 		public readonly string Name;
 		public readonly string Category;

OpenRa.Game/GameRules/ProjectileInfo.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class ProjectileInfo
 	{

OpenRa.Game/GameRules/Rules.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using IjwFramework.Types;
 using OpenRa.FileFormats;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Rules
 	{

OpenRa.Game/GameRules/SupportPowerInfo.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	public class SupportPowerInfo
 	{

OpenRa.Game/GameRules/TechTree.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using IjwFramework.Collections;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class TechTree
 	{

OpenRa.Game/GameRules/UserSettings.cs

@@ -1,7 +1,7 @@
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
-	class UserSettings
+	public class UserSettings
 	{
 		// Debug settings
 		public readonly bool UnitDebug = false;

OpenRa.Game/GameRules/VoiceInfo.cs

@@ -5,7 +5,7 @@ using System.Text;
 using IjwFramework.Types;
 using IjwFramework.Collections;
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class VoiceInfo
 	{

OpenRa.Game/GameRules/WarheadInfo.cs

@@ -1,7 +1,7 @@
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
-	class WarheadInfo
+	public class WarheadInfo
 	{
 		public readonly int Spread = 1;
 		public readonly float[] Verses = { 1, 1, 1, 1, 1 };

OpenRa.Game/GameRules/WeaponInfo.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.GameRules
+namespace OpenRa.GameRules
 {
 	class WeaponInfo
 	{

OpenRa.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class Animation
 	{

OpenRa.Game/Graphics/CursorSequence.cs

@@ -1,6 +1,6 @@
 using System.Xml;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class CursorSequence
 	{

OpenRa.Game/Graphics/CursorSheetBuilder.cs

@@ -2,7 +2,7 @@
 using IjwFramework.Collections;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	static class CursorSheetBuilder
 	{

OpenRa.Game/Graphics/HardwarePalette.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	public enum PaletteType
 	{

OpenRa.Game/Graphics/LineRenderer.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using Ijw.DirectX;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class LineRenderer
 	{

OpenRa.Game/Graphics/MappedImage.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using Ijw.DirectX;
 using System.IO;
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class MappedImage
 	{

OpenRa.Game/Graphics/Minimap.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 using OpenRa.FileFormats;
 using System.Drawing.Imaging;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class Minimap
 	{

OpenRa.Game/Graphics/OverlayRenderer.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class OverlayRenderer
 	{

OpenRa.Game/Graphics/Renderer.cs

@@ -2,11 +2,11 @@ using System.Drawing;
 using System.Windows.Forms;
 using Ijw.DirectX;
 using OpenRa.FileFormats;
-using OpenRa.Game.Support;
+using OpenRa.Support;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
-	class Renderer
+	internal class Renderer
 	{
 		internal static int SheetSize;
 

OpenRa.Game/Graphics/Sequence.cs

@@ -1,7 +1,7 @@
 using System.Xml;
 using Ijw.DirectX;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class Sequence
 	{

OpenRa.Game/Graphics/SequenceProvider.cs

@@ -4,7 +4,7 @@ using System.Xml;
 using OpenRa.FileFormats;
 using System;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	static class SequenceProvider
 	{

OpenRa.Game/Graphics/Sheet.cs

@@ -2,22 +2,22 @@ using System.Drawing;
 using Ijw.DirectX;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
-	class Sheet
+	public class Sheet
 	{
 		readonly Renderer renderer;
 		protected readonly Bitmap bitmap;
 
 		Texture texture;
 
-		public Sheet(Renderer renderer, Size size)
+		internal Sheet(Renderer renderer, Size size)
 		{
 			this.renderer = renderer;
 			this.bitmap = new Bitmap(size.Width, size.Height);
 		}
 
-		public Sheet(Renderer renderer, string filename)
+		internal Sheet(Renderer renderer, string filename)
 		{
 			this.renderer = renderer;
 			this.bitmap = (Bitmap)Image.FromStream(FileSystem.Open(filename));

OpenRa.Game/Graphics/SheetBuilder.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	static class SheetBuilder
 	{

OpenRa.Game/Graphics/Sprite.cs

@@ -1,8 +1,8 @@
 using System.Drawing;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
-	class Sprite
+	public class Sprite
 	{
 		public readonly Rectangle bounds;
 		public readonly Sheet sheet;

OpenRa.Game/Graphics/SpriteRenderer.cs

@@ -1,6 +1,6 @@
 using Ijw.DirectX;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class SpriteRenderer
 	{

OpenRa.Game/Graphics/SpriteSheetBuilder.cs

@@ -2,7 +2,7 @@ using System.Linq;
 using IjwFramework.Collections;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	static class SpriteSheetBuilder
 	{

OpenRa.Game/Graphics/TerrainRenderer.cs

@@ -3,7 +3,7 @@ using Ijw.DirectX;
 using IjwFramework.Collections;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class TerrainRenderer
 	{

OpenRa.Game/Graphics/Util.cs

@@ -4,7 +4,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Drawing;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	static class Util
 	{

OpenRa.Game/Graphics/Vertex.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using Ijw.DirectX;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	[StructLayout(LayoutKind.Sequential)]
 	struct Vertex

OpenRa.Game/Graphics/Viewport.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	interface IHandleInput
 	{

OpenRa.Game/Graphics/WorldRenderer.cs

@@ -4,11 +4,11 @@ using System.Linq;
 using System.Windows.Forms;
 using IjwFramework.Types;
 using System.Collections.Generic;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.Support;
+using OpenRa.Support;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Graphics
+namespace OpenRa.Graphics
 {
 	class WorldRenderer
 	{

OpenRa.Game/MainWindow.cs

@@ -4,12 +4,12 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using OpenRa.FileFormats;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
 
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	class MainWindow : Form
 	{
@@ -183,7 +183,7 @@ namespace OpenRa.Game
 	}
 
 	[Flags]
-	enum MouseButton
+	public enum MouseButton
 	{
 		None = (int)MouseButtons.None,
 		Left = (int)MouseButtons.Left,
@@ -192,7 +192,7 @@ namespace OpenRa.Game
 	}
 
 	[Flags]
-	enum Modifiers
+	public enum Modifiers
 	{
 		None = (int)Keys.None,
 		Shift = (int)Keys.Shift,
@@ -200,7 +200,7 @@ namespace OpenRa.Game
 		Ctrl = (int)Keys.Control,
 	}
 
-	struct MouseInput
+	public struct MouseInput
 	{
 		public MouseInputEvent Event;
 		public int2 Location;
@@ -208,5 +208,5 @@ namespace OpenRa.Game
 		public Modifiers Modifiers;
 	}
 
-	enum MouseInputEvent { Down, Move, Up };
+	public enum MouseInputEvent { Down, Move, Up };
 }

OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Drawing;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.SupportPowers;
+using OpenRa.SupportPowers;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class ChronoshiftDestinationOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/ChronoshiftSelfDestinationOrderGenerator.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Drawing;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class ChronoshiftSelfDestinationOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.SupportPowers;
+using OpenRa.SupportPowers;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class ChronosphereSelectOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/IOrderGenerator.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	interface IOrderGenerator
+	public interface IOrderGenerator
 	{
 		IEnumerable<Order> Order( int2 xy, MouseInput mi );
 		void Tick();

OpenRa.Game/Orders/IOrderSource.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	interface IOrderSource
 	{

OpenRa.Game/Orders/IronCurtainOrderGenerator.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.SupportPowers;
+using OpenRa.SupportPowers;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class IronCurtainOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/LocalOrderSource.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class LocalOrderSource : IOrderSource
 	{

OpenRa.Game/Orders/NetworkOrderSource.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net.Sockets;
 using System.Threading;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class NetworkOrderSource : IOrderSource
 	{

OpenRa.Game/Orders/Order.cs

@@ -1,11 +1,11 @@
 using System;
 using System.IO;
 using System.Linq;
-using OpenRa.Game.SupportPowers;
+using OpenRa.SupportPowers;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	sealed class Order
+	public sealed class Order
 	{
 		public readonly string OrderString;
 		readonly uint SubjectId;

OpenRa.Game/Orders/OrderIO.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	static class OrderIO
 	{

OpenRa.Game/Orders/OrderManager.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class OrderManager
 	{

OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class PlaceBuildingOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/PowerDownOrderGenerator.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class PowerDownOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/RepairOrderGenerator.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class RepairOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/ReplayOrderSource.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class ReplayOrderSource : IOrderSource
 	{

OpenRa.Game/Orders/SellOrderGenerator.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class SellOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/UnitOrderGenerator.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	class UnitOrderGenerator : IOrderGenerator
 	{

OpenRa.Game/Orders/UnitOrders.cs

@@ -1,10 +1,10 @@
 using System.Drawing;
 using OpenRa.FileFormats;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Orders
+namespace OpenRa.Orders
 {
 	static class UnitOrders
 	{

OpenRa.Game/Ore.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	public static class Ore
 	{

OpenRa.Game/PackageDownloader.cs

@@ -6,7 +6,7 @@ using System.Security.Cryptography;
 using OpenRa.FileFormats;
 using System.Drawing;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class PackageDownloader
 	{

OpenRa.Game/PathFinder.cs

@@ -2,12 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRa.FileFormats;
-using OpenRa.Game.Support;
+using OpenRa.Support;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class PathFinder
+	public class PathFinder
 	{
 		float[][,] passableCost = new float[4][,];
 		
@@ -173,7 +173,7 @@ namespace OpenRa.Game
 		}
 	}
 
-	struct CellInfo
+	public struct CellInfo
 	{
 		public float MinCost;
 		public int2 Path;
@@ -187,7 +187,7 @@ namespace OpenRa.Game
 		}
 	}
 
-	struct PathDistance : IComparable<PathDistance>
+	public struct PathDistance : IComparable<PathDistance>
 	{
 		public float EstTotal;
 		public int2 Location;

OpenRa.Game/PathSearch.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using IjwFramework.Collections;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class PathSearch
+	public class PathSearch
 	{
 		public CellInfo[ , ] cellInfo;
 		public PriorityQueue<PathDistance> queue;

OpenRa.Game/Player.cs

@@ -1,16 +1,16 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 using OpenRa.FileFormats;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	enum PowerState { Normal, Low, Critical };
+	public enum PowerState { Normal, Low, Critical };
 
-	class Player
+	public class Player
 	{
 		public Actor PlayerActor;
 		public PaletteType Palette;

OpenRa.Game/ProductionItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	class ProductionItem
 	{

OpenRa.Game/Properties/AssemblyInfo.cs

@@ -2,11 +2,11 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("OpenRa.Game")]
+[assembly: AssemblyTitle("OpenRa")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenRa.Game")]
+[assembly: AssemblyProduct("OpenRa")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

OpenRa.Game/Race.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	[Flags]
 	public enum Race

OpenRa.Game/Shroud.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using IjwFramework.Types;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
-	class Shroud
+	public class Shroud
 	{
 		bool[,] explored = new bool[128, 128];
 		Sprite[] shadowBits = SpriteSheetBuilder.LoadAllSprites("shadow");
@@ -132,7 +132,7 @@ namespace OpenRa.Game
 			return shadowBits[ SpecialShroudTiles[ u ^ uSides ][ v ] ];
 		}
 
-		public void Draw(SpriteRenderer r)
+		internal void Draw(SpriteRenderer r)
 		{
 			if (dirty)
 			{

OpenRa.Game/Smudge.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Smudge
 	{

OpenRa.Game/Sound.cs

@@ -1,10 +1,10 @@
 using IjwFramework.Collections;
 using IrrKlang;
 using OpenRa.FileFormats;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Sound
 	{

OpenRa.Game/Support/Log.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Log
 	{

OpenRa.Game/Support/PerfHistory.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using IjwFramework.Collections;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Support
+namespace OpenRa.Support
 {
 	static class PerfHistory
 	{

OpenRa.Game/Support/Program.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	static class Program
 	{

OpenRa.Game/Support/Settings.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	class Settings
 	{

OpenRa.Game/Support/Stopwatch.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace OpenRa.Game.Support
+namespace OpenRa.Support
 {
 	class Stopwatch
 	{

OpenRa.Game/SupportPower.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
-using OpenRa.Game.SupportPowers;
+using OpenRa.SupportPowers;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	// todo: fix this to route Activate through the orders system (otherwise desync in netplay)
 
-	class SupportPower
+	public class SupportPower
 	{
 		public readonly SupportPowerInfo Info;
 		public readonly Player Owner;

OpenRa.Game/SupportPowers/ChronospherePower.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Drawing;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.SupportPowers
+namespace OpenRa.SupportPowers
 {
 	class ChronospherePower : ISupportPowerImpl
 	{

OpenRa.Game/SupportPowers/GpsSatellite.cs

@@ -1,8 +1,8 @@
 using System.Linq;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.SupportPowers
+namespace OpenRa.SupportPowers
 {
 	class GpsSatellite : ISupportPowerImpl
 	{

OpenRa.Game/SupportPowers/ISupportPowerImpl.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.SupportPowers
+namespace OpenRa.SupportPowers
 {
-	interface ISupportPowerImpl
+	public interface ISupportPowerImpl
 	{
 		void Activate(SupportPower p);
 		void OnFireNotification(Actor target, int2 xy);

OpenRa.Game/SupportPowers/IronCurtainPower.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
-using OpenRa.Game.Traits;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.SupportPowers
+namespace OpenRa.SupportPowers
 {
 	class IronCurtainPower : ISupportPowerImpl
 	{

OpenRa.Game/SupportPowers/NullPower.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.SupportPowers
+namespace OpenRa.SupportPowers
 {
 	class NullPower : ISupportPowerImpl
 	{