diff --git a/evennia/trunk/apps/helpsys/models.py b/evennia/trunk/apps/helpsys/models.py
index 5b0643451..0ee941436 100644
--- a/evennia/trunk/apps/helpsys/models.py
+++ b/evennia/trunk/apps/helpsys/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-import evennia.ansi
+import ansi
 
 # Create your models here.
 class HelpEntry(models.Model):
diff --git a/evennia/trunk/apps/objects/models.py b/evennia/trunk/apps/objects/models.py
index 3c17f3614..9d7168125 100755
--- a/evennia/trunk/apps/objects/models.py
+++ b/evennia/trunk/apps/objects/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
-import evennia.defines_global as global_defines
-import evennia.ansi
+import defines_global as global_defines
+import ansi
 
 class Attribute(models.Model):
    """
@@ -57,7 +57,7 @@ class Object(models.Model):
       )
    
    class Admin:
-      list_display = ('id', 'name', 'type', 'owner', 'date_created')
+      list_display = ('id', 'name', 'type', 'date_created')
    
    """
    BEGIN COMMON METHODS
@@ -583,5 +583,5 @@ class Object(models.Model):
    def __str__(self):
       return "%s(#%d%s)" % (self.get_ansiname(), self.id, self.flag_string())
 
-import evennia.functions_db
-import evennia.session_mgr
+import functions_db
+import session_mgr
diff --git a/evennia/trunk/commands_general.py b/evennia/trunk/commands_general.py
index ad476122f..8bd411eb9 100644
--- a/evennia/trunk/commands_general.py
+++ b/evennia/trunk/commands_general.py
@@ -3,7 +3,7 @@ import time
 import functions_general
 import functions_db
 import functions_help
-import evennia.defines_global as global_defines
+import defines_global as global_defines
 import session_mgr
 import ansi
 import os
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
index 2dee0e835..476806277 100755
Binary files a/evennia/trunk/evennia.sql and b/evennia/trunk/evennia.sql differ
diff --git a/evennia/trunk/evennia.vhost.apache b/evennia/trunk/evennia.vhost.apache
index 3076fad45..34febbce0 100755
--- a/evennia/trunk/evennia.vhost.apache
+++ b/evennia/trunk/evennia.vhost.apache
@@ -24,8 +24,8 @@
         <Directory "/home/evennia/evennia">
                 SetHandler python-program
                 PythonHandler django.core.handlers.modpython
-                PythonPath "['/home/evennia'] + sys.path"
-                SetEnv DJANGO_SETTINGS_MODULE evennia.settings
+                PythonPath "['/home/evennia/evennia'] + sys.path"
+                SetEnv DJANGO_SETTINGS_MODULE settings
                 PythonDebug On
         </Directory>
 
diff --git a/evennia/trunk/functions_db.py b/evennia/trunk/functions_db.py
index 0d49d5b66..4c81446a0 100644
--- a/evennia/trunk/functions_db.py
+++ b/evennia/trunk/functions_db.py
@@ -3,7 +3,7 @@ from django.db import connection
 from django.contrib.auth.models import User
 from apps.objects.models import Object
 from apps.config.models import ConfigValue
-import evennia.defines_global as global_defines
+import defines_global as global_defines
 import gameconf
 
 """
diff --git a/evennia/trunk/prepenv.sh b/evennia/trunk/prepenv.sh
index 7188e58fa..dad150ed8 100755
--- a/evennia/trunk/prepenv.sh
+++ b/evennia/trunk/prepenv.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 export DJANGO_SETTINGS_MODULE="settings"
-export PYTHONPATH=/home/gtaylor/dev/
 python2.5 server.py
diff --git a/evennia/trunk/server.py b/evennia/trunk/server.py
index bffb33e70..4ee4a4226 100755
--- a/evennia/trunk/server.py
+++ b/evennia/trunk/server.py
@@ -8,7 +8,7 @@ from apps.config.models import CommandAlias
 import scheduler
 import functions_db
 import functions_general
-import evennia.defines_global as global_defines
+import defines_global as global_defines
 import session_mgr
 import gameconf
 import settings
diff --git a/evennia/trunk/settings.py.dist b/evennia/trunk/settings.py.dist
index 2e724ed4a..5961223f0 100755
--- a/evennia/trunk/settings.py.dist
+++ b/evennia/trunk/settings.py.dist
@@ -61,7 +61,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.doc.XViewMiddleware',
 )
 
-ROOT_URLCONF = 'evennia.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -74,7 +74,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.admin',
-    'evennia.apps.config',
-    'evennia.apps.objects',
-    'evennia.apps.helpsys',
+    'apps.config',
+    'apps.objects',
+    'apps.helpsys',
 )