locations.diff

diff --git a/apps/bednets/constants.py b/apps/bednets/constants.py
index 20709dd..0f33557 100644
--- a/apps/bednets/constants.py
+++ b/apps/bednets/constants.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # vim: ai et sts=4 sw=4 ts=4
-from reporters.models import Location
+from locations.models import Location
 
 KANO_PILOT_LGAS = [ 2001, 2004, 2005, 2007, 2009, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 
                   2021, 2023, 2024, 2027, 2030, 2031, 2035, 2040, 2043]
diff --git a/apps/bednets/formslogic.py b/apps/bednets/formslogic.py
index a9a0772..5beb7af 100644
--- a/apps/bednets/formslogic.py
+++ b/apps/bednets/formslogic.py
@@ -4,6 +4,7 @@
 from models import *
 from rapidsms.message import StatusCodes
 from reporters.models import *
+from locations.models import *
 from form.formslogic import FormsLogic
 import re
 
diff --git a/apps/bednets/models.py b/apps/bednets/models.py
index 84d0c13..0b539ac 100644
--- a/apps/bednets/models.py
+++ b/apps/bednets/models.py
@@ -1,6 +1,7 @@
 # vim: ai sts=4 ts=4 et sw=4
 from django.db import models
-from reporters.models import Location, Reporter, PersistantConnection
+from locations.models import Location
+from reporters.models import Reporter, PersistantConnection
 import time as taim
 
 class NetDistribution(models.Model):
diff --git a/apps/bednets/tests.py b/apps/bednets/tests.py
index 397e771..b02f249 100644
--- a/apps/bednets/tests.py
+++ b/apps/bednets/tests.py
@@ -1,6 +1,7 @@
 from rapidsms.tests.scripted import TestScript
 from form.models import *
 from reporters.models import *
+from locations.models import *
 import reporters.app as reporter_app
 import supply.app as supply_app
 import form.app as form_app
diff --git a/apps/bednets/views.py b/apps/bednets/views.py
index 2cd8ba3..866ad6f 100644
--- a/apps/bednets/views.py
+++ b/apps/bednets/views.py
@@ -4,7 +4,7 @@
 from django.contrib.auth.decorators import permission_required
 from django.http import HttpResponse, HttpResponseNotAllowed, HttpResponseServerError, Http404
 from django.template import RequestContext
-from reporters.models import Location, LocationType
+from locations.models import Location, LocationType
 from supply.models import Shipment, Transaction, Stock, PartialTransaction
 from bednets import constants
 from bednets.models import NetDistribution, CardDistribution 
diff --git a/apps/iavi/models.py b/apps/iavi/models.py
index 2f676e2..53d9c54 100644
--- a/apps/iavi/models.py
+++ b/apps/iavi/models.py
@@ -1,5 +1,6 @@
 from django.db import models
-from reporters.models import Reporter, PersistantConnection, Location 
+from reporters.models import Reporter, PersistantConnection
+from locations.models import Location
 from tree.models import Session
 from django.contrib.auth.models import User
 
@@ -110,4 +111,4 @@ class UgandaReport(Report):
     condom_with_partner = models.BooleanField(null=True, blank=True)
     sex_with_other = models.BooleanField(null=True, blank=True)
     condom_with_other = models.BooleanField(null=True, blank=True)
-    
\ No newline at end of file
+    
diff --git a/apps/supply/models.py b/apps/supply/models.py
index d165066..cad486c 100644
--- a/apps/supply/models.py
+++ b/apps/supply/models.py
@@ -7,7 +7,8 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from form.models import Domain
-from reporters.models import Location, Reporter, PersistantConnection
+from reporters.models import Reporter, PersistantConnection
+from locations.models import Location
 from datetime import date
 import re
 
diff --git a/apps/supply/tests.py b/apps/supply/tests.py
index 450f17d..7fa779e 100644
--- a/apps/supply/tests.py
+++ b/apps/supply/tests.py
@@ -1,6 +1,7 @@
 from rapidsms.tests.scripted import TestScript
 from form.models import *
 from reporters.models import *
+from locations.models import *
 import reporters.app as reporter_app
 import bednets.app as nigeria_app
 import form.app as form_app