diff --git a/.classpath b/.classpath
index 838b3ef526..8cf9466e0b 100644
--- a/.classpath
+++ b/.classpath
@@ -18,8 +18,8 @@
 	<classpathentry kind="lib" path="/3rd Party/lib/json.jar"/>
 	<classpathentry kind="lib" path="/3rd Party/lib/fop/batik-all-1.6.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Alfresco JLAN"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/WebScript Framework"/>
 	<classpathentry kind="lib" path="/3rd Party/lib/commons/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="/3rd Party/lib/chiba-1.3.0-patched.jar" sourcepath="/3rd Party/src/chiba-1.3.0-patched-src.zip"/>
+	<classpathentry kind="lib" path="/3rd Party/lib/spring-surf/spring-webscripts-1.0.0.CI-SNAPSHOT.jar" sourcepath="/3rd Party/src/spring-webscripts-1.0.0.CI-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index 1e23c97926..1bea1df7b0 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -7,7 +7,7 @@
       </evaluators>
       <element-readers>
          <element-reader element-name="client" class="org.alfresco.web.config.ClientElementReader"/>
-         <element-reader element-name="server" class="org.alfresco.web.config.ServerElementReader"/>
+         <element-reader element-name="server" class="org.springframework.extensions.config.ServerElementReader"/>
          <element-reader element-name="property-sheet" class="org.alfresco.web.config.PropertySheetElementReader"/>
          <element-reader element-name="navigation" class="org.alfresco.web.config.NavigationElementReader" />
          <element-reader element-name="languages" class="org.alfresco.web.config.LanguagesElementReader" />
diff --git a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
index b3d641d2b9..00e16fa4ac 100644
--- a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
+++ b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
@@ -37,10 +37,10 @@ import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.web.app.servlet.AuthenticationHelper;
 import org.alfresco.web.bean.repository.User;
-import org.alfresco.web.scripts.Authenticator;
-import org.alfresco.web.scripts.Description.RequiredAuthentication;
-import org.alfresco.web.scripts.portlet.PortletAuthenticatorFactory;
-import org.alfresco.web.scripts.portlet.WebScriptPortletRequest;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.portlet.PortletAuthenticatorFactory;
+import org.springframework.extensions.webscripts.portlet.WebScriptPortletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/source/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java b/source/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java
index 866e3833df..85605d4e1c 100644
--- a/source/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java
+++ b/source/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java
@@ -34,7 +34,7 @@ import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
 import org.alfresco.web.app.Application;
-import org.alfresco.web.scripts.portlet.WebScriptPortlet;
+import org.springframework.extensions.webscripts.portlet.WebScriptPortlet;
 
 
 /**
diff --git a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
index efea3a54bb..786056a6c6 100644
--- a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
+++ b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
@@ -33,12 +33,12 @@ import javax.servlet.http.HttpServletResponse;
 import org.alfresco.web.app.servlet.AuthenticationHelper;
 import org.alfresco.web.app.servlet.AuthenticationStatus;
 import org.alfresco.web.app.servlet.BaseServlet;
-import org.alfresco.web.scripts.Authenticator;
-import org.alfresco.web.scripts.WebScriptException;
-import org.alfresco.web.scripts.Description.RequiredAuthentication;
-import org.alfresco.web.scripts.servlet.ServletAuthenticatorFactory;
-import org.alfresco.web.scripts.servlet.WebScriptServletRequest;
-import org.alfresco.web.scripts.servlet.WebScriptServletResponse;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.servlet.ServletAuthenticatorFactory;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.context.ServletContextAware;
diff --git a/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java
index 4c87effdd1..8bfb49bd0f 100644
--- a/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java
@@ -34,9 +34,9 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.extensions.surf.util.URLDecoder;
-import org.alfresco.web.scripts.Match;
-import org.alfresco.web.scripts.RuntimeContainer;
-import org.alfresco.web.scripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.RuntimeContainer;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
 
 /**
  * WebScript aware NTLM Authentication Filter Class.
diff --git a/source/java/org/alfresco/web/bean/ajax/PickerBean.java b/source/java/org/alfresco/web/bean/ajax/PickerBean.java
index db4a2b5a3e..72fb400bbb 100644
--- a/source/java/org/alfresco/web/bean/ajax/PickerBean.java
+++ b/source/java/org/alfresco/web/bean/ajax/PickerBean.java
@@ -55,7 +55,7 @@ import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.app.servlet.ajax.InvokeCommand;
 import org.alfresco.web.bean.BrowseBean;
 import org.alfresco.web.bean.repository.Repository;
-import org.alfresco.web.scripts.json.JSONWriter;
+import org.springframework.extensions.webscripts.json.JSONWriter;
 import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index 6ecb572a95..cc0de2a26e 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -46,7 +46,6 @@ import javax.faces.el.MethodBinding;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 
-import org.springframework.extensions.config.ConfigElement;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.filesys.repo.ContentContext;
 import org.alfresco.jlan.server.config.ServerConfigurationAccessor;
@@ -68,7 +67,6 @@ import org.alfresco.service.cmr.repository.NoTransformerException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
-import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.DownloadContentServlet;
 import org.alfresco.web.app.servlet.ExternalAccessServlet;
@@ -80,6 +78,9 @@ import org.alfresco.web.ui.common.component.UIStatusMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.shared_impl.renderkit.html.HtmlFormRendererBase;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.ui.common.StringUtils;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/common/component/UIListItem.java b/source/java/org/alfresco/web/ui/common/component/UIListItem.java
index 0c2783c333..21141285e8 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIListItem.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIListItem.java
@@ -29,6 +29,8 @@ import java.io.Serializable;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
+
 /**
  * @author kevinr
  */
