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

OpenRa.Game/Traits/AcceptsOre.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AcceptsOreInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Activities/Attack.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	/* non-turreted attack */
 	class Attack : IActivity

OpenRa.Game/Traits/Activities/CaptureBuilding.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class CaptureBuilding : IActivity
 	{

OpenRa.Game/Traits/Activities/DeliverOre.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class DeliverOre : IActivity
 	{

OpenRa.Game/Traits/Activities/Demolish.cs

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

OpenRa.Game/Traits/Activities/DeployMcv.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class DeployMcv : IActivity
 	{

OpenRa.Game/Traits/Activities/EnterTransport.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class EnterTransport : IActivity
 	{

OpenRa.Game/Traits/Activities/Fly.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Fly : IActivity
 	{

OpenRa.Game/Traits/Activities/FlyAttack.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class FlyAttack : IActivity
 	{

OpenRa.Game/Traits/Activities/FlyTimed.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class FlyTimed : IActivity
 	{

OpenRa.Game/Traits/Activities/Follow.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Follow : IActivity
 	{

OpenRa.Game/Traits/Activities/Harvest.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Harvest : IActivity
 	{

OpenRa.Game/Traits/Activities/HeliAttack.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class HeliAttack : IActivity
 	{

OpenRa.Game/Traits/Activities/HeliFly.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class HeliFly : IActivity
 	{

OpenRa.Game/Traits/Activities/HeliLand.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class HeliLand : IActivity
 	{

OpenRa.Game/Traits/Activities/HeliReturn.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class HeliReturn : IActivity
 	{

OpenRa.Game/Traits/Activities/IActivity.cs

@@ -1,7 +1,7 @@
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
-	interface IActivity
+	public interface IActivity
 	{
 		IActivity NextActivity { get; set; }
 		IActivity Tick( Actor self );

OpenRa.Game/Traits/Activities/Idle.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Idle : IActivity
 	{

OpenRa.Game/Traits/Activities/Infiltrate.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Infiltrate : IActivity
 	{

OpenRa.Game/Traits/Activities/Land.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Land : IActivity
 	{

OpenRa.Game/Traits/Activities/Move.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Move : IActivity
 	{

OpenRa.Game/Traits/Activities/Rearm.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Rearm : IActivity
 	{

OpenRa.Game/Traits/Activities/Repair.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Repair : IActivity
 	{

OpenRa.Game/Traits/Activities/ReturnToBase.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class ReturnToBase : IActivity
 	{

OpenRa.Game/Traits/Activities/Sell.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Sell : IActivity
 	{

OpenRa.Game/Traits/Activities/Steal.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Steal : IActivity
 	{

OpenRa.Game/Traits/Activities/Teleport.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Teleport : IActivity
 	{

OpenRa.Game/Traits/Activities/Turn.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class Turn : IActivity
 	{

OpenRa.Game/Traits/Activities/UndeployMcv.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class UndeployMcv : IActivity
 	{

OpenRa.Game/Traits/Activities/UnloadCargo.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits.Activities
+namespace OpenRa.Traits.Activities
 {
 	class UnloadCargo : IActivity
 	{

OpenRa.Game/Traits/AttackBase.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using IjwFramework.Types;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AttackBaseInfo : ITraitInfo
 	{

OpenRa.Game/Traits/AttackFrontal.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	abstract class AttackFrontal : AttackBase
 	{

OpenRa.Game/Traits/AttackHeli.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AttackHeliInfo : AttackBaseInfo
 	{

OpenRa.Game/Traits/AttackInfo.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AttackInfo
 	{

OpenRa.Game/Traits/AttackPlane.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AttackPlaneInfo : AttackBaseInfo
 	{

OpenRa.Game/Traits/AttackTurreted.cs

@@ -1,7 +1,7 @@
 using System;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AttackTurretedInfo : AttackBaseInfo
 	{

OpenRa.Game/Traits/AutoHeal.cs

@@ -1,7 +1,7 @@
 using System.Linq;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AutoHealInfo : StatelessTraitInfo<AutoHeal> { }
 

OpenRa.Game/Traits/AutoTarget.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class AutoTargetInfo : StatelessTraitInfo<AutoTarget> { }
 

OpenRa.Game/Traits/BelowUnits.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class BelowUnitsInfo : StatelessTraitInfo<BelowUnits> { }
 

OpenRa.Game/Traits/Buildable.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class BuildableInfo : StatelessTraitInfo<Buildable>
 	{

OpenRa.Game/Traits/Building.cs

@@ -1,15 +1,11 @@
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits.Activities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.Effects;
-using OpenRa.Game.Graphics;
+using System;
+using OpenRa.Effects;
+using OpenRa.GameRules;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
-	class OwnedActorInfo
+	public class OwnedActorInfo
 	{
 		public readonly int HP = 0;
 		public readonly ArmorType Armor = ArmorType.none;
@@ -18,7 +14,7 @@ namespace OpenRa.Game.Traits
 		public readonly bool WaterBound = false;
 	}
 
-	class BuildingInfo : OwnedActorInfo, ITraitInfo
+	public class BuildingInfo : OwnedActorInfo, ITraitInfo
 	{
 		public readonly int Power = 0;
 		public readonly bool RequiresPower = false;

OpenRa.Game/Traits/C4Demolition.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class C4DemolitionInfo : StatelessTraitInfo<C4Demolition> { }
 

OpenRa.Game/Traits/Cargo.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.GameRules;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class CargoInfo : ITraitInfo
 	{

OpenRa.Game/Traits/ChronoshiftDeploy.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ChronoshiftDeployInfo : ITraitInfo
 	{

OpenRa.Game/Traits/ChronoshiftPaletteEffect.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { }
 

OpenRa.Game/Traits/Chronoshiftable.cs

@@ -1,9 +1,9 @@
-using OpenRa.Game.Traits;
-using OpenRa.Game.Orders;
+using OpenRa.Traits;
+using OpenRa.Orders;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ChronoshiftableInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Chronosphere.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ChronosphereInfo : StatelessTraitInfo<Chronosphere> { }
 

OpenRa.Game/Traits/Cloak.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class CloakInfo : ITraitInfo
 	{

OpenRa.Game/Traits/ConstructionYard.cs

@@ -1,7 +1,7 @@
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.GameRules;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ConstructionYardInfo : ITraitInfo
 	{

OpenRa.Game/Traits/DemoTruck.cs

@@ -1,10 +1,10 @@
-using OpenRa.Game.Effects;
-using OpenRa.Game.Traits;
+using OpenRa.Effects;
+using OpenRa.Traits;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Orders;
+using OpenRa.Orders;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class DemoTruckInfo : ITraitInfo
 	{

OpenRa.Game/Traits/EngineerCapture.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class EngineerCaptureInfo : StatelessTraitInfo<EngineerCapture> { }
 

OpenRa.Game/Traits/Explodes.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ExplodesInfo : StatelessTraitInfo<Explodes> { }
 

OpenRa.Game/Traits/Fake.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class FakeInfo : StatelessTraitInfo<Fake> { }
 

OpenRa.Game/Traits/GeneratesGap.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRa.FileFormats;
-using OpenRa.Game.Support;
-using OpenRa.Game.Traits;
+using OpenRa.Support;
+using OpenRa.Traits;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class GeneratesGapInfo : ITraitInfo
 	{

OpenRa.Game/Traits/GpsLaunchSite.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class GpsLaunchSiteInfo : StatelessTraitInfo<GpsLaunchSite> { }
 	class GpsLaunchSite { }

OpenRa.Game/Traits/Harvester.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class HarvesterInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Helicopter.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.GameRules;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class HelicopterInfo : ITraitInfo
 	{

OpenRa.Game/Traits/InvisibleToOthers.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class InvisibleToOthersInfo : StatelessTraitInfo<InvisibleToOthers> { }
 

OpenRa.Game/Traits/IronCurtain.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class IronCurtainInfo : StatelessTraitInfo<IronCurtain> { }
 

OpenRa.Game/Traits/IronCurtainable.cs

@@ -1,7 +1,7 @@
 using System.Linq;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class IronCurtainableInfo : ITraitInfo
 	{

OpenRa.Game/Traits/LightPaletteRotator.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class LightPaletteRotatorInfo : StatelessTraitInfo<LightPaletteRotator> { }
 	class LightPaletteRotator : ITick, IPaletteModifier

OpenRa.Game/Traits/LimitedAmmo.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class LimitedAmmoInfo : ITraitInfo
 	{
@@ -9,7 +9,7 @@ namespace OpenRa.Game.Traits
 		public object Create(Actor self) { return new LimitedAmmo(self); }
 	}
 
-	class LimitedAmmo : INotifyAttack, IPips
+	public class LimitedAmmo : INotifyAttack, IPips
 	{
 		[Sync]
 		int ammo;

OpenRa.Game/Traits/McvDeploy.cs

@@ -1,7 +1,7 @@
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.GameRules;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class McvDeployInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Mine.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class MineInfo : ITraitInfo
 	{

OpenRa.Game/Traits/MineImmune.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class MineImmuneInfo : StatelessTraitInfo<MineImmune> { }
 	class MineImmune { }

OpenRa.Game/Traits/Minelayer.cs

@@ -1,48 +1,5 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
-	class MinelayerInfo : ITraitInfo
-	{
-		public readonly string Mine = "minv";
-
-		public object Create( Actor self )
-		{
-			return new Minelayer();
-		}
-	}
-
-	class Minelayer : IIssueOrder, IResolveOrder
-	{
-		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
-		{
-			var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
-			if (limitedAmmo != null && !limitedAmmo.HasAmmo())
-				return null;
-
-			// Ensure that the cell is empty except for the minelayer
-			if (Game.UnitInfluence.GetUnitsAt(xy).Any(a => a != self))
-				return null;
-
-			if (mi.Button == MouseButton.Right && underCursor == self)
-				return new Order("Deploy", self, null, int2.Zero, null);
-
-			return null;
-		}
-
-		public void ResolveOrder(Actor self, Order order)
-		{
-			if (order.OrderString == "Deploy")
-			{
-				var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
-				if (limitedAmmo != null)
-					limitedAmmo.Attacking(self);
-
-				// todo: delay a bit? (req making deploy-mine an activity)
-
-				Game.world.AddFrameEndTask(
-					w => w.Add(new Actor(self.Info.Traits.Get<MinelayerInfo>().Mine, self.Location, self.Owner)));
-			}
-		}
-	}
 }

OpenRa.Game/Traits/Mobile.cs

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

OpenRa.Game/Traits/Passenger.cs

@@ -1,7 +1,7 @@
 using System.Linq;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class PassengerInfo : StatelessTraitInfo<Passenger> {}
 

OpenRa.Game/Traits/Plane.cs

@@ -1,7 +1,7 @@
 using System;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class PlaneInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Production.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ProductionInfo : ITraitInfo
 	{

OpenRa.Game/Traits/ProductionQueue.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using IjwFramework.Collections;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ProductionQueueInfo : ITraitInfo
 	{

OpenRa.Game/Traits/ProductionSurround.cs

@@ -1,7 +1,7 @@
 using System.Linq;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ProductionSurroundInfo : ITraitInfo
 	{

OpenRa.Game/Traits/ProvidesRadar.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ProvidesRadarInfo : StatelessTraitInfo<ProvidesRadar> {}
 

OpenRa.Game/Traits/RallyPoint.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using OpenRa.Game.Graphics;
-using OpenRa.Game.Orders;
+using OpenRa.Graphics;
+using OpenRa.Orders;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RallyPointInfo : ITraitInfo
 	{

OpenRa.Game/Traits/RenderBuilding.cs

@@ -1,7 +1,7 @@
 using System;
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderBuildingInfo : RenderSimpleInfo
 	{

OpenRa.Game/Traits/RenderBuildingCharge.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderBuildingChargeInfo : RenderBuildingInfo
 	{

OpenRa.Game/Traits/RenderBuildingOre.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderBuildingOreInfo : RenderBuildingInfo
 	{

OpenRa.Game/Traits/RenderBuildingTurreted.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderBuildingTurretedInfo : RenderBuildingInfo
 	{

OpenRa.Game/Traits/RenderBuildingWarFactory.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderWarFactoryInfo : ITraitInfo
 	{

OpenRa.Game/Traits/RenderInfantry.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Effects;
+using OpenRa.Effects;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderInfantryInfo : RenderSimpleInfo
 	{

OpenRa.Game/Traits/RenderSimple.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	abstract class RenderSimpleInfo : ITraitInfo
 	{

OpenRa.Game/Traits/RenderSpy.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderSpyInfo : RenderInfantryInfo
 	{

OpenRa.Game/Traits/RenderUnit.cs

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

OpenRa.Game/Traits/RenderUnitMuzzleFlash.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderUnitMuzzleFlashInfo : RenderUnitInfo
 	{

OpenRa.Game/Traits/RenderUnitReload.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderUnitReloadInfo : RenderUnitInfo
 	{

OpenRa.Game/Traits/RenderUnitRotor.cs

@@ -1,6 +1,6 @@
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderUnitRotorInfo : RenderUnitInfo
 	{

OpenRa.Game/Traits/RenderUnitSpinner.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderUnitSpinnerInfo : RenderUnitInfo
 	{

OpenRa.Game/Traits/RenderUnitTurreted.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RenderUnitTurretedInfo : RenderUnitInfo
 	{

OpenRa.Game/Traits/Repairable.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class RepairableInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Reservable.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ReservableInfo : ITraitInfo
 	{

OpenRa.Game/Traits/SeedsOre.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class SeedsOreInfo : StatelessTraitInfo<SeedsOre> {}
 

OpenRa.Game/Traits/Selectable.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class SelectableInfo : StatelessTraitInfo<Selectable>
 	{

OpenRa.Game/Traits/SelfHealing.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.GameRules;
+using OpenRa.GameRules;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class SelfHealingInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Spy.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class SpyInfo : StatelessTraitInfo<Spy> { }
 

OpenRa.Game/Traits/SquishByTank.cs

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

OpenRa.Game/Traits/StoresOre.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System;
-using OpenRa.Game.GameRules;
-namespace OpenRa.Game.Traits
+using OpenRa.GameRules;
+namespace OpenRa.Traits
 {
 	class StoresOreInfo : StatelessTraitInfo<StoresOre>
 	{

OpenRa.Game/Traits/Submarine.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Game.Graphics;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class SubmarineInfo : ITraitInfo
 	{

OpenRa.Game/Traits/TakeCover.cs

@@ -1,5 +1,5 @@
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class TakeCoverInfo : ITraitInfo
 	{

OpenRa.Game/Traits/Thief.cs

@@ -1,7 +1,7 @@
-using OpenRa.Game.Traits.Activities;
+using OpenRa.Traits.Activities;
 using System.Collections.Generic;
 using System.Linq;
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
 	class ThiefInfo : StatelessTraitInfo<Thief> { }
 

OpenRa.Game/Traits/TraitsInterfaces.cs

@@ -1,21 +1,21 @@
 using System.Collections.Generic;
 using System.Drawing;
 using IjwFramework.Types;
-using OpenRa.Game.GameRules;
-using OpenRa.Game.Graphics;
+using OpenRa.GameRules;
+using OpenRa.Graphics;
 
-namespace OpenRa.Game.Traits
+namespace OpenRa.Traits
 {
-	enum DamageState { Normal, Half, Dead };
+	public enum DamageState { Normal, Half, Dead };
 	
 	// depends on the order of pips in WorldRenderer.cs!
-	enum PipType { Transparent, Green, Yellow, Red, Gray };
-	enum TagType { None, Fake, Primary };
+	public enum PipType { Transparent, Green, Yellow, Red, Gray };
+	public enum TagType { None, Fake, Primary };
 
-	interface ITick { void Tick(Actor self); }
-	interface IRender { IEnumerable<Renderable> Render(Actor self); }
-	interface IIssueOrder { Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor ); }
-	interface IResolveOrder { void ResolveOrder( Actor self, Order order ); }
+	public interface ITick { void Tick(Actor self); }
+	public interface IRender { IEnumerable<Renderable> Render(Actor self); }
+	public interface IIssueOrder { Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor ); }
+	public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
 
 	interface INotifySold { void Sold(Actor self); }
 	interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
@@ -30,7 +30,7 @@ namespace OpenRa.Game.Traits
 		bool Produce( Actor self, NewUnitInfo producee );
 		void SetPrimaryProducer(Actor self, bool isPrimary);
 	}
-	interface IOccupySpace { IEnumerable<int2> OccupiedCells(); }
+	public interface IOccupySpace { IEnumerable<int2> OccupiedCells(); }
 	interface INotifyAttack { void Attacking(Actor self); }
 	interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
 	interface IDamageModifier { float GetDamageModifier(); }
@@ -50,7 +50,7 @@ namespace OpenRa.Game.Traits
 		bool IsCrushableBy(UnitMovementType umt, Player player);
 		bool IsPathableCrush(UnitMovementType umt, Player player);
 	}
-	struct Renderable
+	public struct Renderable
 	{
 		public readonly Sprite Sprite;
 		public readonly float2 Pos;
@@ -73,7 +73,7 @@ namespace OpenRa.Game.Traits
 		public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, ZOffset); }
 	}
 
-	interface ITraitInfo { object Create(Actor self); }
+	public interface ITraitInfo { object Create(Actor self); }
 
 	class StatelessTraitInfo<T> : ITraitInfo
 		where T : new()