--- a/templates/map-rss
+++ b/templates/map-rss
@@ -1,8 +1,8 @@
 default = 'changelog'
-header = header-rss.tmpl
-changelog = changelog-rss.tmpl
-changelogentry = changelogentry-rss.tmpl
-filelog = filelog-rss.tmpl
-filelogentry = filelogentry-rss.tmpl
-tags = tags-rss.tmpl
-tagentry = tagentry-rss.tmpl
+header = rss/header.tmpl
+changelog = rss/changelog.tmpl
+changelogentry = rss/changelogentry.tmpl
+filelog = rss/filelog.tmpl
+filelogentry = rss/filelogentry.tmpl
+tags = rss/tags.tmpl
+tagentry = rss/tagentry.tmpl

rename from templates/changelog-rss.tmpl
rename to templates/rss/changelog.tmpl

rename from templates/changelogentry-rss.tmpl
rename to templates/rss/changelogentry.tmpl

rename from templates/filelog-rss.tmpl
rename to templates/rss/filelog.tmpl

rename from templates/filelogentry-rss.tmpl
rename to templates/rss/filelogentry.tmpl

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

rename from templates/tagentry-rss.tmpl
rename to templates/rss/tagentry.tmpl

rename from templates/tags-rss.tmpl
rename to templates/rss/tags.tmpl