Merge reorganized LaTeX branch; still not perfect, but much better.