diff --git a/tools/calc-build-order.py b/scripts/calc-build-order.py
similarity index 100%
rename from tools/calc-build-order.py
rename to scripts/calc-build-order.py
diff --git a/tools/cat-db.py b/scripts/cat-db.py
similarity index 100%
rename from tools/cat-db.py
rename to scripts/cat-db.py
diff --git a/tools/check-source-repo.py b/scripts/check-source-repo.py
similarity index 100%
rename from tools/check-source-repo.py
rename to scripts/check-source-repo.py
diff --git a/tools/convert_history.py b/scripts/convert_history.py
similarity index 100%
rename from tools/convert_history.py
rename to scripts/convert_history.py
diff --git a/tools/fetchAll.py b/scripts/fetchAll.py
similarity index 100%
rename from tools/fetchAll.py
rename to scripts/fetchAll.py
diff --git a/tools/find-lib-deps.py b/scripts/find-lib-deps.py
similarity index 100%
rename from tools/find-lib-deps.py
rename to scripts/find-lib-deps.py
diff --git a/tools/find_unowned_files.py b/scripts/find_unowned_files.py
similarity index 100%
rename from tools/find_unowned_files.py
rename to scripts/find_unowned_files.py
diff --git a/tools/fix_old_metadata_files.py b/scripts/fix_old_metadata_files.py
similarity index 100%
rename from tools/fix_old_metadata_files.py
rename to scripts/fix_old_metadata_files.py
diff --git a/tools/installAllAvailable.sh b/scripts/installAllAvailable.sh
similarity index 100%
rename from tools/installAllAvailable.sh
rename to scripts/installAllAvailable.sh
diff --git a/tools/lspisi b/scripts/lspisi
similarity index 100%
rename from tools/lspisi
rename to scripts/lspisi
diff --git a/tools/missing-binary.py b/scripts/missing-binary.py
similarity index 100%
rename from tools/missing-binary.py
rename to scripts/missing-binary.py
diff --git a/tools/pygettext.py b/scripts/pygettext.py
similarity index 100%
rename from tools/pygettext.py
rename to scripts/pygettext.py
diff --git a/tools/repo-diff.py b/scripts/repo-diff.py
similarity index 100%
rename from tools/repo-diff.py
rename to scripts/repo-diff.py
diff --git a/tools/repostats.py b/scripts/repostats.py
similarity index 100%
rename from tools/repostats.py
rename to scripts/repostats.py
diff --git a/tools/rmcomp-source-repo.py b/scripts/rmcomp-source-repo.py
similarity index 100%
rename from tools/rmcomp-source-repo.py
rename to scripts/rmcomp-source-repo.py
diff --git a/tools/svndist.py b/scripts/svndist.py
similarity index 100%
rename from tools/svndist.py
rename to scripts/svndist.py
diff --git a/tools/unpisi b/scripts/unpisi
similarity index 100%
rename from tools/unpisi
rename to scripts/unpisi
diff --git a/tools/update-environ.py b/scripts/update-environ.py
similarity index 100%
rename from tools/update-environ.py
rename to scripts/update-environ.py
diff --git a/tools/update-po.sh b/scripts/update-po.sh
similarity index 100%
rename from tools/update-po.sh
rename to scripts/update-po.sh
diff --git a/setup.py b/setup.py
index 1d76eea7..5fdbe303 100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 #
 # Copyright (C) 2005, TUBITAK/UEKAE
@@ -65,9 +66,9 @@ setup(name="pisi",
     url="http://www.pardus.org.tr/eng/pisi/",
     package_dir = {'': ''},
     packages = ['pisi', 'pisi.cli', 'pisi.actionsapi', 'pisi.pxml', 'pisi.search'],
-    scripts = ['pisi-cli', 'tools/repostats.py', 'tools/find-lib-deps.py', 
-               'tools/update-environ.py', 'tools/lspisi', 'tools/unpisi',
-               'tools/calc-build-order.py'],
+    scripts = ['pisi-cli', 'scripts/repostats.py', 'scripts/find-lib-deps.py', 
+               'scripts/update-environ.py', 'scripts/lspisi', 'scripts/unpisi',
+               'scripts/calc-build-order.py'],
     cmdclass = {
         'install' : Install
     }