diff --git a/contributing.rst b/doc/contributing.rst
similarity index 100%
rename from contributing.rst
rename to doc/contributing.rst
diff --git a/doc/docs.txt b/doc/docs.rst
similarity index 100%
rename from doc/docs.txt
rename to doc/docs.rst
diff --git a/docstyle.rst b/doc/docstyle.rst
similarity index 100%
rename from docstyle.rst
rename to doc/docstyle.rst
diff --git a/doc/overview.rst b/doc/overview.rst
index 5b41752aec..e01520d7c8 100644
--- a/doc/overview.rst
+++ b/doc/overview.rst
@@ -5,5 +5,5 @@ Nim Documentation Overview
 :Author: Andreas Rumpf
 :Version: |nimversion|
 
-.. include:: ../doc/docs.txt
+.. include:: docs.rst
 
diff --git a/koch.nim b/koch.nim
index bd7be94167..8262c7c3d8 100644
--- a/koch.nim
+++ b/koch.nim
@@ -173,7 +173,9 @@ proc bundleNimsuggest(buildExe: bool) =
     copyExe("dist/nimsuggest/nimsuggest".exe, "bin/nimsuggest".exe)
 
 proc bundleFinishExe() =
-  exec(findNim() & " c finish.nim")
+  exec(findNim() & " c tools/finish.nim")
+  copyExe("tools/finish".exe, "finish".exe)
+  removeFile("tools/finish".exe)
 
 proc zip(args: string) =
   bundleNimbleSrc()
diff --git a/finish.nim b/tools/finish.nim
similarity index 100%
rename from finish.nim
rename to tools/finish.nim
diff --git a/web/website.ini b/web/website.ini
index 833122ecb3..0d1be4b638 100644
--- a/web/website.ini
+++ b/web/website.ini
@@ -31,7 +31,7 @@ file: ticker.html
 [Documentation]
 doc: "endb;intern;apis;lib;manual.rst;tut1.rst;tut2.rst;nimc;overview;filters"
 doc: "tools;niminst;nimgrep;gc;estp;idetools;docgen;koch;backends.rst"
-doc: "nimfix.rst;nimsuggest.rst;nep1.rst;nims.rst"
+doc: "nimfix.rst;nimsuggest.rst;nep1.rst;nims.rst;contributing.rst"
 pdf: "manual.rst;lib.rst;tut1.rst;tut2.rst;nimc.rst;niminst.rst;gc.rst"
 srcdoc2: "system.nim;system/nimscript;pure/ospaths"
 srcdoc2: "core/macros;pure/marshal;core/typeinfo"