diff --git a/.gitmodules b/.gitmodules
index 949c10b0e..18cea0397 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "templates"]
-	path = templates
+	path = data/templates
 	url = git://github.com/jgm/pandoc-templates.git
diff --git a/default.csl b/data/default.csl
similarity index 100%
rename from default.csl
rename to data/default.csl
diff --git a/dzslides/template.html b/data/dzslides/template.html
similarity index 100%
rename from dzslides/template.html
rename to data/dzslides/template.html
diff --git a/epub.css b/data/epub.css
similarity index 100%
rename from epub.css
rename to data/epub.css
diff --git a/reference.docx b/data/reference.docx
similarity index 100%
rename from reference.docx
rename to data/reference.docx
diff --git a/reference.odt b/data/reference.odt
similarity index 100%
rename from reference.odt
rename to data/reference.odt
diff --git a/s5/default/blank.gif b/data/s5/default/blank.gif
similarity index 100%
rename from s5/default/blank.gif
rename to data/s5/default/blank.gif
diff --git a/s5/default/bodybg.gif b/data/s5/default/bodybg.gif
similarity index 100%
rename from s5/default/bodybg.gif
rename to data/s5/default/bodybg.gif
diff --git a/s5/default/framing.css b/data/s5/default/framing.css
similarity index 100%
rename from s5/default/framing.css
rename to data/s5/default/framing.css
diff --git a/s5/default/iepngfix.htc b/data/s5/default/iepngfix.htc
similarity index 100%
rename from s5/default/iepngfix.htc
rename to data/s5/default/iepngfix.htc
diff --git a/s5/default/opera.css b/data/s5/default/opera.css
similarity index 100%
rename from s5/default/opera.css
rename to data/s5/default/opera.css
diff --git a/s5/default/outline.css b/data/s5/default/outline.css
similarity index 100%
rename from s5/default/outline.css
rename to data/s5/default/outline.css
diff --git a/s5/default/pretty.css b/data/s5/default/pretty.css
similarity index 100%
rename from s5/default/pretty.css
rename to data/s5/default/pretty.css
diff --git a/s5/default/print.css b/data/s5/default/print.css
similarity index 100%
rename from s5/default/print.css
rename to data/s5/default/print.css
diff --git a/s5/default/s5-core.css b/data/s5/default/s5-core.css
similarity index 100%
rename from s5/default/s5-core.css
rename to data/s5/default/s5-core.css
diff --git a/s5/default/slides.css b/data/s5/default/slides.css
similarity index 100%
rename from s5/default/slides.css
rename to data/s5/default/slides.css
diff --git a/s5/default/slides.js b/data/s5/default/slides.js
similarity index 100%
rename from s5/default/slides.js
rename to data/s5/default/slides.js
diff --git a/slideous/slideous.css b/data/slideous/slideous.css
similarity index 100%
rename from slideous/slideous.css
rename to data/slideous/slideous.css
diff --git a/slideous/slideous.js b/data/slideous/slideous.js
similarity index 100%
rename from slideous/slideous.js
rename to data/slideous/slideous.js
diff --git a/slidy/graphics/fold-dim.gif b/data/slidy/graphics/fold-dim.gif
similarity index 100%
rename from slidy/graphics/fold-dim.gif
rename to data/slidy/graphics/fold-dim.gif
diff --git a/slidy/graphics/fold.gif b/data/slidy/graphics/fold.gif
similarity index 100%
rename from slidy/graphics/fold.gif
rename to data/slidy/graphics/fold.gif
diff --git a/slidy/graphics/nofold-dim.gif b/data/slidy/graphics/nofold-dim.gif
similarity index 100%
rename from slidy/graphics/nofold-dim.gif
rename to data/slidy/graphics/nofold-dim.gif
diff --git a/slidy/graphics/unfold-dim.gif b/data/slidy/graphics/unfold-dim.gif
similarity index 100%
rename from slidy/graphics/unfold-dim.gif
rename to data/slidy/graphics/unfold-dim.gif
diff --git a/slidy/graphics/unfold.gif b/data/slidy/graphics/unfold.gif
similarity index 100%
rename from slidy/graphics/unfold.gif
rename to data/slidy/graphics/unfold.gif
diff --git a/slidy/scripts/slidy.js.gz b/data/slidy/scripts/slidy.js.gz
similarity index 100%
rename from slidy/scripts/slidy.js.gz
rename to data/slidy/scripts/slidy.js.gz
diff --git a/slidy/styles/slidy.css b/data/slidy/styles/slidy.css
similarity index 100%
rename from slidy/styles/slidy.css
rename to data/slidy/styles/slidy.css
diff --git a/templates b/data/templates
similarity index 100%
rename from templates
rename to data/templates
diff --git a/pandoc.cabal b/pandoc.cabal
index 8b40344cf..5fb4a01a5 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -38,54 +38,58 @@ Description:     Pandoc is a Haskell library for converting from one markup
                  only adding a reader or writer.
 Data-Files:
                  -- templates
