I can’t see anything more modular than separating the animation system from the control and the pawn.