Upgrade to latest ECS module.
Extract movement2d.
Extract gameLoop().