diff --git a/source/java/org/alfresco/web/ui/common/component/UIListItems.java b/source/java/org/alfresco/web/ui/common/component/UIListItems.java
index 50eebd041e..4015560504 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIListItems.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIListItems.java
@@ -27,6 +27,8 @@ package org.alfresco.web.ui.common.component;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
+
 /**
  * Allows a group of UIListItem objects to be represented.
  * 
diff --git a/source/java/org/alfresco/web/ui/common/component/UIMenu.java b/source/java/org/alfresco/web/ui/common/component/UIMenu.java
index 2292563841..1d834275fa 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIMenu.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIMenu.java
@@ -32,6 +32,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.web.ui.common.Utils;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java b/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
index 69bd1fc2bd..f3c3a02239 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
@@ -47,6 +47,7 @@ import org.alfresco.web.app.Application;
 import org.alfresco.web.ui.common.PanelGenerator;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.WebResources;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java b/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
index 158fcc3b18..68a3d53df7 100644
--- a/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
+++ b/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
@@ -32,7 +32,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.web.app.Application;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Base class for all debug components
diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java b/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java
index e565c0a66d..d0ac160a1b 100644
--- a/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java
+++ b/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java
@@ -29,7 +29,7 @@ import java.io.Serializable;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Description component that outputs a dynamic description
diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java b/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
index 827f335400..3d12cedf1f 100644
--- a/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
+++ b/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
@@ -27,7 +27,7 @@ package org.alfresco.web.ui.common.component.description;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Descriptions component that outputs descriptions held in a backing object
diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java b/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
index a5463b5f6f..7261f575ed 100644
--- a/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
+++ b/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
@@ -35,7 +35,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Dynamic description component that switches text based on the events
diff --git a/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java b/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
index 62459cfa3a..2b20fb7512 100644
--- a/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
+++ b/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
@@ -31,8 +31,7 @@ import javax.faces.el.ValueBinding;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author kevinr
diff --git a/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java b/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
index f4d686aca5..0dbecc73ba 100644
--- a/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
@@ -30,6 +30,7 @@ import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 
 import org.alfresco.web.ui.common.component.UIGenericPicker;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java b/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
index 1d1478e3df..829069dad8 100644
--- a/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
@@ -26,6 +26,8 @@ package org.alfresco.web.ui.common.tag;
 
 import javax.faces.component.UIComponent;
 
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
+
 
 /**
  * Base class for tags that represent HTML components.
diff --git a/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java b/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java
index e44d57e65c..125c434c2b 100644
--- a/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java
@@ -26,6 +26,8 @@ package org.alfresco.web.ui.common.tag;
 
 import javax.faces.component.UIComponent;
 
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
+
 /**
  * @author kevinr
  */
