Also move type definitions into their own module
See https://sw.kovidgoyal.net/kitty/kittens/diff.html