Client engine functionality breakout. Refactor headers.