diff --git a/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java b/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
index 4eecd56d0f..558b5d6a4b 100644
--- a/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
@@ -26,6 +26,8 @@ package org.alfresco.web.ui.common.tag;
 
 import javax.faces.component.UIComponent;
 
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
+
 /**
  * Tag used to place the ListItems component on a JSP page
  * 
diff --git a/source/java/org/alfresco/web/ui/common/tag/PanelTag.java b/source/java/org/alfresco/web/ui/common/tag/PanelTag.java
index 1ca3dee8fb..f475906a0f 100644
--- a/source/java/org/alfresco/web/ui/common/tag/PanelTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/PanelTag.java
@@ -25,7 +25,6 @@
 package org.alfresco.web.ui.common.tag;
 
 import javax.faces.FacesException;
-import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 import javax.servlet.jsp.JspException;
diff --git a/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java b/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
index ef39b2ff4d..464fe00748 100644
--- a/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.common.tag.data;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 
 /**
diff --git a/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java b/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
index bc6187d13b..1d77703ae0 100644
--- a/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.common.tag.data;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 
 /**
diff --git a/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
index 89de7b9a12..3e61fa9090 100644
--- a/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.common.tag.description;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag class to allow the description component to be used on a JSP page
diff --git a/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
index b8bb7d73c5..38370f5a8e 100644
--- a/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.common.tag.description;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag class to allow the descriptions component to be used on a JSP page
diff --git a/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java b/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
index 3f7de03cd8..1af7ecf66e 100644
--- a/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.common.tag.description;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag class to allow the dynamic description component to be used on a JSP page
diff --git a/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java b/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
index b21bf02f8e..8b388839e6 100644
--- a/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.common.tag.evaluator;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author kevinr
diff --git a/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java b/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
index b5453a672b..ce17272ef7 100644
--- a/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
+++ b/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
-import org.alfresco.web.scripts.json.JSONWriter;
+import org.springframework.extensions.webscripts.json.JSONWriter;
 import org.alfresco.web.ui.common.Utils;
 import org.springframework.web.jsf.FacesContextUtils;
 
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIActions.java b/source/java/org/alfresco/web/ui/repo/component/UIActions.java
index 94da14ee19..f100eab3aa 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIActions.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIActions.java
@@ -39,25 +39,25 @@ import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
-import org.springframework.extensions.config.Config;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.config.ActionsConfigElement;
 import org.alfresco.web.config.ActionsConfigElement.ActionDefinition;
 import org.alfresco.web.config.ActionsConfigElement.ActionGroup;
 import org.alfresco.web.ui.common.ComponentConstants;
-import org.alfresco.web.ui.common.ConstantMethodBinding;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.repo.component.evaluator.ActionInstanceEvaluator;
 import org.alfresco.web.ui.repo.component.evaluator.PermissionEvaluator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.shared_impl.taglib.UIComponentTagUtils;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.ui.common.ConstantMethodBinding;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author kevinr
diff --git a/source/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java b/source/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java
index c542f716e2..e63fbe8d7e 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java
@@ -46,7 +46,7 @@ import org.alfresco.web.bean.ajax.CategoryBrowserPluginBean;
 import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.data.QuickSort;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.repo.component.UITree.TreeNode;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java b/source/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java
index 53be59f6e3..62dad3af2b 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java
@@ -42,7 +42,7 @@ import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.config.DialogsConfigElement.DialogButtonConfig;
 import org.alfresco.web.ui.common.ComponentConstants;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java b/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java
index 964996c493..92ee988f4e 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java
@@ -37,7 +37,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.repo.WebResources;
 import org.springframework.util.StringUtils;
 
diff --git a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java
index b062eac12e..ffbb11450f 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java
@@ -52,7 +52,7 @@ import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.data.QuickSort;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.repo.component.UITree.TreeNode;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java b/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
index bb2d017a88..35608a20e0 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
@@ -33,7 +33,7 @@ import javax.faces.el.ValueBinding;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * JSF component that displays information about a node.
diff --git a/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java b/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
index a4cd4dc29b..66584ee527 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
@@ -48,7 +48,7 @@ import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.repository.User;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * JSF component that displays information about the workflows a node is involved in.
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
index 77147d45cc..0fd848883a 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
@@ -32,15 +32,15 @@ import java.util.Set;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.springframework.extensions.config.Config;
-import org.springframework.extensions.config.ConfigService;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.web.scripts.bean.SearchProxy;
 import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement;
 import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.EngineConfig;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
index 657d764cb7..aac27aead6 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
@@ -59,7 +59,7 @@ import org.alfresco.web.config.AdvancedSearchConfigElement;
 import org.alfresco.web.config.AdvancedSearchConfigElement.CustomProperty;
 import org.alfresco.web.ui.common.ComponentConstants;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.repo.RepoConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java
index cf5c66d5d3..6ba45ede55 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java
@@ -37,7 +37,7 @@ import org.alfresco.web.bean.SidebarBean;
 import org.alfresco.web.config.SidebarConfigElement;
 import org.alfresco.web.config.SidebarConfigElement.SidebarPluginConfig;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIListItems;
 import org.alfresco.web.ui.common.component.UIModeList;
 
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
index 31d98d38df..2597884d5f 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
@@ -43,7 +43,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTransition;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
index 60b3f74766..a795e5872e 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
@@ -38,7 +38,7 @@ import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.repository.User;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * JSF component that displays summary information about a workflow.
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
index c0a2db9c08..d446bb1e79 100644
--- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
@@ -41,7 +41,7 @@ import javax.faces.event.FacesEvent;
 import org.alfresco.web.ui.common.PanelGenerator;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.WebResources;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
index 22462f235c..6d8a1a1cd7 100644
--- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
@@ -33,7 +33,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
index 07747fa734..5af54a19fd 100644
--- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
@@ -24,7 +24,7 @@
  */
 package org.alfresco.web.ui.repo.component.shelf;
 
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java b/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
index 62c1401daf..4a40493e6e 100644
--- a/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
+++ b/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
@@ -44,7 +44,7 @@ import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.repository.User;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java b/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
index 802170df54..e0b7db8f98 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.repo.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
index a5cfae1730..c982d9c2b9 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.repo.tag.property;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Base class for all association editor tag implementations
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
index c1741f56c2..6d441e740e 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
@@ -25,7 +25,7 @@
 package org.alfresco.web.ui.repo.tag.property;
 
 import javax.faces.component.UIComponent;
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag to represent the combination of a PropertySheet component
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
index 35e0263d41..d88c175b73 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.repo.tag.property;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Base class for all property sheet items that need to be placed on a JSP page 
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
index 44a4a26932..c8e9c1e0ee 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.repo.tag.property;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author gavinc
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
index ba0a163322..0a622c1735 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
@@ -28,8 +28,8 @@ import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
 import org.alfresco.web.ui.repo.component.shelf.UIClipboardShelfItem;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
