Index: lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethod.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod" 
+    name="com.lamsinternational.lams.usermanagement.AuthenticationMethod" 
     table="lams_authentication_method"
-    proxy="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod"
+    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_authentication_method"
-        proxy="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod"
+        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -46,7 +46,7 @@
     <!-- bi-directional many-to-one association to AuthenticationMethodType -->
     <many-to-one
         name="authenticationMethodType"
-        class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodType"
+        class="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
         not-null="true"
     >
         <meta attribute="field-description">
@@ -73,18 +73,18 @@
             column="authentication_method_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.User"
+            class="com.lamsinternational.lams.usermanagement.User"
         </meta>
         <key>
             <column name="authentication_method_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.User"
+            class="com.lamsinternational.lams.usermanagement.User"
         />
     </set>
     <!-- bi-directional one-to-many association to AuthenticationMethodParameter -->
     <set
-        name="authenticationMethodType"
+        name="authenticationMethodParameters"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -99,13 +99,13 @@
             column="authentication_method_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodParameter"
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter"
         </meta>
         <key>
             <column name="authentication_method_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodParameter"
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter"
         />
     </set>
 
Index: lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodParameter.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodParameter.hbm.xml	(.../AuthenticationMethodParameter.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodParameter.hbm.xml	(.../AuthenticationMethodParameter.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodParameter" 
+    name="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter" 
     table="lams_authentication_method_parameter"
-    proxy="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodParameter"
+    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_authentication_method_parameter"
-        proxy="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodParameter"
+        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -72,7 +72,7 @@
     <!-- bi-directional many-to-one association to AuthenticationMethod -->
     <many-to-one
         name="authenticationMethod"
-        class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod"
+        class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
         not-null="true"
     >
         <meta attribute="use-in-equals">true</meta>
Index: lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodType.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodType" 
+    name="com.lamsinternational.lams.usermanagement.AuthenticationMethodType" 
     table="lams_authentication_method_type"
-    proxy="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodType"
+    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_authentication_method_type"
-        proxy="com.lamsinternational.lams.usermanagement.model.AuthenticationMethodType"
+        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -74,13 +74,13 @@
             column="authentication_method_type_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod"
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
         </meta>
         <key>
             <column name="authentication_method_type_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod"
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
         />
     </set>
 
Index: lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -rf86c30fda6211f683790ccb70376472f1698a622 -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision f86c30fda6211f683790ccb70376472f1698a622)
+++ lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.Organisation" 
+    name="com.lamsinternational.lams.usermanagement.Organisation" 
     table="lams_organisation"
-    proxy="com.lamsinternational.lams.usermanagement.model.Organisation"
+    proxy="com.lamsinternational.lams.usermanagement.Organisation"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_organisation"
-        proxy="com.lamsinternational.lams.usermanagement.model.Organisation"
+        proxy="com.lamsinternational.lams.usermanagement.Organisation"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -84,7 +84,7 @@
     <!-- bi-directional many-to-one association to Workspace -->
     <many-to-one
         name="workspace"
-        class="com.lamsinternational.lams.usermanagement.model.Workspace"
+        class="com.lamsinternational.lams.usermanagement.Workspace"
         not-null="true"
     >
         <meta attribute="field-description">
@@ -97,7 +97,7 @@
     <!-- bi-directional many-to-one association to OrganisationType -->
     <many-to-one
         name="organisationType"
-        class="com.lamsinternational.lams.usermanagement.model.OrganisationType"
+        class="com.lamsinternational.lams.usermanagement.OrganisationType"
         not-null="true"
     >
         <meta attribute="field-description">
@@ -124,13 +124,13 @@
             column="organisation_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
         </meta>
         <key>
             <column name="organisation_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
         />
     </set>
     <!-- bi-directional one-to-many association to WorkspaceFolder -->
@@ -150,19 +150,19 @@
             column="parent_folder_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.Organisation"
+            class="com.lamsinternational.lams.usermanagement.Organisation"
         </meta>
         <key>
             <column name="parent_folder_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.Organisation"
+            class="com.lamsinternational.lams.usermanagement.Organisation"
         />
     </set>
     <!-- bi-directional many-to-one association to Organisation -->
     <many-to-one
         name="parentOrganisation"
-        class="com.lamsinternational.lams.usermanagement.model.Organisation"
+        class="com.lamsinternational.lams.usermanagement.Organisation"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
Index: lams_common/conf/hibernate/mappings/usermanagement/OrganisationType.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.OrganisationType" 
+    name="com.lamsinternational.lams.usermanagement.OrganisationType" 
     table="lams_organisation_type"
-    proxy="com.lamsinternational.lams.usermanagement.model.OrganisationType"
+    proxy="com.lamsinternational.lams.usermanagement.OrganisationType"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_organisation_type"
-        proxy="com.lamsinternational.lams.usermanagement.model.OrganisationType"
+        proxy="com.lamsinternational.lams.usermanagement.OrganisationType"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -30,27 +30,43 @@
     >
         <meta attribute="field-description">
            @hibernate.id
-            generator-class="native"
+            generator-class="increment"
             type="java.lang.Integer"
             column="organisation_type_id"
 
 
         </meta>
         <meta attribute="use-in-equals">true</meta>
-        <generator class="native" />
+        <generator class="increment" />
     </id>
 
     <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        unique="true"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            unique="true"
+            length="64"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
         name="description"
         type="java.lang.String"
         column="description"
         not-null="true"
-        length="64"
+        length="255"
     >
         <meta attribute="field-description">
            @hibernate.property
             column="description"
-            length="64"
+            length="255"
             not-null="true"
         </meta>    
     </property>
@@ -74,13 +90,13 @@
             column="organisation_type_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.Organisation"
+            class="com.lamsinternational.lams.usermanagement.Organisation"
         </meta>
         <key>
             <column name="organisation_type_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.Organisation"
+            class="com.lamsinternational.lams.usermanagement.Organisation"
         />
     </set>
 
Index: lams_common/conf/hibernate/mappings/usermanagement/Role.hbm.xml
===================================================================
diff -u -r13014ed9dc02a713ae3030b01a5f6c16cb3ba747 -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 13014ed9dc02a713ae3030b01a5f6c16cb3ba747)
+++ lams_common/conf/hibernate/mappings/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.Role" 
+    name="com.lamsinternational.lams.usermanagement.Role" 
     table="lams_role"
