diff --git a/SConstruct b/SConstruct
index a972bf40e622ed42afe3b3b899a4106d37ff07ad..b0f7742e87d138f3f901eb2e56530f70bdcb5e16 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,8 +1,6 @@
 # -*- python -*-
 
 import sys, glob, os.path, fnmatch
-sys.path.append(Dir('#/senfscons').abspath)
-sys.path.append(Dir('#/doclib').abspath)
 import SENFSCons, senfutil
 
 ###########################################################################
@@ -11,14 +9,14 @@ import SENFSCons, senfutil
 env = Environment()
 
 # Load all the local SCons tools
-env.Tool('Doxygen', [ 'senfscons' ])
-env.Tool('Dia2Png', [ 'senfscons' ])
-env.Tool('PkgDraw', [ 'senfscons' ])
-env.Tool('InstallSubdir', [ 'senfscons' ])
-env.Tool('CopyToDir', [ 'senfscons' ])
-env.Tool('Boost', [ 'senfscons' ])
-env.Tool('CombinedObject', [ 'senfscons' ])
-env.Tool('PhonyTarget', [ 'senfscons' ])
+env.Tool('Doxygen')
+env.Tool('Dia2Png')
+env.Tool('PkgDraw')
+env.Tool('InstallSubdir')
+env.Tool('CopyToDir')
+env.Tool('Boost')
+env.Tool('CombinedObject')
+env.Tool('PhonyTarget')
 
 env.Help("""
 Additional top-level build targets:
diff --git a/senfscons/Doxyfile b/site_scons/Doxyfile
similarity index 100%
rename from senfscons/Doxyfile
rename to site_scons/Doxyfile
diff --git a/senfscons/Doxyfile.template b/site_scons/Doxyfile.template
similarity index 100%
rename from senfscons/Doxyfile.template
rename to site_scons/Doxyfile.template
diff --git a/senfscons/Mainpage.dox b/site_scons/Mainpage.dox
similarity index 100%
rename from senfscons/Mainpage.dox
rename to site_scons/Mainpage.dox
diff --git a/senfscons/SConfig.template b/site_scons/SConfig.template
similarity index 100%
rename from senfscons/SConfig.template
rename to site_scons/SConfig.template
diff --git a/senfscons/SConscript b/site_scons/SConscript
similarity index 100%
rename from senfscons/SConscript
rename to site_scons/SConscript
diff --git a/senfscons/SConscript.template b/site_scons/SConscript.template
similarity index 100%
rename from senfscons/SConscript.template
rename to site_scons/SConscript.template
diff --git a/senfscons/SENFSCons.py b/site_scons/SENFSCons.py
similarity index 100%
rename from senfscons/SENFSCons.py
rename to site_scons/SENFSCons.py
diff --git a/senfscons/__init__.py b/site_scons/__init__.py
similarity index 100%
rename from senfscons/__init__.py
rename to site_scons/__init__.py
diff --git a/senfscons/senfutil.py b/site_scons/senfutil.py
similarity index 100%
rename from senfscons/senfutil.py
rename to site_scons/senfutil.py
diff --git a/senfscons/Boost.py b/site_scons/site_tools/Boost.py
similarity index 100%
rename from senfscons/Boost.py
rename to site_scons/site_tools/Boost.py
diff --git a/senfscons/CombinedObject.py b/site_scons/site_tools/CombinedObject.py
similarity index 100%
rename from senfscons/CombinedObject.py
rename to site_scons/site_tools/CombinedObject.py
diff --git a/senfscons/CopyToDir.py b/site_scons/site_tools/CopyToDir.py
similarity index 100%
rename from senfscons/CopyToDir.py
rename to site_scons/site_tools/CopyToDir.py
diff --git a/senfscons/Dia2Png.py b/site_scons/site_tools/Dia2Png.py
similarity index 100%
rename from senfscons/Dia2Png.py
rename to site_scons/site_tools/Dia2Png.py
diff --git a/senfscons/Doxygen.py b/site_scons/site_tools/Doxygen.py
similarity index 100%
rename from senfscons/Doxygen.py
rename to site_scons/site_tools/Doxygen.py
diff --git a/senfscons/InstallSubdir.py b/site_scons/site_tools/InstallSubdir.py
similarity index 100%
rename from senfscons/InstallSubdir.py
rename to site_scons/site_tools/InstallSubdir.py
diff --git a/senfscons/PhonyTarget.py b/site_scons/site_tools/PhonyTarget.py
similarity index 100%
rename from senfscons/PhonyTarget.py
rename to site_scons/site_tools/PhonyTarget.py
diff --git a/senfscons/PkgDraw.py b/site_scons/site_tools/PkgDraw.py
similarity index 100%
rename from senfscons/PkgDraw.py
rename to site_scons/site_tools/PkgDraw.py
diff --git a/doclib/yaptu.py b/site_scons/yaptu.py
similarity index 100%
rename from doclib/yaptu.py
rename to site_scons/yaptu.py