diff --git a/Shake.hs b/Shake.hs
index 1efde7230..734685432 100755
--- a/Shake.hs
+++ b/Shake.hs
@@ -76,8 +76,8 @@ pandocFiltersResolver = ""
 main = do
 
   pandocFilters <-
-    map ("tools" </>). nub . sort . map (-<.> "") . filter ("pandoc" `isPrefixOf`)
-    <$> S.getDirectoryContents "tools"
+    map ("doc" </>). nub . sort . map (-<.> "") . filter ("pandoc-" `isPrefixOf`)
+    <$> S.getDirectoryContents "doc"
 
   shakeArgs
     shakeOptions{
@@ -114,11 +114,11 @@ main = do
         tmpl = "doc/manpage.nroff"
       need $ md : tmpl : pandocFilters
       cmd pandocExe md "--to man -s --template" tmpl
-        "--filter tools/pandocRemoveHtmlBlocks"
-        "--filter tools/pandocRemoveHtmlInlines"
-        "--filter tools/pandocRemoveLinks"
-        "--filter tools/pandocRemoveNotes"
-        "--filter tools/pandocCapitalizeHeaders"
+        "--filter doc/pandoc-drop-html-blocks"
+        "--filter doc/pandoc-drop-html-inlines"
+        "--filter doc/pandoc-drop-links"
+        "--filter doc/pandoc-drop-notes"
+        "--filter doc/pandoc-capitalize-headers"
         "-o" out
 
     phony "webmanual" $ need manpageMdsForHakyll
@@ -130,7 +130,7 @@ main = do
         tmpl = "doc/manpage.html"
       need $ md : tmpl : pandocFilters
       cmd pandocExe md "--to markdown"
-        "--filter tools/pandocRemoveManonlyBlocks"
+        "--filter doc/pandoc-drop-man-blocks"
         "-o" out
 
     phony "pandocfilters" $ need pandocFilters
diff --git a/tools/pandocCapitalizeHeaders.hs b/doc/pandoc-capitalize-headers.hs
similarity index 100%
rename from tools/pandocCapitalizeHeaders.hs
rename to doc/pandoc-capitalize-headers.hs
diff --git a/doc/pandoc-drop-html-blocks.hs b/doc/pandoc-drop-html-blocks.hs
new file mode 100755
index 000000000..de0655944
--- /dev/null
+++ b/doc/pandoc-drop-html-blocks.hs
@@ -0,0 +1,11 @@
+#!/usr/bin/env stack
+{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
+
+import Text.Pandoc.JSON
+
+main :: IO ()
+main = toJSONFilter dropHtmlBlocks
+
+dropHtmlBlocks :: Block -> Block
+dropHtmlBlocks (RawBlock (Format "html") _) = Plain []
+dropHtmlBlocks x = x
diff --git a/doc/pandoc-drop-html-inlines.hs b/doc/pandoc-drop-html-inlines.hs
new file mode 100755
index 000000000..2e2ffabb2
--- /dev/null
+++ b/doc/pandoc-drop-html-inlines.hs
@@ -0,0 +1,12 @@
+#!/usr/bin/env stack
+{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
+
+import Text.Pandoc.JSON
+
+main :: IO ()
+main = toJSONFilter dropHtmlInlines
+
+dropHtmlInlines :: Inline -> Inline
+dropHtmlInlines (RawInline (Format "html") _) = Str ""
+dropHtmlInlines x = x
+
diff --git a/tools/pandocRemoveNotes.hs b/doc/pandoc-drop-links.hs
similarity index 53%
rename from tools/pandocRemoveNotes.hs
rename to doc/pandoc-drop-links.hs
index 36c8cc9c3..af35124f2 100755
--- a/tools/pandocRemoveNotes.hs
+++ b/doc/pandoc-drop-links.hs
@@ -4,9 +4,9 @@
 import Text.Pandoc.JSON
 
 main :: IO ()
-main = toJSONFilter removeNotes
+main = toJSONFilter dropLinks
 
-removeNotes :: Inline -> Inline
-removeNotes (Note _) = Str ""
-removeNotes x = x
+dropLinks :: Inline -> [Inline]
+dropLinks (Link _ is _) = is
+dropLinks x = [x]
 
diff --git a/doc/pandoc-drop-man-blocks.hs b/doc/pandoc-drop-man-blocks.hs
new file mode 100755
index 000000000..627565de3
--- /dev/null
+++ b/doc/pandoc-drop-man-blocks.hs
@@ -0,0 +1,12 @@
+#!/usr/bin/env stack
+{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
+
+import Text.Pandoc.Builder
+import Text.Pandoc.JSON
+
+main :: IO ()
+main = toJSONFilter dropManonlyBlocks
+
+dropManonlyBlocks :: Block -> Block
+dropManonlyBlocks (Div ("",["manonly"],[]) _) = Plain []
+dropManonlyBlocks x = x
diff --git a/tools/pandocRemoveLinks.hs b/doc/pandoc-drop-notes.hs
similarity index 52%
rename from tools/pandocRemoveLinks.hs
rename to doc/pandoc-drop-notes.hs
index 28551a11a..d085e5a79 100755
--- a/tools/pandocRemoveLinks.hs
+++ b/doc/pandoc-drop-notes.hs
@@ -4,9 +4,9 @@
 import Text.Pandoc.JSON
 
 main :: IO ()
-main = toJSONFilter removeLinks
+main = toJSONFilter dropNotes
 
-removeLinks :: Inline -> [Inline]
-removeLinks (Link _ is _) = is
-removeLinks x = [x]
+dropNotes :: Inline -> Inline
+dropNotes (Note _) = Str ""
+dropNotes x = x
 
diff --git a/doc/pandoc-drop-web-blocks.hs b/doc/pandoc-drop-web-blocks.hs
new file mode 100755
index 000000000..1356769e5
--- /dev/null
+++ b/doc/pandoc-drop-web-blocks.hs
@@ -0,0 +1,12 @@
+#!/usr/bin/env stack
+{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
+
+import Text.Pandoc.Builder
+import Text.Pandoc.JSON
+
+main :: IO ()
+main = toJSONFilter dropWebonlyBlocks
+
+dropWebonlyBlocks :: Block -> Block
+dropWebonlyBlocks (Div ("",["webonly"],[]) _) = Plain []
+dropWebonlyBlocks x = x
diff --git a/tools/pandocRemoveHtmlBlocks.hs b/tools/pandocRemoveHtmlBlocks.hs
deleted file mode 100755
index 8e9ccc630..000000000
--- a/tools/pandocRemoveHtmlBlocks.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env stack
-{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
-
-import Text.Pandoc.JSON
-
-main :: IO ()
-main = toJSONFilter removeHtmlBlocks
-
-removeHtmlBlocks :: Block -> Block
-removeHtmlBlocks (RawBlock (Format "html") _) = Plain []
-removeHtmlBlocks x = x
diff --git a/tools/pandocRemoveHtmlInlines.hs b/tools/pandocRemoveHtmlInlines.hs
deleted file mode 100755
index 6cb4f3538..000000000
--- a/tools/pandocRemoveHtmlInlines.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env stack
-{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
-
-import Text.Pandoc.JSON
-
-main :: IO ()
-main = toJSONFilter removeHtmlInlines
-
-removeHtmlInlines :: Inline -> Inline
-removeHtmlInlines (RawInline (Format "html") _) = Str ""
-removeHtmlInlines x = x
-
diff --git a/tools/pandocRemoveManonlyBlocks.hs b/tools/pandocRemoveManonlyBlocks.hs
deleted file mode 100755
index b1f849923..000000000
--- a/tools/pandocRemoveManonlyBlocks.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env stack
-{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
-
-import Text.Pandoc.Builder
-import Text.Pandoc.JSON
-
-main :: IO ()
-main = toJSONFilter removeManonlyBlocks
-
-removeManonlyBlocks :: Block -> Block
-removeManonlyBlocks (Div ("",["manonly"],[]) _) = Plain []
-removeManonlyBlocks x = x
diff --git a/tools/pandocRemoveWebonlyBlocks.hs b/tools/pandocRemoveWebonlyBlocks.hs
deleted file mode 100755
index 791bf8348..000000000
--- a/tools/pandocRemoveWebonlyBlocks.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env stack
-{- stack runghc --verbosity info --package pandoc-types-1.16.1 -}
-
-import Text.Pandoc.Builder
-import Text.Pandoc.JSON
-
-main :: IO ()
-main = toJSONFilter removeWebonlyBlocks
-
-removeWebonlyBlocks :: Block -> Block
-removeWebonlyBlocks (Div ("",["webonly"],[]) _) = Plain []
-removeWebonlyBlocks x = x