diff --git a/config/alfresco/office-addin-context.xml b/config/alfresco/office-addin-context.xml
index c900fafc93..09307a7b92 100644
--- a/config/alfresco/office-addin-context.xml
+++ b/config/alfresco/office-addin-context.xml
@@ -5,7 +5,7 @@
 
    <!-- I18N -->
    
-   <bean id="officeResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+   <bean id="officeResourceBundles" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
         <property name="resourceBundles">
             <list>
                 <value>alfresco.messages.office-addin</value>
diff --git a/config/alfresco/portlets-context.xml b/config/alfresco/portlets-context.xml
index fc7255ecf6..ad41ba4377 100755
--- a/config/alfresco/portlets-context.xml
+++ b/config/alfresco/portlets-context.xml
@@ -5,7 +5,7 @@
 
    <!-- I18N -->
    
-   <bean id="portletsResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+   <bean id="portletsResourceBundles" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
         <property name="resourceBundles">
             <list>
                 <value>alfresco.messages.portlets</value>
diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml
index c5988cc7b7..72e043990d 100644
--- a/config/alfresco/web-client-application-context.xml
+++ b/config/alfresco/web-client-application-context.xml
@@ -95,7 +95,7 @@
       <property name="repoXMLConfigService" ref="webClientConfigService"/>
    </bean>
    
-   <bean id="webClientConfigAdminInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent"> 
+   <bean id="webClientConfigAdminInterpreterHelp" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent"> 
       <property name="resourceBundles">
          <list>
              <value>alfresco.messages.webclient-config-admin-interpreter-help</value>
diff --git a/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java
index e7ce250c60..9c99981963 100644
--- a/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.avm.AVMNodeType;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMUtil;
diff --git a/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java
index 5b8181de08..00b1427e76 100644
--- a/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.avm.AVMNodeType;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 
diff --git a/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java
index 0a3fb5ded6..d4f0c37646 100644
--- a/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.locking.AVMLock;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
diff --git a/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java
index f9cd390497..d5b0cdc3f0 100644
--- a/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java
@@ -30,7 +30,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.avm.AVMNodeType;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 
diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
index 7fc1831caf..e41b4a5e7e 100644
--- a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
+++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
@@ -31,8 +31,8 @@ import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
diff --git a/source/java/org/alfresco/web/app/AlfrescoVariableResolver.java b/source/java/org/alfresco/web/app/AlfrescoVariableResolver.java
index 011444fcbd..d3c235015f 100644
--- a/source/java/org/alfresco/web/app/AlfrescoVariableResolver.java
+++ b/source/java/org/alfresco/web/app/AlfrescoVariableResolver.java
@@ -31,8 +31,8 @@ import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.jsf.DelegatingVariableResolver;
diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java
index 21379fb8eb..84f2b9bc98 100644
--- a/source/java/org/alfresco/web/app/Application.java
+++ b/source/java/org/alfresco/web/app/Application.java
@@ -40,9 +40,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigService;
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.importer.ImporterBootstrap;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.web.app.servlet.AuthenticationHelper;
diff --git a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
index 26c2ef082f..f4961f5fd0 100644
--- a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
+++ b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
@@ -41,8 +41,8 @@ import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.UnavailableException;
 
-import org.alfresco.config.ConfigService;
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.SessionUser;
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.service.cmr.security.AuthenticationService;
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
index d546547443..b6c824a9f0 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
@@ -34,9 +34,9 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter;
-import org.alfresco.util.AbstractLifecycleBean;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.alfresco.web.config.ClientConfigElement;
 import org.springframework.context.ApplicationEvent;
 
@@ -68,7 +68,7 @@ public class AuthenticationFilter extends AbstractLifecycleBean implements Depen
     }
     
     /* (non-Javadoc)
-     * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
+     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
      */
     @Override
     protected void onBootstrap(ApplicationEvent event)
@@ -86,7 +86,7 @@ public class AuthenticationFilter extends AbstractLifecycleBean implements Depen
     }
 
     /* (non-Javadoc)
-     * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
+     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
      */
     @Override
     protected void onShutdown(ApplicationEvent event)
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 8ea5676485..e4f0cc1f01 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.SessionUser;
 import org.alfresco.repo.management.subsystems.ActivateableBean;
diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
index e4e9c222df..85836994e7 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
@@ -54,8 +54,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.URLDecoder;
-import org.alfresco.util.URLEncoder;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.LoginBean;
 import org.apache.commons.logging.Log;
diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
index 9a2f776939..f766f49af0 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.model.FileFolderService;
@@ -48,7 +48,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.util.URLDecoder;
+import org.springframework.extensions.surf.util.URLDecoder;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.LoginBean;
 import org.alfresco.web.bean.repository.Repository;
diff --git a/source/java/org/alfresco/web/app/servlet/CommandServlet.java b/source/java/org/alfresco/web/app/servlet/CommandServlet.java
index 81d97b833f..7799f615aa 100644
--- a/source/java/org/alfresco/web/app/servlet/CommandServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/CommandServlet.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.config.Config;
+import org.springframework.extensions.config.Config;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.web.app.Application;
diff --git a/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
index 8ce848d7f5..d1085edcd8 100644
--- a/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.repo.SessionUser;
 import org.alfresco.repo.webdav.auth.BaseKerberosAuthenticationFilter;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
