Removed the combat namespace and moved combat functionality to ActorBase...

... instead.