Switch to package.el