Added Combat and renamed Type to UnitType
Misc. reorganization needed for Combat