index 4c5d0d4cab..d6d6bfc5c6 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
@@ -28,7 +28,7 @@ import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 import org.alfresco.web.ui.repo.component.shelf.UIRecentSpacesShelfItem;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
index 1647036b74..a79fbeaed7 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
@@ -28,7 +28,7 @@ import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 import org.alfresco.web.ui.repo.component.shelf.UIShelf;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
index 4740219698..8ce63f3981 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
@@ -28,7 +28,7 @@ import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 import org.alfresco.web.ui.repo.component.shelf.UIShortcutsShelfItem;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/wcm/component/AbstractLinkValidationReportComponent.java b/source/java/org/alfresco/web/ui/wcm/component/AbstractLinkValidationReportComponent.java
index 49825c41f3..47f711638b 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/AbstractLinkValidationReportComponent.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/AbstractLinkValidationReportComponent.java
@@ -30,7 +30,7 @@ import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.web.bean.wcm.LinkValidationState;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Base class for all the link validation report JSF components.
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java
index 8eb9990c5a..304262e097 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java
@@ -60,7 +60,7 @@ import org.alfresco.web.data.QuickSort;
 import org.alfresco.web.ui.common.ComponentConstants;
 import org.alfresco.web.ui.common.PanelGenerator;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.repo.component.UIActions;
 import org.apache.commons.logging.Log;
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIFormProcessor.java b/source/java/org/alfresco/web/ui/wcm/component/UIFormProcessor.java
index 5c8e6ec82f..318d0fd06c 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIFormProcessor.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIFormProcessor.java
@@ -31,7 +31,7 @@ import javax.faces.el.ValueBinding;
 
 import org.alfresco.web.forms.*;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationProgress.java b/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationProgress.java