index b85cad5722..ed3e975fc7 100644
--- a/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.repo.SessionUser;
 import org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java b/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
index 2225601315..8b3781046f 100644
--- a/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.util.TempFileProvider;
diff --git a/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java
index 02db30c2e3..4c87effdd1 100644
--- a/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/WebScriptNTLMAuthenticationFilter.java
@@ -33,7 +33,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
-import org.alfresco.util.URLDecoder;
+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;
diff --git a/source/java/org/alfresco/web/app/servlet/command/CreateWebContentCommand.java b/source/java/org/alfresco/web/app/servlet/command/CreateWebContentCommand.java
index c02ad01e91..0da49b2f2f 100644
--- a/source/java/org/alfresco/web/app/servlet/command/CreateWebContentCommand.java
+++ b/source/java/org/alfresco/web/app/servlet/command/CreateWebContentCommand.java
@@ -36,7 +36,7 @@ import javax.servlet.ServletResponse;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
diff --git a/source/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java b/source/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
index a879ff9024..f19a86dd6e 100644
--- a/source/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
+++ b/source/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
@@ -35,7 +35,7 @@ import javax.servlet.ServletResponse;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.BrowseBean;
diff --git a/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java b/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java
index 1b12975b3a..4e93da0a1f 100644
--- a/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java
+++ b/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java
@@ -36,7 +36,7 @@ import javax.servlet.ServletResponse;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
diff --git a/source/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java b/source/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java
index fc63141cc5..c403beb0df 100644
--- a/source/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java
+++ b/source/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java
@@ -36,7 +36,7 @@ import javax.servlet.ServletResponse;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
diff --git a/source/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java b/source/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java
index 5241ee67a9..dfe7b47455 100644
--- a/source/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java
+++ b/source/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java
@@ -34,7 +34,7 @@ import javax.servlet.ServletResponse;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.users.UsersDialog;
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 057115c5b7..3d87be53f2 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -42,9 +42,9 @@ import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.SearcherException;
diff --git a/source/java/org/alfresco/web/bean/SidebarBean.java b/source/java/org/alfresco/web/bean/SidebarBean.java
index 3a5f7530ab..4a5e11507e 100644
--- a/source/java/org/alfresco/web/bean/SidebarBean.java
+++ b/source/java/org/alfresco/web/bean/SidebarBean.java
@@ -31,7 +31,7 @@ import java.util.List;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.alfresco.config.Config;
+import org.springframework.extensions.config.Config;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.config.SidebarConfigElement;
 import org.alfresco.web.config.SidebarConfigElement.SidebarPluginConfig;
diff --git a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
index 81dd004c4b..98a18dba20 100644
--- a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
+++ b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
@@ -41,9 +41,9 @@ import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.action.ActionDefinition;
diff --git a/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java
index 2bdde14615..05ec4ce2cf 100644
--- a/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java
+++ b/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java
@@ -34,7 +34,7 @@ import org.alfresco.repo.action.executer.CopyToWebProjectActionExecuter;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMUtil;
diff --git a/source/java/org/alfresco/web/bean/admin/ImportDialog.java b/source/java/org/alfresco/web/bean/admin/ImportDialog.java
index bc99415a8f..e3f525a76c 100644
--- a/source/java/org/alfresco/web/bean/admin/ImportDialog.java
+++ b/source/java/org/alfresco/web/bean/admin/ImportDialog.java
@@ -32,7 +32,7 @@ import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.executer.ImporterActionExecuter;
 import org.alfresco.repo.content.MimetypeMap;
diff --git a/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java b/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
index 8ed9ce25a5..8e9a0e107a 100644
--- a/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
+++ b/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
@@ -50,7 +50,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.TempFileProvider;
-import org.alfresco.util.URLDecoder;
+import org.springframework.extensions.surf.util.URLDecoder;
 import org.alfresco.web.app.servlet.BaseServlet;
 import org.alfresco.web.app.servlet.ajax.InvokeCommand;
 import org.alfresco.web.bean.repository.Repository;
diff --git a/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java b/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java
index 763c352d6a..2c7526b89d 100644
--- a/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java
+++ b/source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java
@@ -33,7 +33,7 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.content.transform.TransformerInfoException;
 import org.alfresco.repo.template.I18NMessageMethod;
 import org.alfresco.repo.template.TemplateNode;
diff --git a/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java b/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
index 4d151613f4..918327e10a 100644
--- a/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
+++ b/source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
@@ -42,7 +42,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.search.CategoryService;
 import org.alfresco.service.cmr.search.CategoryService.Depth;
 import org.alfresco.service.cmr.search.CategoryService.Mode;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java b/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
index 2dcb9f222b..7b6652a315 100644
--- a/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
+++ b/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
@@ -42,7 +42,7 @@ import org.alfresco.service.cmr.search.CategoryService;
 import org.alfresco.service.cmr.search.CategoryService.Depth;
 import org.alfresco.service.cmr.search.CategoryService.Mode;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
