[cannonBall] Improve structure.