kcp 0.23 - Begin of refactoring