index 60137cf0b7..983a77f446 100644
--- a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
+++ b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
@@ -33,7 +33,7 @@ import javax.faces.context.FacesContext;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/bean/content/AddContentDialog.java b/source/java/org/alfresco/web/bean/content/AddContentDialog.java
index 0d975b2bd9..1d183f3466 100644
--- a/source/java/org/alfresco/web/bean/content/AddContentDialog.java
+++ b/source/java/org/alfresco/web/bean/content/AddContentDialog.java
@@ -38,9 +38,9 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
diff --git a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
index 55cbc30a5e..fa225b9bfd 100644
--- a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
@@ -35,9 +35,9 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.ServiceRegistry;
diff --git a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
index 6dd4992e98..e50955d608 100644
--- a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
@@ -37,9 +37,9 @@ import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.model.FileExistsException;
diff --git a/source/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java b/source/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java
index 01efaf0f6f..2a0dbf7697 100644
--- a/source/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java
@@ -37,8 +37,8 @@ import javax.faces.event.ActionEvent;
 import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
diff --git a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
index e389c2fab8..3043aa3fde 100644
--- a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
@@ -31,7 +31,7 @@ import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
diff --git a/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
index 9678bd2667..103f98609a 100644
--- a/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
+++ b/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
@@ -37,7 +37,7 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.version.common.VersionLabelComparator;
 import org.alfresco.repo.web.scripts.FileTypeImageUtils;
@@ -51,7 +51,7 @@ import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.cmr.version.VersionService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.DownloadContentServlet;
 import org.alfresco.web.bean.repository.MapNode;
diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
index f4ce27b1bf..f64e2fdca1 100644
--- a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
+++ b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
@@ -32,7 +32,7 @@ import java.util.ListIterator;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.PreferencesService;
 import org.alfresco.web.config.DashboardsConfigElement;
diff --git a/source/java/org/alfresco/web/bean/ml/AddTranslationDialog.java b/source/java/org/alfresco/web/bean/ml/AddTranslationDialog.java
index e5c779fa26..1aa3285336 100644
--- a/source/java/org/alfresco/web/bean/ml/AddTranslationDialog.java
+++ b/source/java/org/alfresco/web/bean/ml/AddTranslationDialog.java
@@ -29,7 +29,7 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.web.app.Application;
diff --git a/source/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java b/source/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java
index 94f2b56d34..e478c98f02 100644
--- a/source/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java
+++ b/source/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java
@@ -30,7 +30,7 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/source/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java b/source/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java
index 610bbfec40..dca5cddb46 100644
--- a/source/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java
+++ b/source/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java
@@ -30,7 +30,7 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java b/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java
index c38c11a396..ecc20676f4 100644
--- a/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java
+++ b/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java
@@ -38,7 +38,7 @@ import javax.faces.event.ActionEvent;
 import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.version.VersionModel;
 import org.alfresco.service.cmr.lock.LockService;
@@ -50,7 +50,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionService;
 import org.alfresco.service.cmr.version.VersionType;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java b/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
index f6ed6bddd8..c0b320e0ab 100644
--- a/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
+++ b/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
@@ -35,8 +35,8 @@ import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.actions.IHandler;
 import org.alfresco.web.bean.rules.handlers.BaseConditionHandler;
diff --git a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
index 10aa3eaec3..9281903220 100644
--- a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
+++ b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
@@ -38,9 +38,9 @@ import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionCondition;
diff --git a/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java b/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
index c5f3957eb7..35221e4d15 100644
--- a/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
+++ b/source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
@@ -31,7 +31,7 @@ import javax.faces.context.FacesContext;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.rule.Rule;
 import org.alfresco.service.cmr.rule.RuleService;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
index d28f7b6427..30344ae95e 100644
--- a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
+++ b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
@@ -55,7 +55,7 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.util.CachingDateFormat;
+import org.springframework.extensions.surf.util.CachingDateFormat;
 import org.alfresco.util.ISO9075;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
index 08da4853b3..dcf7fd47af 100644
--- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
@@ -35,8 +35,8 @@ import java.util.ResourceBundle;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
index 351514a071..004ac981b9 100644
--- a/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
+++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
@@ -52,7 +52,7 @@ import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.CachingDateFormat;
+import org.springframework.extensions.surf.util.CachingDateFormat;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.context.IContextListener;
 import org.alfresco.web.app.context.UIContextService;
diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
index 9214ecf836..1138d07b06 100644
--- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
+++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
@@ -51,7 +51,7 @@ import org.alfresco.service.cmr.usage.ContentUsageService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.ApplicationContextHelper;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.context.UIContextService;
 import org.alfresco.web.app.servlet.FacesHelper;
diff --git a/source/java/org/alfresco/web/bean/users/EditUserWizard.java b/source/java/org/alfresco/web/bean/users/EditUserWizard.java
index 93615c3503..4b1f4ce3dd 100644
--- a/source/java/org/alfresco/web/bean/users/EditUserWizard.java
+++ b/source/java/org/alfresco/web/bean/users/EditUserWizard.java
@@ -34,7 +34,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.ReportedException;
diff --git a/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java b/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java
index 4f9b332416..0ecfd7b971 100644
--- a/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java
+++ b/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java
@@ -33,8 +33,8 @@ import java.util.ResourceBundle;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.service.cmr.ml.ContentFilterLanguagesService;
 import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index 9c92ae74f8..91100b105e 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -42,8 +42,8 @@ import javax.faces.event.ActionEvent;
 import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.config.JNDIConstants;
 import org.alfresco.linkvalidation.HrefValidationProgress;
 import org.alfresco.linkvalidation.LinkValidationService;
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMUtil.java b/source/java/org/alfresco/web/bean/wcm/AVMUtil.java
index a9a89c4f5c..bb7ed96f9d 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMUtil.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMUtil.java
@@ -30,8 +30,8 @@ import java.util.regex.Pattern;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.config.JNDIConstants;
 import org.alfresco.mbeans.VirtServerRegistry;
 import org.alfresco.repo.avm.AVMNodeConverter;
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java b/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java
index 46e88acbb9..bac77ad852 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java
@@ -37,7 +37,7 @@ import java.util.StringTokenizer;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.config.ConfigElement;
+import org.springframework.extensions.config.ConfigElement;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.content.MimetypeMap;
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index 4217ab3d40..2dac4d900e 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -41,9 +41,9 @@ import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.WCMAppModel;
diff --git a/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java b/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java
index 5e71f7dc08..1c3089f597 100644
--- a/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java
@@ -42,7 +42,7 @@ import org.alfresco.repo.web.scripts.FileTypeImageUtils;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.DownloadContentServlet;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java b/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java
index b150e5c6d2..8d20fdeef7 100644
--- a/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java
@@ -63,7 +63,7 @@ import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.ajax.InvokeCommand;
 import org.alfresco.web.bean.FileUploadBean;
diff --git a/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java b/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java
index ddbeff1b55..c85179f6af 100644
--- a/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java
@@ -43,7 +43,7 @@ import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 import org.alfresco.web.bean.repository.Repository;
diff --git a/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
index 89ba1af968..c7aaa2bedc 100644
--- a/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
@@ -41,7 +41,7 @@ import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.wcm.util.WCMUtil;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index 537d6ba4d0..7640b8abbd 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -56,7 +56,7 @@ import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.cmr.workflow.WorkflowTask;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.util.ISO8601DateFormat;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
 import org.alfresco.util.NameMatcher;
 import org.alfresco.wcm.sandbox.SandboxFactory;
 import org.alfresco.wcm.sandbox.SandboxService;
