diff --git a/avocado/conf/__init__.py b/avocado/conf/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/avocado/conf/settings.py b/avocado/settings.py
similarity index 100%
rename from avocado/conf/settings.py
rename to avocado/settings.py
diff --git a/setup.py b/setup.py
index 204981a513e18d05ba1d57f10d485ab57c30f47c..47722c667ba277d542504a0c7140342394b8016c 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,6 @@ setup(name='avocado',
       url='http://autotest.github.com',
       packages=['avocado',
                 'avocado.cli',
-                'avocado.conf',
                 'avocado.core',
                 'avocado.linux',
                 'avocado.utils',