diff --git a/src/const.py.in b/src/const.py.in
index 89b1a0a6e..5facfd891 100644
--- a/src/const.py.in
+++ b/src/const.py.in
@@ -137,7 +137,7 @@ RULE_GLADE     = os.path.join(GLADE_DIR, "rule.glade")
 
 PLUGINS_DIR    = os.path.join(ROOT_DIR, "plugins")
 DATA_DIR       = os.path.join(ROOT_DIR, "data")
-WEB_DIR        = os.path.join(os.path.join(ROOT_DIR, 'gen'), 'web')
+WEB_DIR        = os.path.join(ROOT_DIR, 'web')
 #SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml")
 TIP_DATA       = os.path.join(DATA_DIR, "tips.xml")
 
diff --git a/src/plugins/export/ExportDjango.py b/src/plugins/export/ExportDjango.py
index 9023a6f6c..1dc310649 100644
--- a/src/plugins/export/ExportDjango.py
+++ b/src/plugins/export/ExportDjango.py
@@ -59,14 +59,14 @@ _ = translator.gettext
 ngettext = translator.ngettext
 
 from django.conf import settings
-import gen.web.settings as default_settings
+import web.settings as default_settings
 try:
     settings.configure(default_settings, DEBUG=True)
 except RuntimeError:
     # already configured; ignore
     pass
 
-from gen.web.libdjango import DjangoInterface
+from web.libdjango import DjangoInterface
 
 def export_all(database, filename, option_box=None, callback=None):
     if not callable(callback): 
diff --git a/src/gen/web/Makefile b/src/web/Makefile
similarity index 84%
rename from src/gen/web/Makefile
rename to src/web/Makefile
index ee87d32f5..e232efc70 100644
--- a/src/gen/web/Makefile
+++ b/src/web/Makefile
@@ -1,19 +1,19 @@
 # Initialize GRAMPS Django site
 
 update: grampsdb/fixtures/initial_data.json
-	PYTHONPATH=../../../src python manage.py syncdb
+	PYTHONPATH=../../src python manage.py syncdb
 
 grampsdb/fixtures/initial_data.json: 
-	PYTHONPATH=../../../src python init.py > grampsdb/fixtures/initial_data.json
+	PYTHONPATH=../../src python init.py > grampsdb/fixtures/initial_data.json
 
 init_gramps:
-	PYTHONPATH=../../../src python init_gramps.py # clear primary and secondary tables
+	PYTHONPATH=../../src python init_gramps.py # clear primary and secondary tables
 
 run:
-	PYTHONPATH=../../../src python manage.py runserver
+	PYTHONPATH=../../src python manage.py runserver
 
 sql:
-	PYTHONPATH=../../../src python manage.py sqlall > gramps_sql.txt
+	PYTHONPATH=../../src python manage.py sqlall > gramps_sql.txt
 
 docs:
 	mkdir -p docs
diff --git a/src/gen/web/README b/src/web/README
similarity index 100%
rename from src/gen/web/README
rename to src/web/README
diff --git a/src/gen/web/__init__.py b/src/web/__init__.py
similarity index 100%
rename from src/gen/web/__init__.py
rename to src/web/__init__.py
diff --git a/src/gen/web/djangodb.py b/src/web/djangodb.py
similarity index 99%
rename from src/gen/web/djangodb.py
rename to src/web/djangodb.py
index 7083851ef..83eff0b31 100644
--- a/src/gen/web/djangodb.py
+++ b/src/web/djangodb.py
@@ -1,6 +1,7 @@
+import web
 import gen
 from gen.db import GrampsDbBase
-from gen.web.libdjango import DjangoInterface
+from web.libdjango import DjangoInterface
 import Utils
 
 # class Trans(object):
diff --git a/src/gen/web/forms.py b/src/web/forms.py
similarity index 96%
rename from src/gen/web/forms.py
rename to src/web/forms.py
index eff4b60de..1d4c5c821 100644
--- a/src/gen/web/forms.py
+++ b/src/web/forms.py
@@ -1,7 +1,7 @@
-# forms.py forms for Django project gen.web
+# forms.py forms for Django web project 
 
 from django import forms
-from gen.web.grampsdb.models import *
+from web.grampsdb.models import *
 from django.forms.models import inlineformset_factory
 from django.forms.models import BaseModelFormSet
 import datetime
diff --git a/src/gen/web/grampsdb/__init__.py b/src/web/grampsdb/__init__.py
similarity index 100%
rename from src/gen/web/grampsdb/__init__.py
rename to src/web/grampsdb/__init__.py
diff --git a/src/gen/web/grampsdb/admin.py b/src/web/grampsdb/admin.py
similarity index 74%
rename from src/gen/web/grampsdb/admin.py
rename to src/web/grampsdb/admin.py
index aa4e3a8b2..ee2502975 100644
--- a/src/gen/web/grampsdb/admin.py
+++ b/src/web/grampsdb/admin.py
@@ -1,4 +1,4 @@
-from gen.web.grampsdb.models import *
+from web.grampsdb.models import *
 from django.contrib import admin
 
 for type_name in get_tables("all"):
diff --git a/src/gen/web/grampsdb/fixtures/initial_data.json b/src/web/grampsdb/fixtures/initial_data.json
similarity index 99%
rename from src/gen/web/grampsdb/fixtures/initial_data.json
rename to src/web/grampsdb/fixtures/initial_data.json
index de3a64be4..e198c2b40 100644
--- a/src/gen/web/grampsdb/fixtures/initial_data.json
+++ b/src/web/grampsdb/fixtures/initial_data.json
@@ -18,7 +18,7 @@
             "setting"   : "db_created" ,
             "description"   : "database creation date/time" ,
             "value_type"   : "str" ,