index 850ff25a5a..e403809553 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationProgress.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationProgress.java
@@ -35,7 +35,7 @@ import javax.faces.el.MethodBinding;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.wcm.AVMUtil;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.repo.component.UIActions;
 
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java b/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java
index 888473461d..250d568d76 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java
@@ -50,19 +50,19 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
 import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.wcm.sandbox.SandboxConstants;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMUtil;
 import org.alfresco.web.ui.common.ComponentConstants;
-import org.alfresco.web.ui.common.ConstantMethodBinding;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.repo.component.UIActions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.Pair;
+import org.springframework.extensions.webscripts.ui.common.ConstantMethodBinding;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Component to display the list of pending submissions for a web project.
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
index f3918d917f..98a18c13d3 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
@@ -56,13 +56,13 @@ import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMCompareUtils;
 import org.alfresco.web.bean.wcm.DeploymentUtil;
 import org.alfresco.web.ui.common.ComponentConstants;
-import org.alfresco.web.ui.common.ConstantMethodBinding;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.repo.component.UIActions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.ui.common.ConstantMethodBinding;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
index 87231cc855..ee8ec144ec 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -80,10 +80,8 @@ import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.data.QuickSort;
 import org.alfresco.web.forms.Form;
 import org.alfresco.web.ui.common.ComponentConstants;
-import org.alfresco.web.ui.common.ConstantMethodBinding;
 import org.alfresco.web.ui.common.PanelGenerator;
 import org.alfresco.web.ui.common.Utils;
-import org.alfresco.web.ui.common.component.SelfRenderingComponent;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.common.component.UIMenu;
 import org.alfresco.web.ui.common.converter.ByteSizeConverter;
@@ -91,6 +89,8 @@ import org.alfresco.web.ui.repo.component.UIActions;
 import org.alfresco.web.ui.wcm.WebResources;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.ui.common.ConstantMethodBinding;
