refactor: kirra-client
refactor: kirra-client, automated tests
further refactor, more tests
further refactor, more tests
finished refactor, more tests