--- a/templates/map-raw
+++ b/templates/map-raw
@@ -1,6 +1,6 @@
-header = header-raw.tmpl
+header = raw/header.tmpl
 footer = ''
-changeset = changeset-raw.tmpl
+changeset = raw/changeset.tmpl
 difflineplus = '#line#'
 difflineminus = '#line#'
 difflineat = '#line#'
@@ -11,6 +11,6 @@ filenodelink = ''
 filerevision = '#rawfileheader##raw#'
 fileline = '#line#'
 diffblock = '#lines#'
-filediff = filediff-raw.tmpl
-fileannotate = fileannotate-raw.tmpl
+filediff = raw/filediff.tmpl
+fileannotate = raw/fileannotate.tmpl
 annotateline = '#author#@#rev#: #line#'

rename from templates/changeset-raw.tmpl
rename to templates/raw/changeset.tmpl

rename from templates/fileannotate-raw.tmpl
rename to templates/raw/fileannotate.tmpl

rename from templates/filediff-raw.tmpl
rename to templates/raw/filediff.tmpl

rename from templates/header-raw.tmpl
rename to templates/raw/header.tmpl