+import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
 
 /**
  * Component responsible for rendering the list of user sandboxes for a web project.
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/DeployWebsiteTag.java b/source/java/org/alfresco/web/ui/wcm/tag/DeployWebsiteTag.java
index 15f0ec18d1..52a4f42d6a 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/DeployWebsiteTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/DeployWebsiteTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.wcm.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag class that allows the DeployWebsite component to be used on a JSP page.
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/DeploymentReportsTag.java b/source/java/org/alfresco/web/ui/wcm/tag/DeploymentReportsTag.java
index 87862c407b..75a00ebe58 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/DeploymentReportsTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/DeploymentReportsTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.wcm.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag class that allows the DeploymentReports component to be used on a JSP page.
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/DeploymentServersTag.java b/source/java/org/alfresco/web/ui/wcm/tag/DeploymentServersTag.java
index 034f73f30d..bc7fd81d72 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/DeploymentServersTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/DeploymentServersTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.wcm.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag class that allows the DeploymentServers component to be used on a JSP page.
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/FormProcessorTag.java b/source/java/org/alfresco/web/ui/wcm/tag/FormProcessorTag.java
index bf6316ee9c..4521dcb87a 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/FormProcessorTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/FormProcessorTag.java
@@ -27,7 +27,7 @@ import javax.faces.application.Application;
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 import javax.faces.el.ValueBinding;
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author Ariel Backenroth
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/PendingSubmissionsTag.java b/source/java/org/alfresco/web/ui/wcm/tag/PendingSubmissionsTag.java
index ff992f31f2..0badeb3221 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/PendingSubmissionsTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/PendingSubmissionsTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.wcm.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * Tag to allow the UIPendingSubmissions component to be placed
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/SandboxSnapshotsTag.java b/source/java/org/alfresco/web/ui/wcm/tag/SandboxSnapshotsTag.java
index 62876b1e0b..5cb15a4ac5 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/SandboxSnapshotsTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/SandboxSnapshotsTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.wcm.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author Kevin Roast
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java b/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java
index 9f9eaef96a..eda6792e2c 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java
@@ -26,7 +26,7 @@ package org.alfresco.web.ui.wcm.tag;
 
 import javax.faces.component.UIComponent;
 
-import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.springframework.extensions.webscripts.ui.common.tag.BaseComponentTag;
 
 /**
  * @author Kevin Roast
diff --git a/source/web/WEB-INF/faces-config-repo.xml b/source/web/WEB-INF/faces-config-repo.xml
index b81741b284..06172a7e43 100644
--- a/source/web/WEB-INF/faces-config-repo.xml
+++ b/source/web/WEB-INF/faces-config-repo.xml
@@ -201,7 +201,7 @@
    
    <component>
       <component-type>org.alfresco.faces.WebScript</component-type>
-      <component-class>org.alfresco.web.scripts.jsf.UIWebScript</component-class>
+      <component-class>org.springframework.extensions.webscripts.jsf.UIWebScript</component-class>
    </component>
    
    <component>
diff --git a/source/web/WEB-INF/repo.tld b/source/web/WEB-INF/repo.tld
index a8505dcff2..211e01a4d6 100644
--- a/source/web/WEB-INF/repo.tld
+++ b/source/web/WEB-INF/repo.tld
@@ -2190,7 +2190,7 @@
    
    <tag>
       <name>webScript</name>
-      <tag-class>org.alfresco.web.scripts.jsf.WebScriptTag</tag-class>
+      <tag-class>org.springframework.extensions.webscripts.jsf.WebScriptTag</tag-class>
       <body-content>JSP</body-content>
       
       <description>
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index b6dfbde4d7..c54e3adf2c 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -65,6 +65,7 @@
         </description>
     </context-param>
 
+   <!-- Spring Application Context location and context class -->
    <context-param>
       <param-name>contextConfigLocation</param-name>
       <param-value>/WEB-INF/web-application-context.xml</param-value>
@@ -75,6 +76,7 @@
       <param-value>org.alfresco.config.JBossEnabledWebApplicationContext</param-value>
       <description>Spring context class</description>
    </context-param>
+   
    <context-param>
       <param-name>log4jExposeWebAppRoot</param-name>
       <param-value>false</param-value>
@@ -292,10 +294,12 @@
       <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
    </listener>
    
+   <!-- Spring Context Loader listener - can disable loading of context if runtime config changes are needed -->
    <listener>
       <listener-class>org.alfresco.web.app.ContextLoaderListener</listener-class>
    </listener>
 
+   <!-- Web Application Context listener - session create/destroy debugging and bootstrap Spring init -->
    <listener>
       <listener-class>org.alfresco.web.app.ContextListener</listener-class>
    </listener>
@@ -377,7 +381,7 @@
 
    <servlet>
       <servlet-name>apiServlet</servlet-name>
-      <servlet-class>org.alfresco.web.scripts.servlet.WebScriptServlet</servlet-class>
+      <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
          <param-value>webscripts.authenticator.basic</param-value>
@@ -386,7 +390,7 @@
 
    <servlet>
       <servlet-name>wcapiServlet</servlet-name>
-      <servlet-class>org.alfresco.web.scripts.servlet.WebScriptServlet</servlet-class>
+      <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
          <param-value>webscripts.authenticator.webclient</param-value>
@@ -395,7 +399,7 @@
 
    <servlet>
       <servlet-name>portalapiServlet</servlet-name>
-      <servlet-class>org.alfresco.web.scripts.servlet.WebScriptServlet</servlet-class>
+      <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
          <param-value>webscripts.authenticator.webclient</param-value>
@@ -404,7 +408,7 @@
 
    <servlet>
       <servlet-name>facebookServlet</servlet-name>
-      <servlet-class>org.alfresco.web.scripts.facebook.FacebookServlet</servlet-class>
+      <servlet-class>org.alfresco.repo.web.scripts.facebook.FacebookServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
          <param-value>webscripts.authenticator.facebook</param-value>
@@ -413,7 +417,7 @@
 
    <servlet>
       <servlet-name>fbapiServlet</servlet-name>
-      <servlet-class>org.alfresco.web.scripts.facebook.FacebookAPIServlet</servlet-class>
+      <servlet-class>org.alfresco.repo.web.scripts.facebook.FacebookAPIServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
          <param-value>webscripts.authenticator.facebook</param-value>
@@ -422,7 +426,7 @@
 
    <servlet>
       <servlet-name>proxyServlet</servlet-name>
-      <servlet-class>org.alfresco.web.scripts.servlet.HTTPProxyServlet</servlet-class>
+      <servlet-class>org.alfresco.web.app.servlet.HTTPProxyServlet</servlet-class>
    </servlet>
 
    <servlet>
@@ -435,42 +439,42 @@
       <servlet-class>org.alfresco.web.app.servlet.JBPMDeployProcessServlet</servlet-class>
    </servlet>
 
-    <servlet>
-        <servlet-name>CMISFileShareServlet</servlet-name>
-        <servlet-class>de.fmui.cmis.fileshare.info.BrowseServlet</servlet-class>
-        <init-param>
-            <param-name>auxroot</param-name>
-            <param-value>cmisfs/browser/</param-value>
-        </init-param>
-        <init-param>
-            <param-name>allow</param-name>
-            <param-value>http.*</param-value>
-        </init-param>
-        <init-param>
-            <param-name>stylesheet:application/atomsvc+xml</param-name>
-            <param-value>/cmisfs/stylesheets/service.xsl</param-value>
-        </init-param>
-        <init-param>
-            <param-name>stylesheet:application/atom+xml;type=feed</param-name>
-            <param-value>/cmisfs/stylesheets/feed.xsl</param-value>
-        </init-param>
-        <init-param>
-            <param-name>stylesheet:application/cmistree+xml</param-name>
-            <param-value>/cmisfs/stylesheets/feed.xsl</param-value>
-        </init-param>
-        <init-param>
-            <param-name>stylesheet:application/atom+xml;type=entry</param-name>
-            <param-value>/cmisfs/stylesheets/entry.xsl</param-value>
-        </init-param>
-        <init-param>
-            <param-name>stylesheet:application/cmisallowableactions+xml</param-name>
-            <param-value>/cmisfs/stylesheets/actions.xsl</param-value>
-        </init-param>
-        <init-param>
-            <param-name>stylesheet:application/cmisacl+xml</param-name>
-            <param-value>/cmisfs/stylesheets/acl.xsl</param-value>
-        </init-param>
-    </servlet>
+   <servlet>
+      <servlet-name>CMISFileShareServlet</servlet-name>
+      <servlet-class>de.fmui.cmis.fileshare.info.BrowseServlet</servlet-class>
+      <init-param>
+         <param-name>auxroot</param-name>
+         <param-value>cmisfs/browser/</param-value>
+      </init-param>
+      <init-param>
+         <param-name>allow</param-name>
+         <param-value>http.*</param-value>
+      </init-param>
+      <init-param>
+         <param-name>stylesheet:application/atomsvc+xml</param-name>
+         <param-value>/cmisfs/stylesheets/service.xsl</param-value>
+      </init-param>
+      <init-param>
+         <param-name>stylesheet:application/atom+xml;type=feed</param-name>
+         <param-value>/cmisfs/stylesheets/feed.xsl</param-value>
+      </init-param>
+      <init-param>
+         <param-name>stylesheet:application/cmistree+xml</param-name>
+         <param-value>/cmisfs/stylesheets/feed.xsl</param-value>
+      </init-param>
+      <init-param>
+         <param-name>stylesheet:application/atom+xml;type=entry</param-name>
+         <param-value>/cmisfs/stylesheets/entry.xsl</param-value>
+      </init-param>
+      <init-param>
+         <param-name>stylesheet:application/cmisallowableactions+xml</param-name>
+         <param-value>/cmisfs/stylesheets/actions.xsl</param-value>
+      </init-param>
+      <init-param>
+         <param-name>stylesheet:application/cmisacl+xml</param-name>
+         <param-value>/cmisfs/stylesheets/acl.xsl</param-value>
+      </init-param>
+   </servlet>
 
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>