diff -r 8ecc2e4198cd -r e076aee6e90f app/soc/models/organization.py
--- a/app/soc/models/organization.py	Mon Sep 29 15:34:40 2008 +0000
+++ b/app/soc/models/organization.py	Mon Sep 29 15:46:42 2008 +0000
@@ -22,26 +22,19 @@
 
 from google.appengine.ext import db
 
-from soc.models import base
 from soc import models
 import soc.models.group
-import soc.models.administrator
 
-class Organization(base.ModelWithFieldAttributes):
+class Organization(soc.models.group.Group):
   """Organization details.
 
   A Organization entity participates in the following relationships implemented 
   as a db.ReferenceProperty elsewhere in another db.Model:
 
-   admins)  a many:1 relationship associating Administrators with
+   reviewers)  a many:1 relationship associating Reviewers with
      a specific Organization. This relation is implemented as the
-     'admins' back-reference Query of the Organization model 'org' reference.
-
+     'reviewers' back-reference Query of the Organization model 'org'
+     reference.
   """
+  pass
 
-  #: A 1:1 relationship associating a Organization with more generic
-  #: Group details and capabilities.  The back-reference in
-  #: the Group model is a Query named 'org'.
-  group = db.ReferenceProperty(reference_class=models.group.Group, 
-                               required=True, collection_name="org")
-