Ignore emacs tmp files
Reorganise slightly toward the "correct" structure.