-    proxy="com.lamsinternational.lams.usermanagement.model.Role"
+    proxy="com.lamsinternational.lams.usermanagement.Role"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_role"
-        proxy="com.lamsinternational.lams.usermanagement.model.Role"
+        proxy="com.lamsinternational.lams.usermanagement.Role"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -86,13 +86,13 @@
             column="role_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
         </meta>
         <key>
             <column name="role_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
         />
     </set>
 
Index: lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml
===================================================================
diff -u -rf86c30fda6211f683790ccb70376472f1698a622 -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision f86c30fda6211f683790ccb70376472f1698a622)
+++ lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.User" 
+    name="com.lamsinternational.lams.usermanagement.User" 
     table="lams_user"
-    proxy="com.lamsinternational.lams.usermanagement.model.User"
+    proxy="com.lamsinternational.lams.usermanagement.User"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user"
-        proxy="com.lamsinternational.lams.usermanagement.model.User"
+        proxy="com.lamsinternational.lams.usermanagement.User"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -44,12 +44,14 @@
         type="java.lang.String"
         column="login"
         not-null="true"
+        unique="true"
         length="20"
     >
         <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.property
             column="login"
+            unique="true"
             length="20"
             not-null="true"
         </meta>    
@@ -270,7 +272,7 @@
     <!-- bi-directional many-to-one association to Workspace -->
     <many-to-one
         name="workspace"
-        class="com.lamsinternational.lams.usermanagement.model.Workspace"
+        class="com.lamsinternational.lams.usermanagement.Workspace"
         not-null="true"
     >
         <meta attribute="field-description">
@@ -297,19 +299,19 @@
             column="user_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
         </meta>
         <key>
             <column name="user_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
         />
     </set>
     <!-- bi-directional many-to-one association to AuthenticationMethod -->
     <many-to-one
         name="authenticationMethod"
-        class="com.lamsinternational.lams.usermanagement.model.AuthenticationMethod"
+        class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
         not-null="true"
     >
         <meta attribute="field-description">
Index: lams_common/conf/hibernate/mappings/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r13014ed9dc02a713ae3030b01a5f6c16cb3ba747 -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 13014ed9dc02a713ae3030b01a5f6c16cb3ba747)
+++ lams_common/conf/hibernate/mappings/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.UserOrganisation" 
+    name="com.lamsinternational.lams.usermanagement.UserOrganisation" 
     table="lams_user_organisation"
-    proxy="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+    proxy="com.lamsinternational.lams.usermanagement.UserOrganisation"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user_organisation"
-        proxy="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+        proxy="com.lamsinternational.lams.usermanagement.UserOrganisation"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -45,7 +45,7 @@
     <!-- bi-directional many-to-one association to User -->
     <many-to-one
         name="user"
