Split things into separate files a bit more

Also fix up some of the hotkeys to make them work more vim-like.