Hacky lookup of cursor kinds
Reorganize package into lib and executable components