diff --git a/rhodecode/config/setup/__init__.py b/rhodecode/config/setup_rhodecode.py
rename from rhodecode/config/setup/__init__.py
rename to rhodecode/config/setup_rhodecode.py
--- a/rhodecode/config/setup/__init__.py
+++ b/rhodecode/config/setup_rhodecode.py
@@ -84,4 +84,4 @@ class SetupCommand(AbstractInstallComman
         installer.setup_config(
             self, config_file, section, self.sysconfig_install_vars(installer))
         self.call_sysconfig_functions(
-            'post_setup_hook', installer, config_file)
\ No newline at end of file
+            'post_setup_hook', installer, config_file)
diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -193,7 +193,7 @@ class TestFilesController(TestController
             short = '27cd5cce30c9%s' % arch_ext
             fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext
             filename = '%s-%s' % (HG_REPO, short)
-            response = self.app.get(url(controller='files', 
+            response = self.app.get(url(controller='files',
                                         action='archivefile',
                                         repo_name=HG_REPO,
                                         fname=fname))
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -94,7 +94,7 @@ setup(
     main = pylons.util:PylonsInstaller
 
     [paste.global_paster_command]
-    setup-rhodecode=rhodecode.config.setup:SetupCommand
+    setup-rhodecode=rhodecode.config.setup_rhodecode:SetupCommand
     make-index=rhodecode.lib.indexers:MakeIndex
     make-rcext=rhodecode.config.rcextensions.make_rcextensions:MakeRcExt
     upgrade-db=rhodecode.lib.dbmigrate:UpgradeDb