major elisp reorg for the first time in years! (procrastinate much?)