diff --git a/.classpath b/.classpath
index 6fa58bd072..72481c33fe 100644
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source/java"/>
-	<classpathentry kind="src" path="source/generated"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Repository"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/3rd Party"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="source/java"/>
+	<classpathentry kind="src" path="source/generated"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Repository"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/3rd Party"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Alfresco JLAN"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java b/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java
index 2146db4b4d..27b5e56e49 100644
--- a/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java
+++ b/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java
@@ -31,7 +31,7 @@ import java.net.URL;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.filesys.util.IPAddress;
+import org.alfresco.jlan.util.IPAddress;
 
 /**
  * Abstract base class for the hierarchical methods COPY and MOVE
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
index 94af463f75..04e475b01d 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.filesys.server.config.ServerConfiguration;
+import org.alfresco.filesys.ServerConfigurationBean;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.ServiceRegistry;
@@ -277,13 +277,13 @@ public class WebDAVServlet extends HttpServlet
         
         // Initialize the root node
         
-        ServerConfiguration fileSrvConfig = (ServerConfiguration) context.getBean(ServerConfiguration.SERVER_CONFIGURATION);
+        ServerConfigurationBean fileSrvConfig = (ServerConfigurationBean) context.getBean(ServerConfigurationBean.SERVER_CONFIGURATION);
         if ( fileSrvConfig == null)
             throw new ServletException("File server configuration not available");
 
         // Use the system user as the authenticated context for the filesystem initialization
 
-        AuthenticationComponent authComponent = fileSrvConfig.getAuthenticationComponent();
+        AuthenticationComponent authComponent = (AuthenticationComponent) context.getBean("authenticationComponent");
         authComponent.setCurrentUser( authComponent.getSystemUserName());
         
         // Wrap the initialization in a transaction
diff --git a/source/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java
index 2c5430b290..f812bc4076 100644
--- a/source/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java
+++ b/source/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java
@@ -50,13 +50,13 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.filesys.server.auth.kerberos.KerberosDetails;
-import org.alfresco.filesys.server.auth.kerberos.SessionSetupPrivilegedAction;
-import org.alfresco.filesys.server.auth.spnego.NegTokenInit;
-import org.alfresco.filesys.server.auth.spnego.NegTokenTarg;
-import org.alfresco.filesys.server.auth.spnego.OID;
-import org.alfresco.filesys.server.auth.spnego.SPNEGO;
-import org.alfresco.filesys.server.config.ServerConfiguration;
+import org.alfresco.filesys.ServerConfigurationBean;
+import org.alfresco.jlan.server.auth.kerberos.KerberosDetails;
+import org.alfresco.jlan.server.auth.kerberos.SessionSetupPrivilegedAction;
+import org.alfresco.jlan.server.auth.spnego.NegTokenInit;
+import org.alfresco.jlan.server.auth.spnego.NegTokenTarg;
+import org.alfresco.jlan.server.auth.spnego.OID;
+import org.alfresco.jlan.server.auth.spnego.SPNEGO;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.security.authentication.AuthenticationException;
@@ -107,7 +107,7 @@ public class KerberosAuthenticationFilter implements Filter, CallbackHandler
     
     // File server configuration
     
-    private ServerConfiguration m_srvConfig;
+    private ServerConfigurationBean m_srvConfig;
     
     // Various services required by the Kerberos authenticator
     
@@ -177,7 +177,7 @@ public class KerberosAuthenticationFilter implements Filter, CallbackHandler
         m_authComponent = (AuthenticationComponent) ctx.getBean("AuthenticationComponent");
         m_personService = (PersonService) ctx.getBean("personService");
         
-        m_srvConfig = (ServerConfiguration) ctx.getBean(ServerConfiguration.SERVER_CONFIGURATION);
+        m_srvConfig = (ServerConfigurationBean) ctx.getBean(ServerConfigurationBean.SERVER_CONFIGURATION);
         
         // Check that the authentication component supports the required mode
         
diff --git a/source/java/org/alfresco/repo/webdav/auth/NTLMAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/NTLMAuthenticationFilter.java
index d4774d3514..cee71fe1d4 100644
--- a/source/java/org/alfresco/repo/webdav/auth/NTLMAuthenticationFilter.java
+++ b/source/java/org/alfresco/repo/webdav/auth/NTLMAuthenticationFilter.java
@@ -44,16 +44,16 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.transaction.UserTransaction;
 
-import org.alfresco.filesys.server.auth.PasswordEncryptor;
-import org.alfresco.filesys.server.auth.ntlm.NTLM;
-import org.alfresco.filesys.server.auth.ntlm.NTLMLogonDetails;
-import org.alfresco.filesys.server.auth.ntlm.NTLMMessage;
-import org.alfresco.filesys.server.auth.ntlm.TargetInfo;
-import org.alfresco.filesys.server.auth.ntlm.Type1NTLMMessage;
-import org.alfresco.filesys.server.auth.ntlm.Type2NTLMMessage;
-import org.alfresco.filesys.server.auth.ntlm.Type3NTLMMessage;
-import org.alfresco.filesys.server.config.ServerConfiguration;
-import org.alfresco.filesys.util.DataPacker;
+import org.alfresco.filesys.ServerConfigurationBean;
+import org.alfresco.jlan.server.auth.PasswordEncryptor;
+import org.alfresco.jlan.server.auth.ntlm.NTLM;
+import org.alfresco.jlan.server.auth.ntlm.NTLMLogonDetails;
+import org.alfresco.jlan.server.auth.ntlm.NTLMMessage;
+import org.alfresco.jlan.server.auth.ntlm.TargetInfo;
+import org.alfresco.jlan.server.auth.ntlm.Type1NTLMMessage;
+import org.alfresco.jlan.server.auth.ntlm.Type2NTLMMessage;
+import org.alfresco.jlan.server.auth.ntlm.Type3NTLMMessage;
+import org.alfresco.jlan.util.DataPacker;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.security.authentication.AuthenticationException;
@@ -109,7 +109,7 @@ public class NTLMAuthenticationFilter implements Filter
     
     // File server configuration
     
-    private ServerConfiguration m_srvConfig;
+    private ServerConfigurationBean m_srvConfig;
     
     // Various services required by NTLM authenticator
     
@@ -163,7 +163,7 @@ public class NTLMAuthenticationFilter implements Filter
         m_authComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         m_personService = (PersonService) ctx.getBean("personService");
         
-        m_srvConfig = (ServerConfiguration) ctx.getBean(ServerConfiguration.SERVER_CONFIGURATION);
+        m_srvConfig = (ServerConfigurationBean) ctx.getBean(ServerConfigurationBean.SERVER_CONFIGURATION);
         
         // Check that the authentication component supports the required mode