diff --git a/Makefile b/Makefile
index 677b3e7..64a0f93 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,19 @@
 .DEFAULT_GOAL := default
 
+default: all
 all: cv résumé pubs
 
-#default: cv résumé
-
 ## Build CV
-cv:	Paul_Lesur_CV.pdf
+cv:	build/Paul_Lesur_CV.pdf
 	
 ## Build résumé
-resume:	Paul_Lesur_résumé.pdf
+résumé:	build/Paul_Lesur_résumé.pdf
 	
 ## Build publication list
-pubs: Paul_Lesur_publications.pdf
+pubs: build/Paul_Lesur_publications.pdf
 
-%.pdf: %.tex
-	xelatex $*
-	biber $*
-	xelatex $*
+build/%.pdf: %.tex ./common/*
+	latexmk -xelatex -verbose -file-line-error -synctex=1 $*
 
 ## Cleanup build files
 clean:
diff --git a/Paul_Lesur_CV.tex b/Paul_Lesur_CV.tex
index 2df178e..32e3e94 100644
--- a/Paul_Lesur_CV.tex
+++ b/Paul_Lesur_CV.tex
@@ -1,9 +1,9 @@
 %! Tex program = xelatex
-\documentclass[hidelinks]{./template/friggeri-cv-a4}
-\input{preamble.tex}
+\documentclass[hidelinks]{template/friggeri-cv-a4}
+\input{common/preamble.tex}
 
 \begin{document}
-\input{./content/résumé.tex}
+\input{common/résumé.tex}
 
 \section{Publications / articles}
 
diff --git a/Paul_Lesur_publications.tex b/Paul_Lesur_publications.tex
index ca36036..faa2f03 100644
--- a/Paul_Lesur_publications.tex
+++ b/Paul_Lesur_publications.tex
@@ -1,67 +1,9 @@
 %! Tex program = xelatex
-
-%\documentclass{article}
-%
-%%\usepackage[backend=biber]{biblatex}
-%\usepackage[backend=biber, sorting=nymdt]{biblatex}  %backend=biber is 'better'  
-%\addbibresource{bibliography.bib} % Specify the bibliography file to include publications
-%
-%
-%\DeclareSortingTemplate{nymdt}{
-%  \sort{
-%    \field{presort}
-%  }
-%  \sort[direction=descending]{
-%    \field{sortyear}
-%    \field{year}
-%    \literal{9999}
-%  }
-%  \sort[direction=descending]{
-%    \field[padside=left,padwidth=2,padchar=0]{month}
-%    \literal{99}
-%  }
-%  \sort[direction=descending]{
-%    \field[padside=left,padwidth=2,padchar=0]{day}
-%    \literal{99}
-%  }
-%  \sort{
-%    \field{sorttitle}
-%  }
-%  \sort[direction=descending]{
-%    \field[padside=left,padwidth=4,padchar=0]{volume}
-%    \literal{9999}
-%  }
-%}
-%
-%\defbibfilter{papers}{
-%  type=article or
-%  type=inproceedings
-%}
-%
-%\begin{document}
-%%\printbibsectionnoheader{inproceedings}{}
-%%\printbibsectionnoheader{article}{} % Print all articles from the bibliography
-%\DeclareFieldFormat{labelnumberwidth}{\mkbibbold{#1\adddot}~}
-%\setlength{\biblabelsep}{0pt}
-%\section*{Paul Lesur}
-%\subsection*{Publications}
-%%\bibliographystyle{unsrt}
-%  \begin{refsection}
-%    \nocite{*}
-%      %\printbibliography[type = inproceedings le, heading = none, title = {Peer-reviewed conferences/proceedings}]
-%      %\printbibliography[type = inproceedings, heading = none, title = {Peer-reviewed conferences/proceedings}]
-%      \printbibliography[filter = papers, heading = none]
-%      %\printbibliography[type = {article}, heading = none, title = {article in peer-reviewed journal}]
-%  \end{refsection}
-%\printbibliography
-%\end{document}
-
-
-\documentclass[hidelinks]{./template/friggeri-cv-a4}
-\input{preamble.tex}
+\documentclass[hidelinks]{template/friggeri-cv-a4}
+\input{common/preamble.tex}
 
 \begin{document}
-%\section{Publications / articles}
+\section{Publications}
 
 \printbibsectionnoheader{inproceedings}{Peer-reviewed conferences/proceedings}
 \printbibsectionnoheader{article}{article in peer-reviewed journal} % Print all articles from the bibliography
diff --git a/Paul_Lesur_résumé.tex b/Paul_Lesur_résumé.tex
index 422c03f..271504c 100644
--- a/Paul_Lesur_résumé.tex
+++ b/Paul_Lesur_résumé.tex
@@ -1,8 +1,8 @@
 %! Tex program = xelatex
-\documentclass[hidelinks]{friggeri-cv-a4}
-\input{preamble.tex}
+\documentclass[hidelinks]{template/friggeri-cv-a4}
+\input{common/preamble.tex}
 
 \begin{document}
-\input{./content/résumé.tex}
+\input{common/résumé.tex}
 \end{document}
 
diff --git a/build/Paul_Lesur_CV.synctex.gz b/build/Paul_Lesur_CV.synctex.gz
new file mode 100644
index 0000000..4c3dfc3
Binary files /dev/null and b/build/Paul_Lesur_CV.synctex.gz differ
diff --git a/build/Paul_Lesur_publications.synctex.gz b/build/Paul_Lesur_publications.synctex.gz
new file mode 100644
index 0000000..5735d93
Binary files /dev/null and b/build/Paul_Lesur_publications.synctex.gz differ
diff --git a/build/Paul_Lesur_résumé.synctex.gz b/build/Paul_Lesur_résumé.synctex.gz
new file mode 100644
index 0000000..94797e6
Binary files /dev/null and b/build/Paul_Lesur_résumé.synctex.gz differ
diff --git a/bibliography.bib b/common/bibliography.bib
similarity index 100%
rename from bibliography.bib
rename to common/bibliography.bib
diff --git a/preamble.tex b/common/preamble.tex
similarity index 68%
rename from preamble.tex
rename to common/preamble.tex
index a9de846..3e3a9d8 100644
--- a/preamble.tex
+++ b/common/preamble.tex
@@ -1,5 +1,5 @@
 \usepackage[backend=biber]{biblatex}
-\addbibresource{bibliography.bib} % Specify the bibliography file to include publications
+\addbibresource{common/bibliography.bib} % Specify the bibliography file to include publications
 
 \definecolor{darkgreen}{HTML}{036E03}
 \definecolor{lightgreen}{HTML}{50D050}
diff --git a/content/résumé.tex b/common/résumé.tex
similarity index 100%
rename from content/résumé.tex
rename to common/résumé.tex