split emacs files; many other changes