KAZOO-PHP-SDK-001: refactor almost done