Switch to package.el!