Moving to the emacs single-file package style, for simplicity.