diff --git a/patacrep/data/templates/default.tex b/patacrep/data/templates/songbook/default.tex
similarity index 100%
rename from patacrep/data/templates/default.tex
rename to patacrep/data/templates/songbook/default.tex
diff --git a/patacrep/data/templates/layout.tex b/patacrep/data/templates/songbook/layout.tex
similarity index 100%
rename from patacrep/data/templates/layout.tex
rename to patacrep/data/templates/songbook/layout.tex
diff --git a/patacrep/data/templates/patacrep.tex b/patacrep/data/templates/songbook/patacrep.tex
similarity index 100%
rename from patacrep/data/templates/patacrep.tex
rename to patacrep/data/templates/songbook/patacrep.tex
diff --git a/patacrep/data/templates/songs.tex b/patacrep/data/templates/songbook/songs.tex
similarity index 100%
rename from patacrep/data/templates/songs.tex
rename to patacrep/data/templates/songbook/songs.tex
diff --git a/patacrep/templates.py b/patacrep/templates.py
index 90509369..ca6740a1 100644
--- a/patacrep/templates.py
+++ b/patacrep/templates.py
@@ -137,7 +137,7 @@ class TexBookRenderer(Renderer):
         # Load templates in filesystem ...
         loaders = [
             FileSystemLoader(datadir)
-            for datadir in files.iter_datadirs(datadirs, 'templates')
+            for datadir in files.iter_datadirs(datadirs, 'templates', 'songbook')
             ]
         jinjaenv = Environment(
             loader=ChoiceLoader(loaders),