diff --git a/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java b/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java
index 1b2705b647..e824163491 100644
--- a/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java
+++ b/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 
 
 /**
diff --git a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
index 429359f0a0..5e50975bf3 100644
--- a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
+++ b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
@@ -53,7 +53,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.cmr.workflow.WorkflowTransition;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.wcm.webproject.WebProjectService;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
diff --git a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
index 4d3a71cf5e..258429fff1 100644
--- a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
+++ b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
@@ -40,7 +40,7 @@ import javax.faces.event.ActionEvent;
 import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.config.ConfigElement;
+import org.springframework.extensions.config.ConfigElement;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.workflow.WorkflowModel;
diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
index 664ee0893f..6c7a1a64bc 100644
--- a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
+++ b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
 import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.cmr.workflow.WorkflowTransition;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.NavigationBean;
 import org.alfresco.web.bean.repository.Node;
diff --git a/source/java/org/alfresco/web/config/ActionsConfigElement.java b/source/java/org/alfresco/web/config/ActionsConfigElement.java
index b56638d477..d015b81826 100644
--- a/source/java/org/alfresco/web/config/ActionsConfigElement.java
+++ b/source/java/org/alfresco/web/config/ActionsConfigElement.java
@@ -33,9 +33,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.web.action.ActionEvaluator;
 import org.alfresco.web.bean.repository.Repository;
@@ -69,7 +69,7 @@ public class ActionsConfigElement extends ConfigElementAdapter
    }
 
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
     */
    public List<ConfigElement> getChildren()
    {
@@ -77,7 +77,7 @@ public class ActionsConfigElement extends ConfigElementAdapter
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/ActionsElementReader.java b/source/java/org/alfresco/web/config/ActionsElementReader.java
index e0d1610c56..156ceff478 100644
--- a/source/java/org/alfresco/web/config/ActionsElementReader.java
+++ b/source/java/org/alfresco/web/config/ActionsElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.alfresco.web.action.ActionEvaluator;
 import org.alfresco.web.config.ActionsConfigElement.ActionDefinition;
 import org.alfresco.web.config.ActionsConfigElement.ActionGroup;
@@ -68,7 +68,7 @@ public class ActionsElementReader implements ConfigElementReader
    public static final String ATTRIBUTE_HIDE = "hide";
 
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java b/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
index 34b69ccc34..bc3f2f859f 100644
--- a/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
+++ b/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
@@ -28,9 +28,9 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 
 /**
  * Custom config element that represents config values for advanced search
@@ -66,7 +66,7 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter implements
    }
 
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
     */
    @Override
    public List<ConfigElement> getChildren()
@@ -75,7 +75,7 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter implements
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/AdvancedSearchElementReader.java b/source/java/org/alfresco/web/config/AdvancedSearchElementReader.java
index 831f1c838b..23c72277dc 100644
--- a/source/java/org/alfresco/web/config/AdvancedSearchElementReader.java
+++ b/source/java/org/alfresco/web/config/AdvancedSearchElementReader.java
@@ -28,9 +28,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.alfresco.web.config.AdvancedSearchConfigElement.CustomProperty;
 import org.dom4j.Element;
 
@@ -53,7 +53,7 @@ public class AdvancedSearchElementReader implements ConfigElementReader
    public static final String ATTRIBUTE_DISPLAYLABEL = "display-label-id";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/AspectEvaluator.java b/source/java/org/alfresco/web/config/AspectEvaluator.java
index 0fae37bd24..338d7e7875 100644
--- a/source/java/org/alfresco/web/config/AspectEvaluator.java
+++ b/source/java/org/alfresco/web/config/AspectEvaluator.java
@@ -26,7 +26,7 @@ package org.alfresco.web.config;
 
 import java.util.Set;
 
-import org.alfresco.config.evaluator.Evaluator;
+import org.springframework.extensions.config.evaluator.Evaluator;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
@@ -41,7 +41,7 @@ public final class AspectEvaluator implements Evaluator
    /**
     * Determines whether the given aspect is applied to the given object
     * 
-    * @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
+    * @see org.springframework.extensions.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
     */
    public boolean applies(Object obj, String condition)
    {
diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java
index 9ab75027e7..fd53de1628 100644
--- a/source/java/org/alfresco/web/config/ClientConfigElement.java
+++ b/source/java/org/alfresco/web/config/ClientConfigElement.java
@@ -29,9 +29,9 @@ import java.util.List;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.config.ConfigElement;
+import org.springframework.extensions.config.ConfigElement;
 import org.alfresco.config.JNDIConstants;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 import org.alfresco.mbeans.VirtServerRegistry;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.ExpiringValueCache;
@@ -110,7 +110,7 @@ public class ClientConfigElement extends ConfigElementAdapter
    }
 
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/ClientElementReader.java b/source/java/org/alfresco/web/config/ClientElementReader.java
index 8997740722..be426b495c 100644
--- a/source/java/org/alfresco/web/config/ClientElementReader.java
+++ b/source/java/org/alfresco/web/config/ClientElementReader.java
@@ -28,9 +28,9 @@ package org.alfresco.web.config;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.alfresco.service.namespace.QName;
 import org.dom4j.Element;
 
@@ -76,7 +76,7 @@ public class ClientElementReader implements ConfigElementReader
    
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/CommandServletConfigElement.java b/source/java/org/alfresco/web/config/CommandServletConfigElement.java
index 1a8b0ca446..98b141cf86 100644
--- a/source/java/org/alfresco/web/config/CommandServletConfigElement.java
+++ b/source/java/org/alfresco/web/config/CommandServletConfigElement.java
@@ -28,9 +28,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 
 /**
  * @author Kevin Roast
@@ -60,7 +60,7 @@ public class CommandServletConfigElement extends ConfigElementAdapter
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
     */
    public List<ConfigElement> getChildren()
    {
@@ -68,7 +68,7 @@ public class CommandServletConfigElement extends ConfigElementAdapter
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/CommandServletElementReader.java b/source/java/org/alfresco/web/config/CommandServletElementReader.java
index 806ea56d21..2814b8a901 100644
--- a/source/java/org/alfresco/web/config/CommandServletElementReader.java
+++ b/source/java/org/alfresco/web/config/CommandServletElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.dom4j.Element;
 
 /**
@@ -41,7 +41,7 @@ public class CommandServletElementReader implements ConfigElementReader
    public static final String ATTRIBUTE_CLASS = "class";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
index 0d67c014b6..3bc3164016 100755
--- a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
+++ b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
@@ -30,8 +30,8 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.List;
 
-import org.alfresco.config.ConfigDeployment;
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.config.ConfigDeployment;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.admin.BaseInterpreter;
 import org.alfresco.repo.config.xml.RepoXMLConfigService;
 import org.alfresco.service.transaction.TransactionService;
diff --git a/source/java/org/alfresco/web/config/DashboardsConfigElement.java b/source/java/org/alfresco/web/config/DashboardsConfigElement.java
index 8fca09eb84..340357031a 100644
--- a/source/java/org/alfresco/web/config/DashboardsConfigElement.java
+++ b/source/java/org/alfresco/web/config/DashboardsConfigElement.java
@@ -32,9 +32,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 
 /**
  * Dashboard config element.
@@ -67,7 +67,7 @@ public class DashboardsConfigElement extends ConfigElementAdapter
    }
 
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
     */
    public List<ConfigElement> getChildren()
    {
@@ -75,7 +75,7 @@ public class DashboardsConfigElement extends ConfigElementAdapter
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/DashboardsElementReader.java b/source/java/org/alfresco/web/config/DashboardsElementReader.java
index 59f035d355..d4dcd8cb79 100644
--- a/source/java/org/alfresco/web/config/DashboardsElementReader.java
+++ b/source/java/org/alfresco/web/config/DashboardsElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.alfresco.web.config.DashboardsConfigElement.DashletDefinition;
 import org.alfresco.web.config.DashboardsConfigElement.LayoutDefinition;
 import org.dom4j.Element;
@@ -60,7 +60,7 @@ public class DashboardsElementReader implements ConfigElementReader
    public static final String ATTR_ALLOWNARROW = "allow-narrow";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/DialogsConfigElement.java b/source/java/org/alfresco/web/config/DialogsConfigElement.java
index 4ffd519e56..1bdf035155 100644
--- a/source/java/org/alfresco/web/config/DialogsConfigElement.java
+++ b/source/java/org/alfresco/web/config/DialogsConfigElement.java
@@ -29,10 +29,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * Custom config element that represents the config data for a property sheet
diff --git a/source/java/org/alfresco/web/config/DialogsElementReader.java b/source/java/org/alfresco/web/config/DialogsElementReader.java
index 87760643b4..a1b5d52904 100644
--- a/source/java/org/alfresco/web/config/DialogsElementReader.java
+++ b/source/java/org/alfresco/web/config/DialogsElementReader.java
@@ -28,9 +28,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.alfresco.web.config.DialogsConfigElement.DialogButtonConfig;
 import org.dom4j.Element;
 
@@ -76,7 +76,7 @@ public class DialogsElementReader implements ConfigElementReader
    public static final String ATTR_ONCLICK = "onclick";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/LanguagesConfigElement.java b/source/java/org/alfresco/web/config/LanguagesConfigElement.java
index db3ebb6a8f..4e8bb7008a 100644
--- a/source/java/org/alfresco/web/config/LanguagesConfigElement.java
+++ b/source/java/org/alfresco/web/config/LanguagesConfigElement.java
@@ -29,9 +29,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 
 /**
  * Custom config element that represents config values for languages
@@ -64,7 +64,7 @@ public class LanguagesConfigElement extends ConfigElementAdapter
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
     */
    @Override
    public List<ConfigElement> getChildren()
@@ -73,7 +73,7 @@ public class LanguagesConfigElement extends ConfigElementAdapter
    }
 
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/LanguagesElementReader.java b/source/java/org/alfresco/web/config/LanguagesElementReader.java
index cb04624a36..957dcba5fe 100644
--- a/source/java/org/alfresco/web/config/LanguagesElementReader.java
+++ b/source/java/org/alfresco/web/config/LanguagesElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.dom4j.Element;
 
 /**
@@ -42,7 +42,7 @@ public class LanguagesElementReader implements ConfigElementReader
    public static final String ATTRIBUTE_LOCALE = "locale";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/NavigationConfigElement.java b/source/java/org/alfresco/web/config/NavigationConfigElement.java
index 9f14b1c4a4..df97e8226c 100644
--- a/source/java/org/alfresco/web/config/NavigationConfigElement.java
+++ b/source/java/org/alfresco/web/config/NavigationConfigElement.java
@@ -27,9 +27,9 @@ package org.alfresco.web.config;
 import java.util.HashMap;
 import java.util.List;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.element.ConfigElementAdapter;
-import org.alfresco.config.element.GenericConfigElement;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.element.GenericConfigElement;
 
 /**
  * Custom config element that represents the config data for navigation
diff --git a/source/java/org/alfresco/web/config/NavigationElementReader.java b/source/java/org/alfresco/web/config/NavigationElementReader.java
index 2aeeef687e..fac693b406 100644
--- a/source/java/org/alfresco/web/config/NavigationElementReader.java
+++ b/source/java/org/alfresco/web/config/NavigationElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.dom4j.Element;
 
 /**
@@ -46,7 +46,7 @@ public class NavigationElementReader implements ConfigElementReader
    public static final String ATTR_TO_OUTCOME = "to-outcome";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    public ConfigElement parse(Element element)
    {
diff --git a/source/java/org/alfresco/web/config/NodeTypeEvaluator.java b/source/java/org/alfresco/web/config/NodeTypeEvaluator.java
index 5cc73143a3..2ceef4d946 100644
--- a/source/java/org/alfresco/web/config/NodeTypeEvaluator.java
+++ b/source/java/org/alfresco/web/config/NodeTypeEvaluator.java
@@ -24,7 +24,7 @@
  */
 package org.alfresco.web.config;
 
-import org.alfresco.config.evaluator.Evaluator;
+import org.springframework.extensions.config.evaluator.Evaluator;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
@@ -39,7 +39,7 @@ public class NodeTypeEvaluator implements Evaluator
    /**
     * Determines whether the given node type matches the path of the given object
     * 
-    * @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
+    * @see org.springframework.extensions.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
     */
    public boolean applies(Object obj, String condition)
    {
diff --git a/source/java/org/alfresco/web/config/PathEvaluator.java b/source/java/org/alfresco/web/config/PathEvaluator.java
index bcaeac627a..0d299e59ed 100644
--- a/source/java/org/alfresco/web/config/PathEvaluator.java
+++ b/source/java/org/alfresco/web/config/PathEvaluator.java
@@ -24,7 +24,7 @@
  */
 package org.alfresco.web.config;
 
-import org.alfresco.config.evaluator.Evaluator;
+import org.springframework.extensions.config.evaluator.Evaluator;
 import org.alfresco.web.bean.repository.Node;
 
 /**
@@ -37,7 +37,7 @@ public class PathEvaluator implements Evaluator
    /**
     * Determines whether the given path matches the path of the given object
     * 
-    * @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
+    * @see org.springframework.extensions.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
     */
    public boolean applies(Object obj, String condition)
    {
diff --git a/source/java/org/alfresco/web/config/PropertySheetConfigElement.java b/source/java/org/alfresco/web/config/PropertySheetConfigElement.java
index 79b0f6ae14..30b9bcf385 100644
--- a/source/java/org/alfresco/web/config/PropertySheetConfigElement.java
+++ b/source/java/org/alfresco/web/config/PropertySheetConfigElement.java
@@ -29,9 +29,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 
 /**
  * Custom config element that represents the config data for a property sheet
diff --git a/source/java/org/alfresco/web/config/PropertySheetElementReader.java b/source/java/org/alfresco/web/config/PropertySheetElementReader.java
index 873872b0b3..1bf57bd40a 100644
--- a/source/java/org/alfresco/web/config/PropertySheetElementReader.java
+++ b/source/java/org/alfresco/web/config/PropertySheetElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.dom4j.Element;
 
 /**
@@ -54,7 +54,7 @@ public class PropertySheetElementReader implements ConfigElementReader
    public static final String ATTR_IGNORE_IF_MISSING = "ignore-if-missing";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/SidebarConfigElement.java b/source/java/org/alfresco/web/config/SidebarConfigElement.java
index efe096dfe6..1f1e807289 100644
--- a/source/java/org/alfresco/web/config/SidebarConfigElement.java
+++ b/source/java/org/alfresco/web/config/SidebarConfigElement.java
@@ -29,10 +29,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * Custom config element that represents the config data for the sidebar
diff --git a/source/java/org/alfresco/web/config/SidebarElementReader.java b/source/java/org/alfresco/web/config/SidebarElementReader.java
index d075caa00a..58a4d54047 100644
--- a/source/java/org/alfresco/web/config/SidebarElementReader.java
+++ b/source/java/org/alfresco/web/config/SidebarElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.dom4j.Element;
 
 /**
@@ -52,7 +52,7 @@ public class SidebarElementReader implements ConfigElementReader
    public static final String ATTR_ACTIONS_CONFIG_ID = "actions-config-id";
 
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/ViewsConfigElement.java b/source/java/org/alfresco/web/config/ViewsConfigElement.java
index 5f129669da..99710f0c50 100644
--- a/source/java/org/alfresco/web/config/ViewsConfigElement.java
+++ b/source/java/org/alfresco/web/config/ViewsConfigElement.java
@@ -30,9 +30,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
 
 /**
  * Custom config element that represents config values for views in the client
@@ -99,7 +99,7 @@ public class ViewsConfigElement extends ConfigElementAdapter implements Serializ
    }
 
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
     */
    @Override
    public List<ConfigElement> getChildren()
@@ -108,7 +108,7 @@ public class ViewsConfigElement extends ConfigElementAdapter implements Serializ
    }
    
    /**
-    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
     */
    public ConfigElement combine(ConfigElement configElement)
    {
diff --git a/source/java/org/alfresco/web/config/ViewsElementReader.java b/source/java/org/alfresco/web/config/ViewsElementReader.java
index c87345d69c..44928a4200 100644
--- a/source/java/org/alfresco/web/config/ViewsElementReader.java
+++ b/source/java/org/alfresco/web/config/ViewsElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.dom4j.Element;
@@ -50,7 +50,7 @@ public class ViewsElementReader implements ConfigElementReader
    private static Log logger = LogFactory.getLog(ViewsElementReader.class);
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    @SuppressWarnings("unchecked")
    public ConfigElement parse(Element element)
diff --git a/source/java/org/alfresco/web/config/WCMConfigElement.java b/source/java/org/alfresco/web/config/WCMConfigElement.java
index 0b3dd846d2..25e35f12a5 100644
--- a/source/java/org/alfresco/web/config/WCMConfigElement.java
+++ b/source/java/org/alfresco/web/config/WCMConfigElement.java
@@ -28,8 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.element.GenericConfigElement;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.element.GenericConfigElement;
 
 /**
  * Custom config element that represents the config data for WCM
diff --git a/source/java/org/alfresco/web/config/WCMElementReader.java b/source/java/org/alfresco/web/config/WCMElementReader.java
index 0306b2be13..12f72d6176 100644
--- a/source/java/org/alfresco/web/config/WCMElementReader.java
+++ b/source/java/org/alfresco/web/config/WCMElementReader.java
@@ -24,8 +24,8 @@
  */
 package org.alfresco.web.config;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.xml.elementreader.GenericElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.xml.elementreader.GenericElementReader;
 import org.dom4j.Element;
 
 /**
@@ -46,7 +46,7 @@ public class WCMElementReader extends GenericElementReader
    }
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    public ConfigElement parse(Element element)
    {
diff --git a/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java b/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java
index 45f3c85872..303869ce2d 100644
--- a/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java
+++ b/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java
@@ -26,10 +26,10 @@ package org.alfresco.web.config;
 
 import java.util.List;
 
-import org.alfresco.config.ConfigDeployer;
-import org.alfresco.config.ConfigDeployment;
-import org.alfresco.config.ConfigService;
-import org.alfresco.config.source.UrlConfigSource;
+import org.springframework.extensions.config.ConfigDeployer;
+import org.springframework.extensions.config.ConfigDeployment;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.config.source.UrlConfigSource;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
diff --git a/source/java/org/alfresco/web/config/WebClientConfigTest.java b/source/java/org/alfresco/web/config/WebClientConfigTest.java
index bc2e635592..e40df097c7 100644
--- a/source/java/org/alfresco/web/config/WebClientConfigTest.java
+++ b/source/java/org/alfresco/web/config/WebClientConfigTest.java
@@ -32,10 +32,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.XMLConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.XMLConfigService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.BaseTest;
 import org.alfresco.web.config.ActionsConfigElement.ActionDefinition;
diff --git a/source/java/org/alfresco/web/config/WizardsConfigElement.java b/source/java/org/alfresco/web/config/WizardsConfigElement.java
index 3302c2da6a..d8070452b0 100644
--- a/source/java/org/alfresco/web/config/WizardsConfigElement.java
+++ b/source/java/org/alfresco/web/config/WizardsConfigElement.java
@@ -30,10 +30,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.element.ConfigElementAdapter;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * Custom config element that represents the config data for a property sheet
diff --git a/source/java/org/alfresco/web/config/WizardsElementReader.java b/source/java/org/alfresco/web/config/WizardsElementReader.java
index 0961f4897e..6dbee80fe3 100644
--- a/source/java/org/alfresco/web/config/WizardsElementReader.java
+++ b/source/java/org/alfresco/web/config/WizardsElementReader.java
@@ -26,9 +26,9 @@ package org.alfresco.web.config;
 
 import java.util.Iterator;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigException;
-import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
 import org.alfresco.web.config.WizardsConfigElement.ConditionalPageConfig;
 import org.alfresco.web.config.WizardsConfigElement.PageConfig;
 import org.alfresco.web.config.WizardsConfigElement.StepConfig;
@@ -63,7 +63,7 @@ public class WizardsElementReader implements ConfigElementReader
    public static final String ATTR_PATH = "path";
    
    /**
-    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
     */
    public ConfigElement parse(Element element)
    {
diff --git a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
index 887129dccd..96b64aebe9 100644
--- a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
+++ b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
@@ -63,8 +63,8 @@ import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.namespace.DynamicNamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.URLDecoder;
-import org.alfresco.util.URLEncoder;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.repository.Repository;
diff --git a/source/java/org/alfresco/web/forms/RenditionImpl.java b/source/java/org/alfresco/web/forms/RenditionImpl.java
index e9fbf05778..4cb64daf19 100644
--- a/source/java/org/alfresco/web/forms/RenditionImpl.java
+++ b/source/java/org/alfresco/web/forms/RenditionImpl.java
@@ -38,7 +38,7 @@ import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMUtil;
diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 33f3ea723e..05534979d1 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -32,7 +32,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import javax.xml.transform.*;
 import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.forms.XMLUtil;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.Pointer;
diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
index aff1c2c9ef..4b65b7d176 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
@@ -41,7 +41,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java b/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
index cc4f1fa209..848fe1e12c 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
@@ -30,8 +30,8 @@ import java.util.TreeSet;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index c4e2ca2c1a..6ecb572a95 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -46,7 +46,7 @@ import javax.faces.el.MethodBinding;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 
-import org.alfresco.config.ConfigElement;
+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 +68,7 @@ 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.alfresco.util.URLEncoder;
+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;
diff --git a/source/java/org/alfresco/web/ui/common/component/UIOutputText.java b/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
index cdff2b69ea..c167b6b923 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
@@ -32,7 +32,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
 import javax.faces.el.ValueBinding;
 
-import org.alfresco.util.URLEncoder;
+import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.ui.common.Utils;
 
 /**
diff --git a/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java b/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
index 7a3f131a34..f248619eac 100644
--- a/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
+++ b/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
@@ -33,7 +33,7 @@ import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.DateTimeConverter;
 
-import org.alfresco.util.ISO8601DateFormat;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
 
 /**
  * Converter class to convert an XML date representation into a Date
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
index 390429e3c4..1f548c15f1 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
@@ -35,9 +35,9 @@ import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.el.PropertyNotFoundException;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigElement;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIImagePicker;
diff --git a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
index d32a6db11c..e0352462f1 100644
--- a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
+++ b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
@@ -46,7 +46,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMUtil;
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 c6ec86de8b..94da14ee19 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIActions.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIActions.java
@@ -39,10 +39,10 @@ import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
-import org.alfresco.config.Config;
+import org.springframework.extensions.config.Config;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.util.URLEncoder;
+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;
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java b/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
index 1ff50c4846..e31f348c6d 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
@@ -28,7 +28,7 @@ import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.util.URLEncoder;
+import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.ui.common.Utils;
 
 /**
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 d41c8e6ac4..77147d45cc 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
@@ -32,8 +32,8 @@ import java.util.Set;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigService;
+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;
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
index dfabc4053f..fe6e5ddb82 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
@@ -39,9 +39,9 @@ import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
-import org.alfresco.config.Config;
-import org.alfresco.config.ConfigLookupContext;
-import org.alfresco.config.ConfigService;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigLookupContext;
+import org.springframework.extensions.config.ConfigService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
diff --git a/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java b/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
index 0b9fc1f1cd..ce012a2b40 100644
--- a/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
+++ b/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
@@ -30,7 +30,7 @@ import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Converter class to convert a Charset to a String
diff --git a/source/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java b/source/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java
index 2f6751b711..52305e5905 100644
--- a/source/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java
+++ b/source/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java
@@ -28,7 +28,7 @@ import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 
-import org.alfresco.i18n.I18NUtil;
+import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.service.cmr.ml.ContentFilterLanguagesService;
 import org.alfresco.web.app.servlet.FacesHelper;
 
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 e999b1b03d..888473461d 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java
@@ -50,7 +50,7 @@ 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.alfresco.util.Pair;
+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;