refactor KBA stuff to its own package