Awesome!
In regards to the removal of Organized, all we need are Champion Traits and Spells:
"Pathfinding" - Unit, and every unit stacked with it, treats all terrain types as roads (1/2 movement point) (but stack still has base movement points of slowest unit in group)
"Forced March" - All units in stack move at this unit's speed.
"Windwalking" - All units in stack move at this unit's speed and treat all terrain as 1 movement point.