Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r5cbf4e85d5e743f5880e80f41283fb55f791af03 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -11,7 +11,7 @@
     http://www.hibernate.org/
 -->
 
-<class name="com.lamsinternational.lams.learningdesign.Activity" table="lams_learning_activity">
+<class name="com.lamsinternational.lams.learningdesign.Activity" table="lams_learning_activity" discriminator-value="0">
     <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity"</meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -137,17 +137,10 @@
 			<subclass name="com.lamsinternational.lams.learningdesign.GroupingActivity">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				
-				 <!-- bi-directional many-to-one association to Grouping -->
+				 <!-- bi-directional many-to-one association to Grouping >
                   <many-to-one name="createGrouping" class="com.lamsinternational.lams.learningdesign.Grouping" not-null="true">
-                  	<column name="create_grouping_id" />
-                  </many-to-one>					
-                  
-				<subclass name="com.lamsinternational.lams.learningdesign.ChosenGroupingActivity" discriminator-value="3">
-					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
-				</subclass>
-				<subclass name="com.lamsinternational.lams.learningdesign.RandomGroupingActivity" discriminator-value="2">
-					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
-				</subclass>				
+                  	<column name="grouping_id" />
+                  </many-to-one-->					                  
 			</subclass>
 			<subclass name="com.lamsinternational.lams.learningdesign.GateActivity">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
@@ -175,14 +168,18 @@
 	<subclass name="com.lamsinternational.lams.learningdesign.ComplexActivity">
 		<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
 	    <meta attribute="scope-class" inherit="false">public abstract</meta>
+	    
 	    <!-- bi-directional one-to-many association to Activity -->
-        <list name="activities" lazy="true" inverse="true" cascade="none" >
-        	<index column="order_id"/>                                  
+	    <set name="activities" lazy="true" inverse="true" cascade="none" >
+    		<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
+    										@hibernate.collection-key column="parent_activity_id" 
+    										@hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Activity"
+			</meta>    										
             <key><column name="parent_activity_id" /></key>
             <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
-        </list>
+		</set>
 		
-			<subclass name="com.lamsinternational.lams.learningdesign.OptionsActivity" discriminator-value="8">
+         <subclass name="com.lamsinternational.lams.learningdesign.OptionsActivity" discriminator-value="8">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				<property name="maxNumberOfOptions" type="java.lang.Integer" column="max_number_of_options" length="5">
 					<meta attribute="field-description">@hibernate.property column="max_number_of_options" length="5"</meta>    
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r5cbf4e85d5e743f5880e80f41283fb55f791af03 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -56,7 +56,7 @@
   
     <!-- bi-directional one-to-many association to User -->
     <set
-        name="users"
+        name="userGroups"
         lazy="true"
         inverse="true"
         cascade="none"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r5cbf4e85d5e743f5880e80f41283fb55f791af03 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -9,36 +9,30 @@
 <class 
     name="com.lamsinternational.lams.learningdesign.Grouping" 
     table="lams_grouping"
+    discriminator-value="0"
 >
-    <discriminator column="grouping_type_id" type="int"/>
     <id
         name="groupingId"
         type="java.lang.Long"
         column="grouping_id"
     >
         <generator class="identity" />
     </id>
+    
+    <discriminator column="grouping_type_id" type="int"/>
 
     <property name="maxNumberOfGroups" type="java.lang.Integer" column="max_number_of_groups" length="3"/>
 
     <!-- Associations -->
-
-    <list
-        name="groups"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <key>
-            <column name="grouping_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.Group"
-        />
-        <index
-            column="order_id"                                     
-        />
-    </list>
+    <!-- bi-directional one-to-many association to Group -->
+    <set name="groups" lazy="true" inverse="true" cascade="none">
+    	<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
+    										@hibernate.collection-key column="grouping_id" 
+    										@hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Group"
+    	</meta>
+        <key><column name="grouping_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Group"/>        
+    </set>
    
     <!-- bi-directional one-to-many association to Activity -->
     <set
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r5cbf4e85d5e743f5880e80f41283fb55f791af03 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -49,16 +49,8 @@
         column="title"
         length="255"
     >
-    </property>
+    </property>    
     <property
-        name="firstActivityId"
-        type="java.lang.Long"
-        column="first_activity_id"
-        length="20"
-    >
-         
-    </property>
-    <property
         name="maxId"
         type="java.lang.Integer"
         column="max_id"
@@ -173,9 +165,29 @@
     >
         
     </property>
+    
+    
 
     <!-- Associations -->
-  
+    
+    <!-- bi-directional many-to-one association to Activity-->    
+    
+    <many-to-one name="firstActivity" class="com.lamsinternational.lams.learningdesign.Activity" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true"
+        						            @hibernate.column name="first_activity_id"         
+      	</meta>
+        <column name="first_activity_id" />
+    </many-to-one>
+    
+    <!-- bi-directional many-to-one association to LearningDesign -->
+    
+    <many-to-one name="parentLearningDesign" class="com.lamsinternational.lams.learningdesign.LearningDesign" not-null="true">
+        <meta attribute="field-description">@hibernate.many-to-one not-null="true"
+        						            @hibernate.column name="parent_learning_design_id"         
+      	</meta>
+        <column name="parent_learning_design_id" />
+    </many-to-one>
+    			 
     <!-- bi-directional many-to-one association to User -->
     <many-to-one
         name="user"
@@ -198,14 +210,6 @@
             class="com.lamsinternational.lams.learningdesign.LearningDesign"
         />
     </set>
-    <!-- bi-directional many-to-one association to LearningDesign -->
-    <many-to-one
-        name="parentLearningDesign"
-        class="com.lamsinternational.lams.learningdesign.LearningDesign"
-
-    >
-        <column name="parent_learning_design_id" />
-    </many-to-one>
     <!-- bi-directional one-to-many association to Lesson -->
     <set
         name="lessons"
@@ -224,7 +228,7 @@
     <!-- bi-directional one-to-many association to Transition -->
     <set
         name="transitions"
-        lazy="true"
+        lazy="false"
         inverse="true"
 		cascade="none"
     >
@@ -237,23 +241,10 @@
         />
     </set>
     <!-- bi-directional one-to-many association to Activity -->
-    <list
-        name="activities"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-       
-        <key>
-            <column name="learning_design_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.Activity"
-        />
-        <index
-            column="order_id"                                     
-        />
-    </list>
+    <set name="activities" lazy="false" inverse="true" cascade="none">
+       	<key><column name="learning_design_id" /></key>
+        <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
+    </set>
 
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r5cbf4e85d5e743f5880e80f41283fb55f791af03 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -56,9 +56,9 @@
     <!-- Associations -->
   
     <!-- bi-directional one-to-many association to Activity -->
-    <list
+    <set
         name="activities"
-        lazy="true"
+        lazy="false"
         inverse="true"
 		cascade="none"
     >
@@ -69,8 +69,7 @@
         <one-to-many 
             class="com.lamsinternational.lams.learningdesign.Activity"
         />
-        <index column="order_id"/>
-    </list>
+    </set>
 
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -38,60 +38,7 @@
     </id>
 
 
-    <!-- Associations -->
-  
-    <!-- bi-directional one-to-many association to ProgressCurrent -->
-    <set
-        name="progressCurrents"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="learner_progress_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.lesson.ProgressCurrent"
-        </meta>
-        <key>
-            <column name="learner_progress_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.lesson.ProgressCurrent"
-        />
-    </set>
-    <!-- bi-directional one-to-many association to ProgressCompleted -->
-    <set
-        name="progressCompleteds"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="learner_progress_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.lesson.ProgressCompleted"
-        </meta>
-        <key>
-            <column name="learner_progress_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.lesson.ProgressCompleted"
-        />
-    </set>
+    <!-- Associations -->  
     <!-- bi-directional many-to-one association to User -->
     <many-to-one
         name="user"
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r6f74476c1e42c21faddfa52778ce4584a3e8f563 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 6f74476c1e42c21faddfa52778ce4584a3e8f563)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -4,36 +4,21 @@
     "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
     
 <hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
 
 <class 
     name="com.lamsinternational.lams.lesson.Lesson" 
     table="lams_lesson"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_lesson"
-    </meta>
+
     <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="lessonId"
         type="java.lang.Long"
         column="lesson_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="identity"
-            type="java.lang.Long"
-            column="lesson_id"
 
-
-        </meta>
         <generator class="identity" />
     </id>
 
@@ -44,77 +29,69 @@
         not-null="true"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
+   
     </property>
     <property
         name="startDateTime"
         type="java.sql.Timestamp"
         column="start_date_time"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="start_date_time"
-            length="19"
-        </meta>    
+  
     </property>
     <property
         name="endDateTime"
         type="java.sql.Timestamp"
         column="end_date_time"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="end_date_time"
-            length="19"
-        </meta>    
+   
     </property>
+    
+    <property
+        name="lessonStateId"
+        type="java.lang.Integer"
+        column="lesson_state_id"
+        length="3"
+    >
+   
+    </property>
 
     <!-- Associations -->
-  
+    <!-- bi-directional many-to-many association to User as learners -->
+    <set
+        name="learners"
+        lazy="true"
+        inverse="true"
+        cascade="none"
+        table="lams_lesson_learner"
+    >
+        <key>
+            <column name="lesson_id" />
+        </key>
+        <many-to-many 
+            column="user_id"
+            class="com.lamsinternational.lams.usermanagement.User"
+        />
+    </set>
+    
+    
     <!-- bi-directional many-to-one association to User -->
     <many-to-one
         name="user"
         class="com.lamsinternational.lams.usermanagement.User"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="user_id"         
-        </meta>
         <column name="user_id" />
     </many-to-one>
-    <!-- bi-directional many-to-one association to LessonState -->
-    <many-to-one
-        name="lessonState"
-        class="com.lamsinternational.lams.lesson.LessonState"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="lams_lesson_state_id"         
-        </meta>
-        <column name="lams_lesson_state_id" />
-    </many-to-one>
+   
     <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one
         name="learningDesign"
         class="com.lamsinternational.lams.learningdesign.LearningDesign"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="learning_design_id"         
-        </meta>
+
         <column name="learning_design_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to LearnerProgress -->
@@ -124,36 +101,21 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
 
-           @hibernate.collection-key
-            column="lesson_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.lesson.LearnerProgress"
-        </meta>
         <key>
             <column name="lesson_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.lesson.LearnerProgress"
         />
     </set>
-    <!-- bi-directional many-to-one association to Grouping -->
+    <!-- bi-directional many-to-one association to LessonClass -->
     <many-to-one
-        name="grouping"
-        class="com.lamsinternational.lams.learningdesign.Grouping"
+        name="lessonClass"
+        class="com.lamsinternational.lams.lesson.LessonClass"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="class_grouping_id"         
-        </meta>
+
         <column name="class_grouping_id" />
     </many-to-one>
     <!-- bi-directional many-to-one association to Organisation -->
@@ -162,11 +124,7 @@
         class="com.lamsinternational.lams.usermanagement.Organisation"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="organisation_id"         
-        </meta>
+
         <column name="organisation_id" />
     </many-to-one>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/ToolContent.hbm.xml
===================================================================
diff -u -ra1327e359cb6e41546a6b2e4ba05ae5c7247c185 -r5f90406e7b5bd8c4c2229d1643279d33c1b11246
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision a1327e359cb6e41546a6b2e4ba05ae5c7247c185)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 5f90406e7b5bd8c4c2229d1643279d33c1b11246)
@@ -12,7 +12,7 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.learningdesign.ToolContent" 
+    name="com.lamsinternational.lams.tool.ToolContent" 
     table="lams_tool_content"
 >
     <meta attribute="class-description" inherit="false">