--- a/app/soc/modules/ghop/models/org_prize_assignment.py	Fri Jun 05 22:07:15 2009 +0200
+++ b/app/soc/modules/ghop/models/org_prize_assignment.py	Fri Jun 05 22:54:19 2009 +0200
@@ -26,8 +26,8 @@
 
 import soc.models.base
 
-import ghop.models.organization
-import ghop.models.program
+from soc.modules.ghop.models import organization as ghop_organization_model
+from soc.modules.ghop.models import program as ghop_program_model
 
 
 class GHOPOrgPrizeAssignment(soc.models.base.ModelWithFieldAttributes):
@@ -35,13 +35,13 @@
   """
 
   #: Program to which these winners belong to
-  program = db.ReferenceProperty(reference_class=ghop.models.program.GHOPProgram,
-                                 required=True,
-                                 collection_name='program_prizes')
+  program = db.ReferenceProperty(
+      reference_class=ghop_program_model.GHOPProgram,
+      required=True, collection_name='program_prizes')
 
   #: Organization to which these winners belong to
   org = db.ReferenceProperty(
-      reference_class=ghop.models.organization.GHOPOrganization,
+      reference_class=ghop_organization_model.GHOPOrganization,
       required=True, collection_name='organization_prizes')
 
   #: Ordered list of winners(reference to Student entities) for the given

--- a/app/soc/modules/ghop/models/task.py	Fri Jun 05 22:07:15 2009 +0200
+++ b/app/soc/modules/ghop/models/task.py	Fri Jun 05 22:54:19 2009 +0200
@@ -32,7 +32,7 @@
 import soc.models.student
 import soc.models.user
 
-import ghop.models.program
+from soc.modules.ghop.models import program as ghop_program_model
 
 
 class GHOPTask(soc.models.linkable.Linkable):
@@ -92,9 +92,9 @@
                                  collection_name='assigned_tasks')
 
   #: Program in which this Task has been created
-  program = db.ReferenceProperty(reference_class=ghop.models.program.GHOPProgram,
-                                 required=True,
-                                 collection_name='tasks')
+  program = db.ReferenceProperty(
+      reference_class=ghop_program_model.GHOPProgram,
+      required=True, collection_name='tasks')
 
   #: Required property which holds the state, the Task is currently in.
   #: This is a hidden field not shown on forms. Handled by logic internally.

--- a/app/soc/modules/ghop/models/work_submission.py	Fri Jun 05 22:07:15 2009 +0200
+++ b/app/soc/modules/ghop/models/work_submission.py	Fri Jun 05 22:54:19 2009 +0200
@@ -30,8 +30,8 @@
 import soc.models.linkable
 import soc.models.user
 
-import ghop.models.program
-import ghop.models.task
+from soc.modules.ghop.models import program as ghop_program_model
+from soc.modules.ghop.models import task as task_model
 
 
 class GHOPWorkSubmission(soc.models.linkable.Linkable):
@@ -41,7 +41,7 @@
   """
 
   #: Task to which this work was submitted
-  task = db.ReferenceProperty(reference_class=ghop.models.task.GHOPTask,
+  task = db.ReferenceProperty(reference_class=task_model.GHOPTask,
                               required=True,
                               collection_name='work_submissions')
 
@@ -51,9 +51,9 @@
                               collection_name='work_submissions')
 
   #: Program to which this work belongs to
-  program = db.ReferenceProperty(reference_class=ghop.models.program.GHOPProgram,
-                                 required=True,
-                                 collection_name='work_submissions')
+  program = db.ReferenceProperty(
+      reference_class=ghop_program_model.GHOPProgram,
+      required=True, collection_name='work_submissions')
 
   #: Property allowing you to store information about your work
   information = db.TextProperty(