diff --git a/setup/MANIFEST.in b/MANIFEST.in
similarity index 100%
rename from setup/MANIFEST.in
rename to MANIFEST.in
diff --git a/setup/debian/changelog b/debian/changelog
similarity index 100%
rename from setup/debian/changelog
rename to debian/changelog
diff --git a/setup/debian/compat b/debian/compat
similarity index 100%
rename from setup/debian/compat
rename to debian/compat
diff --git a/setup/debian/control b/debian/control
similarity index 100%
rename from setup/debian/control
rename to debian/control
diff --git a/setup/debian/copyright b/debian/copyright
similarity index 100%
rename from setup/debian/copyright
rename to debian/copyright
diff --git a/setup/debian/openerp-server.conf b/debian/openerp-server.conf
similarity index 100%
rename from setup/debian/openerp-server.conf
rename to debian/openerp-server.conf
diff --git a/setup/debian/openerp.init b/debian/openerp.init
similarity index 100%
rename from setup/debian/openerp.init
rename to debian/openerp.init
diff --git a/setup/debian/openerp.install b/debian/openerp.install
similarity index 100%
rename from setup/debian/openerp.install
rename to debian/openerp.install
diff --git a/setup/debian/openerp.logrotate b/debian/openerp.logrotate
similarity index 100%
rename from setup/debian/openerp.logrotate
rename to debian/openerp.logrotate
diff --git a/setup/debian/openerp.postinst b/debian/openerp.postinst
similarity index 100%
rename from setup/debian/openerp.postinst
rename to debian/openerp.postinst
diff --git a/setup/debian/openerp.postrm b/debian/openerp.postrm
similarity index 100%
rename from setup/debian/openerp.postrm
rename to debian/openerp.postrm
diff --git a/setup/debian/rules b/debian/rules
similarity index 100%
rename from setup/debian/rules
rename to debian/rules
diff --git a/setup/debian/run_all_with_tests.sh b/debian/run_all_with_tests.sh
similarity index 100%
rename from setup/debian/run_all_with_tests.sh
rename to debian/run_all_with_tests.sh
diff --git a/setup/setup.cfg b/setup.cfg
similarity index 66%
rename from setup/setup.cfg
rename to setup.cfg
index 7693a84fc3a..40062a73157 100644
--- a/setup/setup.cfg
+++ b/setup.cfg
@@ -7,4 +7,4 @@ formats=gztar
 formats=rpm
 
 [bdist_rpm]
-install_script=setup_rpm.sh
+install_script=setup/setup_rpm.sh