-                 templates/default.html, templates/default.html5,
-                 templates/default.docbook, templates/default.beamer,
-                 templates/default.opendocument, templates/default.latex,
-                 templates/default.context, templates/default.texinfo,
-                 templates/default.man, templates/default.markdown,
-                 templates/default.rst, templates/default.plain,
-                 templates/default.mediawiki, templates/default.rtf,
-                 templates/default.s5, templates/default.slidy,
-                 templates/default.slideous,
-                 templates/default.dzslides, templates/default.asciidoc,
-                 templates/default.textile, templates/default.org,
-                 templates/default.epub, templates/default.epub3,
+                 data/templates/default.html, data/templates/default.html5,
+                 data/templates/default.docbook, data/templates/default.beamer,
+                 data/templates/default.opendocument,
+		 data/templates/default.latex,
+                 data/templates/default.context,
+		 data/templates/default.texinfo,
+                 data/templates/default.man,
+		 data/templates/default.markdown,
+                 data/templates/default.rst, data/templates/default.plain,
+                 data/templates/default.mediawiki, data/templates/default.rtf,
+                 data/templates/default.s5, data/templates/default.slidy,
+                 data/templates/default.slideous,
+                 data/templates/default.dzslides,
+		 data/templates/default.asciidoc,
+                 data/templates/default.textile, data/templates/default.org,
+                 data/templates/default.epub, data/templates/default.epub3,
                  -- data for ODT writer
-                 reference.odt,
+                 data/reference.odt,
                  -- data for docx writer
-                 reference.docx,
+                 data/reference.docx,
                  -- stylesheet for EPUB writer
-                 epub.css,
+                 data/epub.css,
                  -- data for LaTeXMathML writer
                  data/LaTeXMathML.js,
                  data/MathMLinHTML.js,
                  -- data for S5 writer
-                 s5/default/slides.js,
-                 s5/default/s5-core.css,
-                 s5/default/framing.css,
-                 s5/default/pretty.css,
-                 s5/default/opera.css,
-                 s5/default/outline.css,
-                 s5/default/print.css,
-                 s5/default/slides.css,
-                 s5/default/iepngfix.htc,
-                 s5/default/blank.gif,
-                 s5/default/bodybg.gif,
+                 data/s5/default/slides.js,
+                 data/s5/default/s5-core.css,
+                 data/s5/default/framing.css,
+                 data/s5/default/pretty.css,
+                 data/s5/default/opera.css,
+                 data/s5/default/outline.css,
+                 data/s5/default/print.css,
+                 data/s5/default/slides.css,
+                 data/s5/default/iepngfix.htc,
+                 data/s5/default/blank.gif,
+                 data/s5/default/bodybg.gif,
                  -- data for slidy writer
-                 slidy/styles/slidy.css,
-                 slidy/scripts/slidy.js.gz,
-                 slidy/graphics/fold.gif,
-                 slidy/graphics/unfold.gif,
-                 slidy/graphics/nofold-dim.gif,
-                 slidy/graphics/unfold-dim.gif,
-                 slidy/graphics/fold-dim.gif,
+                 data/slidy/styles/slidy.css,
+                 data/slidy/scripts/slidy.js.gz,
+                 data/slidy/graphics/fold.gif,
+                 data/slidy/graphics/unfold.gif,
+                 data/slidy/graphics/nofold-dim.gif,
+                 data/slidy/graphics/unfold-dim.gif,
+                 data/slidy/graphics/fold-dim.gif,
                  -- data for slideous writer
-                 slideous/slideous.css,
-                 slideous/slideous.js,
+                 data/slideous/slideous.css,
+                 data/slideous/slideous.js,
                  -- data for dzslides writer
-                 dzslides/template.html,
+                 data/dzslides/template.html,
                  -- data for citeproc
-                 default.csl,
+                 data/default.csl,
                  -- documentation
                  README, INSTALL, COPYRIGHT, BUGS, changelog
 Extra-Source-Files: