=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java	2014-03-26 16:59:03 +0000
@@ -499,7 +499,7 @@
         {
             // Data element group set
             
-            ListMap<String, BaseNameableObject> deGroupMap = new ListMap<String, BaseNameableObject>();
+            ListMap<String, NameableObject> deGroupMap = new ListMap<String, NameableObject>();
             
             for ( DataElementGroup group : dataElementGroups )
             {
@@ -516,7 +516,7 @@
             
             // Organisation unit group set
             
-            ListMap<String, BaseNameableObject> ouGroupMap = new ListMap<String, BaseNameableObject>();
+            ListMap<String, NameableObject> ouGroupMap = new ListMap<String, NameableObject>();
             
             for ( OrganisationUnitGroup group : organisationUnitGroups )
             {
@@ -533,7 +533,7 @@
             
             // Category option group set
             
-            ListMap<String, BaseNameableObject> coGroupMap = new ListMap<String, BaseNameableObject>();
+            ListMap<String, NameableObject> coGroupMap = new ListMap<String, NameableObject>();
             
             for ( CategoryOptionGroup group : categoryOptionGroups )
             {

=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2014-02-10 10:37:03 +0000
+++ dhis-2/dhis-services/pom.xml	2014-03-26 16:59:03 +0000
@@ -23,20 +23,21 @@
     <!-- Level 1 -->
     <module>dhis-service-core</module>
     <!-- Level 2 -->
+    <module>dhis-service-i18n</module>
+    <module>dhis-service-datamart-default</module>
     <module>dhis-service-administration</module>
-    <module>dhis-service-datamart-default</module>
-    <module>dhis-service-i18n</module>
+    <!-- Level 3 -->
     <module>dhis-service-tracker</module>
-    <!-- Level 3 -->
+    <!-- Level 4 -->
     <module>dhis-service-dxf2</module>
     <module>dhis-service-analytics</module>
     <module>dhis-service-mobile</module>
-    <!-- Level 4 -->
+    <!-- Level 5 -->
     <module>dhis-service-mapgeneration</module>
     <module>dhis-service-eventreporting</module>
-    <!-- Level 5 -->
+    <!-- Level 6 -->
     <module>dhis-service-reporting</module>
-    <!-- Level 6 -->
+    <!-- Level 7 -->
     <module>dhis-service-importexport</module>
   </modules>