Reorganize elisp files