diff --git a/userconfig.py b/userconfig.py
index 62d6e95..44cac2e 100755
--- a/userconfig.py
+++ b/userconfig.py
@@ -19,9 +19,9 @@ import getopt
 import time
 
 # 
-import cfgfile
-from checks import checks
-import Tools
+import userconfig.cfgfile as cfgfile
+from userconfig.checks import checks
+import userconfig.Tools as Tools
 
 debug = Tools.Debug()
 
diff --git a/Tools.py b/userconfig/Tools.py
similarity index 100%
rename from Tools.py
rename to userconfig/Tools.py
diff --git a/userconfig/__init__.py b/userconfig/__init__.py
new file mode 100644
index 0000000..7ccadad
--- /dev/null
+++ b/userconfig/__init__.py
@@ -0,0 +1,2 @@
+# $Id$
+# $URL$
diff --git a/cfgfile.py b/userconfig/cfgfile.py
similarity index 100%
rename from cfgfile.py
rename to userconfig/cfgfile.py
diff --git a/checks.py b/userconfig/checks.py
similarity index 100%
rename from checks.py
rename to userconfig/checks.py