Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r8756278b764fa9a27108c99d0e7a501c84ca884f -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 8756278b764fa9a27108c99d0e7a501c84ca884f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -170,8 +170,8 @@
 	    <meta attribute="scope-class" inherit="false">public abstract</meta>
 	    
 	    <!-- bi-directional one-to-many association to Activity-->
-	    <set name="activities" lazy="true" inverse="true" cascade="none" >
-    		<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
+	    <set name="activities" lazy="false" inverse="true" cascade="none" >
+    		<meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
     										@hibernate.collection-key column="parent_activity_id" 
     										@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"
 			</meta>    										
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -re840fc03d3eb7ae1a3757be5ee65415caea89981 -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision e840fc03d3eb7ae1a3757be5ee65415caea89981)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -73,12 +73,11 @@
     <subclass name="org.lamsfoundation.lams.learningdesign.ChosenGrouping" discriminator-value="2"/>
         
     <subclass name="org.lamsfoundation.lams.lesson.LessonClass" discriminator-value="3">
+        <!-- bi-directional many-to-one (effectiviey a  one to one) assocaites to Group in staff group role -->
         <many-to-one name="staffGroup" class="org.lamsfoundation.lams.learningdesign.Group" column="staff_group_id" unique="true"/>
-        <one-to-one name="lesson"
-        	class="org.lamsfoundation.lams.lesson.Lesson"
-        	property-ref="lessonClass" />
-    <!-- set
-        name="lessons"
+         <!-- bi-directional one-to-many association to Lesson -->
+    <set
+        name="lesson"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -89,7 +88,7 @@
         <one-to-many 
             class="org.lamsfoundation.lams.lesson.Lesson"
         />
-    </set-->
+    </set>
     </subclass>
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r8756278b764fa9a27108c99d0e7a501c84ca884f -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 8756278b764fa9a27108c99d0e7a501c84ca884f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -169,13 +169,16 @@
     </many-to-one>
     			 
     <!-- bi-directional many-to-one association to User -->
-    <many-to-one
-        name="user"
-        class="org.lamsfoundation.lams.usermanagement.User"
-        not-null="true"
-    >
+    <many-to-one name="user" class="org.lamsfoundation.lams.usermanagement.User" not-null="true">
         <column name="user_id" />
     </many-to-one>
+    
+    <!-- bi-directional many-to-one association to WorkspaceFolder-->
+    <many-to-one name="workspaceFolder" class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder" not-null="true">
+        <column name="workspace_folder_id" />
+    </many-to-one>
+    
+    
     <!-- bi-directional one-to-many association to LearningDesign -->
     <set
         name="childLearningDesigns"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -rc920e261a0dace3fff28c2e79db7bc1e1fdc1351 -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision c920e261a0dace3fff28c2e79db7bc1e1fdc1351)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -358,84 +358,18 @@
             class="org.lamsfoundation.lams.lesson.LearnerProgress"
         />
     </set>
-    <!-- bi-directional one-to-many association to UserToolSession -->
-    <!-- set
-        name="userToolSessions"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="user_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.lesson.UserToolSession"
-        </meta>
-        <key>
-            <column name="user_id" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.lesson.UserToolSession"
-        />
-    </set-->
-    <!-- bi-directional one-to-many association to UserGroup -->
-    <!-- set
-        name="userGroups"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="user_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.lesson.UserGroup"
-        </meta>
-        <key>
-            <column name="user_id" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.lesson.UserGroup"
-        />
-    </set-->
+    
+   
     <!-- bi-directional one-to-many association to LearningDesign -->
-    <set
-        name="learningDesigns"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="user_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.learningdesign.LearningDesign"
+    <set name="learningDesigns" lazy="true" inverse="true" cascade="none">
+        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
+        								    @hibernate.collection-key column="user_id"
+        								    @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"
         </meta>
-        <key>
-            <column name="user_id" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.learningdesign.LearningDesign"
-        />
+        <key><column name="user_id" /></key>
+        <one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"/>
     </set>
+    
     <!-- bi-directional one-to-many association to Lesson -->
     <set
         name="lessons"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -r2db1c52567bf8f79ccb7589d1d8785be4ed1118c -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 2db1c52567bf8f79ccb7589d1d8785be4ed1118c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -131,6 +131,17 @@
         </meta>
         <column name="parent_folder_id" />
     </many-to-one>
+    
+    <!-- bi-directional one-to-many association to LearningDesign -->
+    <set name="learningDesigns" lazy="false" inverse="true" cascade="none">
+        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
+        								    @hibernate.collection-key column="user_id"
+        								    @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"
+        </meta>
+        <key><column name="workspace_folder_id" /></key>
+        <one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign"/>
+    </set>
+    
 
 </class>
 </hibernate-mapping>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r701298e4804b6e63459ae7ce8fe82ae1765a3a82 -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 701298e4804b6e63459ae7ce8fe82ae1765a3a82)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -1,6 +1,8 @@
 package org.lamsfoundation.lams.learningdesign;
 
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
@@ -87,6 +89,9 @@
     /** persistent field */
     private Set activities;
     
+    /** persistent field */
+    private WorkspaceFolder workspaceFolder;
+    
     /** non-persistent field containing a list
      * of optional activities in the design*/
     private Set optionalActivities;
@@ -523,4 +528,16 @@
 		
 	}
 
+	/**
+	 * @return Returns the workspaceFolder.
+	 */
+	public WorkspaceFolder getWorkspaceFolder() {
+		return workspaceFolder;
+	}
+	/**
+	 * @param workspaceFolder The workspaceFolder to set.
+	 */
+	public void setWorkspaceFolder(WorkspaceFolder workspaceFolder) {
+		this.workspaceFolder = workspaceFolder;
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -r8e764cef94c3501df91598521080a8bf2c5160b2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(.../WorkspaceFolder.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(.../WorkspaceFolder.java)	(revision 8e764cef94c3501df91598521080a8bf2c5160b2)
@@ -30,7 +30,21 @@
 
     /** persistent field */
     private Set childWorkspaceFolders;
+    
+    private Set learningDesigns;
 
+	/**
+	 * @return Returns the learningDesigns.
+	 */
+	public Set getLearningDesigns() {
+		return learningDesigns;
+	}
+	/**
+	 * @param learningDesigns The learningDesigns to set.
+	 */
+	public void setLearningDesigns(Set learningDesigns) {
+		this.learningDesigns = learningDesigns;
+	}
     /** full constructor */
     public WorkspaceFolder(String name, int workspaceId, WorkspaceFolder parentWorkspaceFolder, Set workspaces, Set childWorkspaceFolders) {
         this.name = name;