-            "value"   : "2009-11-10 08:08"
+            "value"   : "2009-11-10 09:20"
          }
    },
    {
diff --git a/src/gen/web/grampsdb/models.py b/src/web/grampsdb/models.py
similarity index 100%
rename from src/gen/web/grampsdb/models.py
rename to src/web/grampsdb/models.py
diff --git a/src/gen/web/grampsdb/templatetags/__init__.py b/src/web/grampsdb/templatetags/__init__.py
similarity index 100%
rename from src/gen/web/grampsdb/templatetags/__init__.py
rename to src/web/grampsdb/templatetags/__init__.py
diff --git a/src/gen/web/grampsdb/templatetags/my_tags.py b/src/web/grampsdb/templatetags/my_tags.py
similarity index 97%
rename from src/gen/web/grampsdb/templatetags/my_tags.py
rename to src/web/grampsdb/templatetags/my_tags.py
index bfe0aa408..74df9024a 100644
--- a/src/gen/web/grampsdb/templatetags/my_tags.py
+++ b/src/web/grampsdb/templatetags/my_tags.py
@@ -1,7 +1,7 @@
 from django.template import escape, Library
-from gen.web import libdjango
-from gen.web import djangodb
-import gen.web.grampsdb.models as models
+from web import libdjango
+from web import djangodb
+import web.grampsdb.models as models
 from gen.lib.date import Date as GDate, Today
 import DateHandler
 
diff --git a/src/gen/web/grampsdb/views.py b/src/web/grampsdb/views.py
similarity index 96%
rename from src/gen/web/grampsdb/views.py
rename to src/web/grampsdb/views.py
index 8c362bf09..be21b09ab 100644
--- a/src/gen/web/grampsdb/views.py
+++ b/src/web/grampsdb/views.py
@@ -8,9 +8,9 @@ from django.shortcuts import get_object_or_404, render_to_response
 from django.template import Context, RequestContext, escape
 from django.db.models import Q
 
-import gen
-from gen.web.grampsdb.models import *
-from gen.web.settings import VIEWS
+import web
+from web.grampsdb.models import *
+from web.settings import VIEWS
 
 def get_views():
     '''
@@ -21,7 +21,7 @@ def get_views():
 def main_page(request):
     context = RequestContext(request)
     context["views"] = [(pair[0], pair[1], 
-          getattr(gen.web.grampsdb.models, pair[2]).objects.count()) 
+          getattr(web.grampsdb.models, pair[2]).objects.count()) 
                         for pair in get_views()]
     context["view"] = 'home'
     context["cview"] = 'Home'
diff --git a/src/gen/web/init.py b/src/web/init.py
similarity index 100%
rename from src/gen/web/init.py
rename to src/web/init.py
diff --git a/src/gen/web/init_gramps.py b/src/web/init_gramps.py
similarity index 100%
rename from src/gen/web/init_gramps.py
rename to src/web/init_gramps.py
diff --git a/src/gen/web/libdjango.py b/src/web/libdjango.py
similarity index 99%
rename from src/gen/web/libdjango.py
rename to src/web/libdjango.py
index 6cd2ad0ff..71efa3fa4 100644
--- a/src/gen/web/libdjango.py
+++ b/src/web/libdjango.py
@@ -1,7 +1,8 @@
 import time
 
-import gen.web.grampsdb.models as models
+import web.grampsdb.models as models
 from django.contrib.contenttypes.models import ContentType
+import web
 import gen
 
 # To get a django person from a django database:
diff --git a/src/gen/web/manage.py b/src/web/manage.py
similarity index 100%
rename from src/gen/web/manage.py
rename to src/web/manage.py
diff --git a/src/gen/web/settings.py b/src/web/settings.py
similarity index 97%
rename from src/gen/web/settings.py
rename to src/web/settings.py
index e621a6284..c8ff0a66a 100644
--- a/src/gen/web/settings.py
+++ b/src/web/settings.py
@@ -37,7 +37,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 )
 
-ROOT_URLCONF = 'gen.web.urls'
+ROOT_URLCONF = 'web.urls'
 
 TEMPLATE_DIRS = (
     # Use absolute paths, not relative paths.
@@ -50,7 +50,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'gen.web.grampsdb',
+    'web.grampsdb',
 #    'django_extensions',
 )
 
diff --git a/src/gen/web/sortheaders.py b/src/web/sortheaders.py
similarity index 100%
rename from src/gen/web/sortheaders.py
rename to src/web/sortheaders.py
diff --git a/src/gen/web/sqlite.db b/src/web/sqlite.db
similarity index 99%
rename from src/gen/web/sqlite.db
rename to src/web/sqlite.db
index b5225dbb0..409395219 100644
Binary files a/src/gen/web/sqlite.db and b/src/web/sqlite.db differ
diff --git a/src/gen/web/urls.py b/src/web/urls.py
similarity index 87%
rename from src/gen/web/urls.py
rename to src/web/urls.py
index 28dad85f0..05f6caa6b 100644
--- a/src/gen/web/urls.py
+++ b/src/web/urls.py
@@ -6,8 +6,8 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 admin.autodiscover()
 
-from gen.web.grampsdb.views import (main_page, user_page, logout_page,
-                                    view, view_detail)
+from web.grampsdb.views import (main_page, user_page, logout_page,
+                                view, view_detail)
 
 urlpatterns = patterns('',
     # Specific matches first: