diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/__init__.py b/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/__init__.py
deleted file mode 100644
index 84b6df381..000000000
--- a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from scrapy.contrib.pbcluster.worker.manager import ClusterWorker
-from scrapy.contrib.pbcluster.master.web import ClusterMasterWeb
-from scrapy.contrib.pbcluster.crawler.manager import ClusterCrawler
\ No newline at end of file
diff --git a/scrapy/trunk/scrapy/contrib_exp/cluster/__init__.py b/scrapy/trunk/scrapy/contrib_exp/cluster/__init__.py
new file mode 100644
index 000000000..5917df97c
--- /dev/null
+++ b/scrapy/trunk/scrapy/contrib_exp/cluster/__init__.py
@@ -0,0 +1,3 @@
+from scrapy.contrib_exp.cluster.worker.manager import ClusterWorker
+from scrapy.contrib_exp.cluster.master.web import ClusterMasterWeb
+from scrapy.contrib_exp.cluster.crawler.manager import ClusterCrawler
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/crawler/__init__.py b/scrapy/trunk/scrapy/contrib_exp/cluster/crawler/__init__.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/crawler/__init__.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/crawler/__init__.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/crawler/manager.py b/scrapy/trunk/scrapy/contrib_exp/cluster/crawler/manager.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/crawler/manager.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/crawler/manager.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/hooks/__init__.py b/scrapy/trunk/scrapy/contrib_exp/cluster/hooks/__init__.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/hooks/__init__.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/hooks/__init__.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/hooks/svn.py b/scrapy/trunk/scrapy/contrib_exp/cluster/hooks/svn.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/hooks/svn.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/hooks/svn.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/__init__.py b/scrapy/trunk/scrapy/contrib_exp/cluster/master/__init__.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/__init__.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/master/__init__.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/manager.py b/scrapy/trunk/scrapy/contrib_exp/cluster/master/manager.py
similarity index 99%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/manager.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/master/manager.py
index d2beb0c00..eb3e3abce 100644
--- a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/manager.py
+++ b/scrapy/trunk/scrapy/contrib_exp/cluster/master/manager.py
@@ -11,7 +11,7 @@ from scrapy.core import signals
 from scrapy import log
 from scrapy.core.engine import scrapyengine
 from scrapy.core.exceptions import NotConfigured
-from scrapy.contrib.pbcluster.worker.manager import ResponseCode
+from scrapy.contrib_exp.cluster.worker.manager import ResponseCode
 from scrapy.conf import settings
 
 def my_import(name):
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/web.py b/scrapy/trunk/scrapy/contrib_exp/cluster/master/web.py
similarity index 99%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/web.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/master/web.py
index 42129ea0a..96e4b41ca 100644
--- a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/web.py
+++ b/scrapy/trunk/scrapy/contrib_exp/cluster/master/web.py
@@ -4,7 +4,7 @@ from pydispatch import dispatcher
 
 from scrapy.spider import spiders 
 from scrapy.management.web import banner, webconsole_discover_module
-from scrapy.contrib.pbcluster.master.manager import ClusterMaster
+from scrapy.contrib_exp.cluster.master.manager import ClusterMaster
 from scrapy.utils.serialization import serialize
 
 class ClusterMasterWeb(ClusterMaster):
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/ws_api.txt b/scrapy/trunk/scrapy/contrib_exp/cluster/master/ws_api.txt
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/master/ws_api.txt
rename to scrapy/trunk/scrapy/contrib_exp/cluster/master/ws_api.txt
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/scrapy-cluster-ctl.py b/scrapy/trunk/scrapy/contrib_exp/cluster/tools/scrapy-cluster-ctl.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/scrapy-cluster-ctl.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/tools/scrapy-cluster-ctl.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/test-worker.py b/scrapy/trunk/scrapy/contrib_exp/cluster/tools/test-worker.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/tools/test-worker.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/tools/test-worker.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/__init__.py b/scrapy/trunk/scrapy/contrib_exp/cluster/worker/__init__.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/__init__.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/worker/__init__.py
diff --git a/scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/manager.py b/scrapy/trunk/scrapy/contrib_exp/cluster/worker/manager.py
similarity index 100%
rename from scrapy/branches/cluster-refactor/scrapy/contrib/pbcluster/worker/manager.py
rename to scrapy/trunk/scrapy/contrib_exp/cluster/worker/manager.py