diff --git a/templates/map b/templates/map-old
copy from templates/map
copy to templates/map-old
--- a/templates/map
+++ b/templates/map-old
@@ -1,27 +1,27 @@
 default = 'changelog'
-header = header.tmpl
+header = old/header.tmpl
 footer = footer.tmpl
-search = search.tmpl
-changelog = changelog.tmpl
-shortlog = shortlog.tmpl
-shortlogentry = shortlogentry.tmpl
+search = old/search.tmpl
+changelog = old/changelog.tmpl
+shortlog = old/shortlog.tmpl
+shortlogentry = old/shortlogentry.tmpl
 naventry = '<a href="?cl=#rev#">#label|escape#</a> '
 navshortentry = '<a href="?sl=#rev#">#label|escape#</a> '
 filedifflink = '<a href="?fd=#node|short#;file=#file|urlescape#">#file|escape#</a> '
 filenodelink = '<a href="?f=#node|short#;file=#file|urlescape#">#file|escape#</a> '
 fileellipses = '...'
-changelogentry = changelogentry.tmpl
-searchentry = changelogentry.tmpl
-changeset = changeset.tmpl
-manifest = manifest.tmpl
+changelogentry = old/changelogentry.tmpl
+searchentry = old/changelogentry.tmpl
+changeset = old/changeset.tmpl
+manifest = old/manifest.tmpl
 manifestdirentry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td><a href="?mf=#node|short#;path=#path|urlescape#">#basename|escape#/</a>'
 manifestfileentry = '<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td><a href="?f=#node|short#;file=#file|urlescape#">#basename|escape#</a>'
-filerevision = filerevision.tmpl
-fileannotate = fileannotate.tmpl
-filediff = filediff.tmpl
-filelog = filelog.tmpl
+filerevision = old/filerevision.tmpl
+fileannotate = old/fileannotate.tmpl
+filediff = old/filediff.tmpl
+filelog = old/filelog.tmpl
 fileline = '<div class="parity#parity#"><span class="lineno">#linenumber#</span>#line|escape#</div>'
-filelogentry = filelogentry.tmpl
+filelogentry = old/filelogentry.tmpl
 annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="?fa=#node|short#;file=#file|urlescape#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>'
 difflineplus = '<span class="plusline">#line|escape#</span>'
 difflineminus = '<span class="minusline">#line|escape#</span>'
diff --git a/templates/changelog.tmpl b/templates/old/changelog.tmpl
copy from templates/changelog.tmpl
copy to templates/old/changelog.tmpl
diff --git a/templates/changelogentry.tmpl b/templates/old/changelogentry.tmpl
copy from templates/changelogentry.tmpl
copy to templates/old/changelogentry.tmpl
diff --git a/templates/changeset.tmpl b/templates/old/changeset.tmpl
copy from templates/changeset.tmpl
copy to templates/old/changeset.tmpl
diff --git a/templates/fileannotate.tmpl b/templates/old/fileannotate.tmpl
copy from templates/fileannotate.tmpl
copy to templates/old/fileannotate.tmpl
diff --git a/templates/filediff.tmpl b/templates/old/filediff.tmpl
copy from templates/filediff.tmpl
copy to templates/old/filediff.tmpl
diff --git a/templates/filelog.tmpl b/templates/old/filelog.tmpl
copy from templates/filelog.tmpl
copy to templates/old/filelog.tmpl
diff --git a/templates/filelogentry.tmpl b/templates/old/filelogentry.tmpl
copy from templates/filelogentry.tmpl
copy to templates/old/filelogentry.tmpl
diff --git a/templates/filerevision.tmpl b/templates/old/filerevision.tmpl
copy from templates/filerevision.tmpl
copy to templates/old/filerevision.tmpl
diff --git a/templates/header.tmpl b/templates/old/header.tmpl
copy from templates/header.tmpl
copy to templates/old/header.tmpl
diff --git a/templates/manifest.tmpl b/templates/old/manifest.tmpl
copy from templates/manifest.tmpl
copy to templates/old/manifest.tmpl
diff --git a/templates/search.tmpl b/templates/old/search.tmpl
copy from templates/search.tmpl
copy to templates/old/search.tmpl
diff --git a/templates/shortlog.tmpl b/templates/old/shortlog.tmpl
copy from templates/shortlog.tmpl
copy to templates/old/shortlog.tmpl
diff --git a/templates/shortlogentry.tmpl b/templates/old/shortlogentry.tmpl
copy from templates/shortlogentry.tmpl
copy to templates/old/shortlogentry.tmpl
diff --git a/templates/tags.tmpl b/templates/old/tags.tmpl
copy from templates/tags.tmpl
copy to templates/old/tags.tmpl