Clean up of elisp files, and more dependency to package.el