diff --git a/generators/Makefile b/generators/Makefile
deleted file mode 100644
index 635ab062..00000000
--- a/generators/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-.PHONY: all clean
-
-all: ../inc_case_folding.hh ../inc_diacritic_folding.hh
-
-generate: generate.cc
-	c++ -W -Wall $< -o $@
-
-../inc_case_folding.hh ../inc_diacritic_folding.hh: CaseFolding.txt DiacriticFolding.txt generate
-	./generate
-
-clean:
-	rm -f generate
diff --git a/generators/CaseFolding.txt b/tools/generators/CaseFolding.txt
similarity index 100%
rename from generators/CaseFolding.txt
rename to tools/generators/CaseFolding.txt
diff --git a/generators/DiacriticFolding.txt b/tools/generators/DiacriticFolding.txt
similarity index 100%
rename from generators/DiacriticFolding.txt
rename to tools/generators/DiacriticFolding.txt
diff --git a/generators/generate.cc b/tools/generators/generate.cc
similarity index 100%
rename from generators/generate.cc
rename to tools/generators/generate.cc
diff --git a/generators/make_flags_qrc.sh b/tools/generators/make_flags_qrc.sh
similarity index 100%
rename from generators/make_flags_qrc.sh
rename to tools/generators/make_flags_qrc.sh
diff --git a/generators/readme.txt b/tools/generators/readme.txt
similarity index 100%
rename from generators/readme.txt
rename to tools/generators/readme.txt
diff --git a/nsis/GoldenDict-EnRuEn.nsi b/tools/nsis/GoldenDict-EnRuEn.nsi
similarity index 100%
rename from nsis/GoldenDict-EnRuEn.nsi
rename to tools/nsis/GoldenDict-EnRuEn.nsi
diff --git a/nsis/GoldenDict.nsi b/tools/nsis/GoldenDict.nsi
similarity index 100%
rename from nsis/GoldenDict.nsi
rename to tools/nsis/GoldenDict.nsi
diff --git a/nsis/gen_uninstall/gen_uninstall.cc b/tools/nsis/gen_uninstall/gen_uninstall.cc
similarity index 100%
rename from nsis/gen_uninstall/gen_uninstall.cc
rename to tools/nsis/gen_uninstall/gen_uninstall.cc
diff --git a/nsis/gen_uninstall/gen_uninstall.exe.manifest b/tools/nsis/gen_uninstall/gen_uninstall.exe.manifest
similarity index 100%
rename from nsis/gen_uninstall/gen_uninstall.exe.manifest
rename to tools/nsis/gen_uninstall/gen_uninstall.exe.manifest
diff --git a/nsis/gen_uninstall/gen_uninstall.pro b/tools/nsis/gen_uninstall/gen_uninstall.pro
similarity index 100%
rename from nsis/gen_uninstall/gen_uninstall.pro
rename to tools/nsis/gen_uninstall/gen_uninstall.pro
diff --git a/nsis/gen_uninstall/gen_uninstall.rc b/tools/nsis/gen_uninstall/gen_uninstall.rc
similarity index 100%
rename from nsis/gen_uninstall/gen_uninstall.rc
rename to tools/nsis/gen_uninstall/gen_uninstall.rc
diff --git a/nsis/makensis.sh b/tools/nsis/makensis.sh
similarity index 100%
rename from nsis/makensis.sh
rename to tools/nsis/makensis.sh