diff --git a/test/divzero.dat b/test/input/divzero.dat
similarity index 100%
rename from test/divzero.dat
rename to test/input/divzero.dat
diff --git a/test/spaces.dat b/test/input/spaces.dat
similarity index 100%
rename from test/spaces.dat
rename to test/input/spaces.dat
diff --git a/doc/cleanup.sh b/tools/cleanup.sh
similarity index 100%
rename from doc/cleanup.sh
rename to tools/cleanup.sh
diff --git a/doc/gendocs.sh b/tools/gendocs.sh
similarity index 100%
rename from doc/gendocs.sh
rename to tools/gendocs.sh
diff --git a/doc/spellcheck.sh b/tools/spellcheck.sh
similarity index 100%
rename from doc/spellcheck.sh
rename to tools/spellcheck.sh