Index: trunk/config/configs/democal.options.xml
===================================================================
--- trunk/config/configs/democal.options.xml (revision 1460)
+++ trunk/config/configs/democal.options.xml (revision 1544)
@@ -7,5 +7,5 @@
         <module>
           <!-- A dummy module with no directory. -->
-          <dir-config classname="org.bedework.calcore.DirConfigProperties">
+          <dir-config classname="org.bedework.calfacade.configs.DirConfigProperties">
             <principalRoot>/principals</principalRoot>
             <userPrincipalRoot>/principals/users</userPrincipalRoot>
@@ -33,5 +33,5 @@
 
           <!-- An example of how we might configure an ldap directory module. -->
-          <user-ldap-group classname="org.bedework.calcore.ldap.LdapConfigProperties">
+          <user-ldap-group classname="org.bedework.calfacade.configs.LdapConfigProperties">
             <principalRoot>/principals</principalRoot>
             <userPrincipalRoot>/principals/users</userPrincipalRoot>
@@ -108,9 +108,9 @@
         <maxYears>50</maxYears>
 
-        <userauthClass>org.bedework.calcore.hibernate.UserAuthUWDbImpl</userauthClass>
+        <userauthClass>org.bedework.calsvc.directory.UserAuthUWDbImpl</userauthClass>
         <mailerClass>org.bedework.mail.DummyMailer</mailerClass>
-        <admingroupsClass>org.bedework.calcore.hibernate.AdminGroupsDbImpl</admingroupsClass>
+        <admingroupsClass>org.bedework.calsvc.directory.AdminGroupsDbImpl</admingroupsClass>
         <!--
-        <usergroupsClass>org.bedework.calcore.ldap.UserGroupsLdapImpl</usergroupsClass>
+        <usergroupsClass>org.bedework.calsvc.directory.UserGroupsLdapImpl</usergroupsClass>
         -->
         <usergroupsClass>org.bedework.calcore.hibernate.GroupsDbImpl</usergroupsClass>