Complete refactoring of LaTeX-dir
Fixed conflict