diff --git a/Lato-Hairline.ttf b/fonts/Lato-Hairline.ttf
similarity index 100%
rename from Lato-Hairline.ttf
rename to fonts/Lato-Hairline.ttf
diff --git a/Lato-Light.ttf b/fonts/Lato-Light.ttf
similarity index 100%
rename from Lato-Light.ttf
rename to fonts/Lato-Light.ttf
diff --git a/texgyreheros-bold.otf b/fonts/texgyreheros-bold.otf
similarity index 100%
rename from texgyreheros-bold.otf
rename to fonts/texgyreheros-bold.otf
diff --git a/texgyreheros-bolditalic.otf b/fonts/texgyreheros-bolditalic.otf
similarity index 100%
rename from texgyreheros-bolditalic.otf
rename to fonts/texgyreheros-bolditalic.otf
diff --git a/texgyreheros-italic.otf b/fonts/texgyreheros-italic.otf
similarity index 100%
rename from texgyreheros-italic.otf
rename to fonts/texgyreheros-italic.otf
diff --git a/texgyreheros-regular.otf b/fonts/texgyreheros-regular.otf
similarity index 100%
rename from texgyreheros-regular.otf
rename to fonts/texgyreheros-regular.otf
diff --git a/friggeri-cv-a4.cls b/friggeri-cv-a4.cls
index 83c859f..3aa292f 100644
--- a/friggeri-cv-a4.cls
+++ b/friggeri-cv-a4.cls
@@ -67,26 +67,29 @@
 
 \RequirePackage[quiet]{fontspec}
 \RequirePackage{unicode-math}
+\defaultfontfeatures{Mapping=tex-text}
 
 \newfontfamily\bodyfont
-[BoldFont=texgyreheros-bold.otf,
-	ItalicFont=texgyreheros-italic.otf,
-	BoldItalicFont=texgyreheros-bolditalic.otf]
-{texgyreheros-regular.otf}
-\newfontfamily\thinfont[]{Lato-Light.ttf}
-\newfontfamily\headingfont[]{texgyreheros-bold.otf}
-
-\defaultfontfeatures{Mapping=tex-text}
-\setmainfont
-[Mapping=tex-text, Color=textcolor,
+[
+	Path=fonts/,
 	BoldFont=texgyreheros-bold.otf,
 	ItalicFont=texgyreheros-italic.otf,
 	BoldItalicFont=texgyreheros-bolditalic.otf
-]
-{texgyreheros-regular.otf}
+]{texgyreheros-regular.otf}
 
-\setmathfont{texgyreheros-regular.otf}
-%%%
+\newfontfamily\thinfont[Path=fonts/]{Lato-Light.ttf}
+\newfontfamily\headingfont[Path=fonts/]{texgyreheros-bold.otf}
+
+\setmainfont
+[
+	Path=fonts/,
+	Mapping=tex-text, Color=textcolor,
+	BoldFont=texgyreheros-bold.otf,
+	ItalicFont=texgyreheros-italic.otf,
+	BoldItalicFont=texgyreheros-bolditalic.otf
+]{texgyreheros-regular.otf}
+
+\setmathfont[Path=fonts/]{texgyreheros-regular.otf}
 
 %%%%%%%%%%
 % Header %