-        class="com.lamsinternational.lams.usermanagement.model.User"
+        class="com.lamsinternational.lams.usermanagement.User"
         not-null="true"
     >
         <meta attribute="use-in-equals">true</meta>
@@ -73,19 +73,19 @@
             column="user_organisation_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
         </meta>
         <key>
             <column name="user_organisation_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole"
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
         />
     </set>
     <!-- bi-directional many-to-one association to Organisation -->
     <many-to-one
         name="organisation"
-        class="com.lamsinternational.lams.usermanagement.model.Organisation"
+        class="com.lamsinternational.lams.usermanagement.Organisation"
         not-null="true"
     >
         <meta attribute="use-in-equals">true</meta>
Index: lams_common/conf/hibernate/mappings/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole" 
+    name="com.lamsinternational.lams.usermanagement.UserOrganisationRole" 
     table="lams_user_organisation_role"
-    proxy="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole"
+    proxy="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user_organisation_role"
-        proxy="com.lamsinternational.lams.usermanagement.model.UserOrganisationRole"
+        proxy="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -45,7 +45,7 @@
     <!-- bi-directional many-to-one association to UserOrganisation -->
     <many-to-one
         name="userOrganisation"
-        class="com.lamsinternational.lams.usermanagement.model.UserOrganisation"
+        class="com.lamsinternational.lams.usermanagement.UserOrganisation"
         not-null="true"
     >
         <meta attribute="use-in-equals">true</meta>
@@ -59,7 +59,7 @@
     <!-- bi-directional many-to-one association to Role -->
     <many-to-one
         name="role"
-        class="com.lamsinternational.lams.usermanagement.model.Role"
+        class="com.lamsinternational.lams.usermanagement.Role"
         not-null="true"
     >
         <meta attribute="use-in-equals">true</meta>
Index: lams_common/conf/hibernate/mappings/usermanagement/Workspace.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.Workspace" 
+    name="com.lamsinternational.lams.usermanagement.Workspace" 
     table="lams_workspace"
-    proxy="com.lamsinternational.lams.usermanagement.model.Workspace"
+    proxy="com.lamsinternational.lams.usermanagement.Workspace"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_workspace"
-        proxy="com.lamsinternational.lams.usermanagement.model.Workspace"
+        proxy="com.lamsinternational.lams.usermanagement.Workspace"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -60,13 +60,13 @@
             column="workspace_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.User"
+            class="com.lamsinternational.lams.usermanagement.User"
         </meta>
         <key>
             <column name="workspace_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.User"
+            class="com.lamsinternational.lams.usermanagement.User"
         />
     </set>
     <!-- bi-directional one-to-many association to Organisation -->
@@ -86,19 +86,19 @@
             column="workspace_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.Organisation"
+            class="com.lamsinternational.lams.usermanagement.Organisation"
         </meta>
         <key>
             <column name="workspace_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.Organisation"
+            class="com.lamsinternational.lams.usermanagement.Organisation"
         />
     </set>
     <!-- bi-directional many-to-one association to WorkspaceFolder -->
     <many-to-one
         name="workspaceFolder"
-        class="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder"
+        class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
         not-null="true"
     >
         <meta attribute="field-description">
Index: lams_common/conf/hibernate/mappings/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rb0b79b32f7136af6d53a9d7827b61822b36e2fe2
--- lams_common/conf/hibernate/mappings/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision b0b79b32f7136af6d53a9d7827b61822b36e2fe2)
@@ -12,14 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder" 
+    name="com.lamsinternational.lams.usermanagement.WorkspaceFolder" 
     table="lams_workspace_folder"
-    proxy="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder"
+    proxy="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_workspace_folder"
-        proxy="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder"
+        proxy="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -87,13 +87,13 @@
             column="root_folder_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.Workspace"
+            class="com.lamsinternational.lams.usermanagement.Workspace"
         </meta>
         <key>
             <column name="root_folder_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.Workspace"
+            class="com.lamsinternational.lams.usermanagement.Workspace"
         />
     </set>
     <!-- bi-directional one-to-many association to WorkspaceFolder -->
@@ -113,19 +113,19 @@
             column="parent_folder_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder"
+            class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
         </meta>
         <key>
             <column name="parent_folder_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder"
+            class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
         />
     </set>
     <!-- bi-directional many-to-one association to WorkspaceFolder -->
     <many-to-one
         name="parentWorkspaceFolder"
-        class="com.lamsinternational.lams.usermanagement.model.WorkspaceFolder"
+        class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one