Revert to package.el
Add irony