diff --git a/patacrep/data/templates/songbook/layout.tex b/patacrep/data/templates/songbook/layout.tex
index ea048417..19817749 100644
--- a/patacrep/data/templates/songbook/layout.tex
+++ b/patacrep/data/templates/songbook/layout.tex
@@ -28,7 +28,7 @@
 \makeatletter
 \def\input@path{ %
     (* for dir in _datadir|iter_datadirs *)
-        {(( dir | path2posix ))/latex/} %
+        {(( dir | path2posix ))/templates/styles/} %
     (* endfor *)
 }
 \makeatother
diff --git a/patacrep/data/latex/chords.sty b/patacrep/data/templates/styles/chords.sty
similarity index 100%
rename from patacrep/data/latex/chords.sty
rename to patacrep/data/templates/styles/chords.sty
diff --git a/patacrep/data/latex/crepbook.sty b/patacrep/data/templates/styles/crepbook.sty
similarity index 100%
rename from patacrep/data/latex/crepbook.sty
rename to patacrep/data/templates/styles/crepbook.sty
diff --git a/patacrep/data/latex/patacrep.sty b/patacrep/data/templates/styles/patacrep.sty
similarity index 100%
rename from patacrep/data/latex/patacrep.sty
rename to patacrep/data/templates/styles/patacrep.sty
diff --git a/patacrep/data/latex/songs.sty b/patacrep/data/templates/styles/songs.sty
similarity index 100%
rename from patacrep/data/latex/songs.sty
rename to patacrep/data/templates/styles/songs.sty
diff --git a/patacrep/data/latex/tabs.sty b/patacrep/data/templates/styles/tabs.sty
similarity index 100%
rename from patacrep/data/latex/tabs.sty
rename to patacrep/data/templates/styles/tabs.sty
diff --git a/test/test_songbook/content.tex.control b/test/test_songbook/content.tex.control
index a431c2db..9fd7d242 100644
--- a/test/test_songbook/content.tex.control
+++ b/test/test_songbook/content.tex.control
@@ -13,9 +13,9 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/content_datadir/latex/} %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/content_datadir/templates/styles/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/datadir.tex.control b/test/test_songbook/datadir.tex.control
index 56bee48e..1154a6fd 100644
--- a/test/test_songbook/datadir.tex.control
+++ b/test/test_songbook/datadir.tex.control
@@ -13,10 +13,10 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/datadir_datadir/latex/} %
-        {@TEST_FOLDER@/datadir_datadir2/latex/} %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/datadir_datadir/templates/styles/} %
+        {@TEST_FOLDER@/datadir_datadir2/templates/styles/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/lang_default.tex.control b/test/test_songbook/lang_default.tex.control
index bf391414..42f1e087 100644
--- a/test/test_songbook/lang_default.tex.control
+++ b/test/test_songbook/lang_default.tex.control
@@ -13,8 +13,8 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/lang_en.tex.control b/test/test_songbook/lang_en.tex.control
index 55334d63..11a9f401 100644
--- a/test/test_songbook/lang_en.tex.control
+++ b/test/test_songbook/lang_en.tex.control
@@ -13,8 +13,8 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/lang_fr.tex.control b/test/test_songbook/lang_fr.tex.control
index 9760264c..1255dcce 100644
--- a/test/test_songbook/lang_fr.tex.control
+++ b/test/test_songbook/lang_fr.tex.control
@@ -13,8 +13,8 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/languages.tex.control b/test/test_songbook/languages.tex.control
index c8b8cfd2..46d888dc 100644
--- a/test/test_songbook/languages.tex.control
+++ b/test/test_songbook/languages.tex.control
@@ -13,9 +13,9 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/languages_datadir/latex/} %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/languages_datadir/templates/styles/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/onthefly/content.onthefly.tex.control b/test/test_songbook/onthefly/content.onthefly.tex.control
index a41446bd..8a882c85 100644
--- a/test/test_songbook/onthefly/content.onthefly.tex.control
+++ b/test/test_songbook/onthefly/content.onthefly.tex.control
@@ -13,8 +13,8 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/onthefly/../content_datadir/latex/} %
-        {@LOCAL_DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/onthefly/../content_datadir/templates/styles/} %
+        {@LOCAL_DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/syntax.tex.control b/test/test_songbook/syntax.tex.control
index e142867e..1c925801 100644
--- a/test/test_songbook/syntax.tex.control
+++ b/test/test_songbook/syntax.tex.control
@@ -13,9 +13,9 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/syntax_datadir/latex/} %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/syntax_datadir/templates/styles/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
 
diff --git a/test/test_songbook/unicode.tex.control b/test/test_songbook/unicode.tex.control
index 358938b6..7d088978 100644
--- a/test/test_songbook/unicode.tex.control
+++ b/test/test_songbook/unicode.tex.control
@@ -13,9 +13,9 @@
 
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/unicode_datadir/latex/} %
-        {@TEST_FOLDER@/latex/} %
-        {@DATA_FOLDER@/latex/} %
+        {@TEST_FOLDER@/unicode_datadir/templates/styles/} %
+        {@TEST_FOLDER@/templates/styles/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother