diff --git a/sites/scrapy.org/scrapyorg/article/templatetags/article_tags.py b/sites/scrapy.org/scrapyorg/article/templatetags/article_tags.py
index 9f10635fe..25622bfb3 100644
--- a/sites/scrapy.org/scrapyorg/article/templatetags/article_tags.py
+++ b/sites/scrapy.org/scrapyorg/article/templatetags/article_tags.py
@@ -1,8 +1,8 @@
 from django import template
 
-from lib.templatetags import *
+from scrapyorg.lib.templatetags import *
 
-from article.models import Article
+from scrapyorg.article.models import Article
 
 
 register = template.Library()
diff --git a/sites/scrapy.org/scrapyorg/article/urls.py b/sites/scrapy.org/scrapyorg/article/urls.py
index 246bf5311..4eca6ad64 100644
--- a/sites/scrapy.org/scrapyorg/article/urls.py
+++ b/sites/scrapy.org/scrapyorg/article/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-from article.views import *
+from scrapyorg.article.views import *
 
 
 urlpatterns = patterns('',
diff --git a/sites/scrapy.org/scrapyorg/article/views.py b/sites/scrapy.org/scrapyorg/article/views.py
index 0b26d90b8..736650404 100644
--- a/sites/scrapy.org/scrapyorg/article/views.py
+++ b/sites/scrapy.org/scrapyorg/article/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect
 
-from article.models import Article
+from scrapyorg.article.models import Article
 
 
 def position_up(request, article_id):
diff --git a/sites/scrapy.org/scrapyorg/blog/templatetags/lastblogentry.py b/sites/scrapy.org/scrapyorg/blog/templatetags/lastblogentry.py
index a755e7304..0ce96bac8 100644
--- a/sites/scrapy.org/scrapyorg/blog/templatetags/lastblogentry.py
+++ b/sites/scrapy.org/scrapyorg/blog/templatetags/lastblogentry.py
@@ -2,7 +2,7 @@ import datetime
 
 from django import template
 
-from blog.models import Entry
+from scrapyorg.blog.models import Entry
 
 
 class LatestBlogEntriesNode(template.Node):
diff --git a/sites/scrapy.org/scrapyorg/blog/urls.py b/sites/scrapy.org/scrapyorg/blog/urls.py
index e76f67616..f8975e957 100644
--- a/sites/scrapy.org/scrapyorg/blog/urls.py
+++ b/sites/scrapy.org/scrapyorg/blog/urls.py
@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
-from models import Entry # relative import
+from scrapyorg.blog.models import Entry # relative import
 
 info_dict = {
     'queryset': Entry.objects.all(),
diff --git a/sites/scrapy.org/scrapyorg/download/templatetags/download_tags.py b/sites/scrapy.org/scrapyorg/download/templatetags/download_tags.py
index 186a240ca..14cd5a657 100644
--- a/sites/scrapy.org/scrapyorg/download/templatetags/download_tags.py
+++ b/sites/scrapy.org/scrapyorg/download/templatetags/download_tags.py
@@ -1,8 +1,8 @@
 from django import template
 
-from lib.templatetags import *
+from scrapyorg.lib.templatetags import *
 
-from download.models import DownloadLink
+from scrapyorg.download.models import DownloadLink
 
 
 register = template.Library()
diff --git a/sites/scrapy.org/scrapyorg/download/urls.py b/sites/scrapy.org/scrapyorg/download/urls.py
index 731949828..e8d1e4700 100644
--- a/sites/scrapy.org/scrapyorg/download/urls.py
+++ b/sites/scrapy.org/scrapyorg/download/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-from download.views import *
+from scrapyorg.download.views import *
 
 
 urlpatterns = patterns('',
diff --git a/sites/scrapy.org/scrapyorg/download/views.py b/sites/scrapy.org/scrapyorg/download/views.py
index ea16faaa4..f0b6ae097 100644
--- a/sites/scrapy.org/scrapyorg/download/views.py
+++ b/sites/scrapy.org/scrapyorg/download/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect
 
-from download.models import DownloadLink
+from scrapyorg.download.models import DownloadLink
 
 
 def toggle_public(request, link_id):
diff --git a/sites/scrapy.org/scrapyorg/link/templatetags/link_tags.py b/sites/scrapy.org/scrapyorg/link/templatetags/link_tags.py
index aaafbc7f3..69c26b9d8 100644
--- a/sites/scrapy.org/scrapyorg/link/templatetags/link_tags.py
+++ b/sites/scrapy.org/scrapyorg/link/templatetags/link_tags.py
@@ -1,8 +1,8 @@
 from django import template
 
-from lib.templatetags import *
+from scrapyorg.lib.templatetags import *
 
-from link.models import GroupLink
+from scrapyorg.link.models import GroupLink
 
 
 register = template.Library()
diff --git a/sites/scrapy.org/scrapyorg/link/urls.py b/sites/scrapy.org/scrapyorg/link/urls.py
index 66ae7a0c3..0d57f413b 100644
--- a/sites/scrapy.org/scrapyorg/link/urls.py
+++ b/sites/scrapy.org/scrapyorg/link/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-from link.views import *
+from scrapyorg.link.views import *
 
 
 urlpatterns = patterns('',
diff --git a/sites/scrapy.org/scrapyorg/link/views.py b/sites/scrapy.org/scrapyorg/link/views.py
index bebb50c70..e70bf362b 100644
--- a/sites/scrapy.org/scrapyorg/link/views.py
+++ b/sites/scrapy.org/scrapyorg/link/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect
 
-from link.models import GroupLink
+from scrapyorg.link.models import GroupLink
 
 
 def position_up(request, grouplink_id):
diff --git a/sites/scrapy.org/scrapyorg/local_settings.py.template b/sites/scrapy.org/scrapyorg/local_settings.py.template
index 0991096c9..932a72b60 100644
--- a/sites/scrapy.org/scrapyorg/local_settings.py.template
+++ b/sites/scrapy.org/scrapyorg/local_settings.py.template
@@ -1,5 +1,4 @@
-import os
-
+DEBUG = True
 
 DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
@@ -10,12 +9,6 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 
 SITE_URL = ''
 
-SITE_MEDIA = os.path.join(os.path.dirname(__file__), 'static')
-
 EMAIL_HOST = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-
-MOBILE = False
-
-PRODUCTION = False
diff --git a/sites/scrapy.org/scrapyorg/settings.py b/sites/scrapy.org/scrapyorg/settings.py
index a5386393b..a65b6a39f 100644
--- a/sites/scrapy.org/scrapyorg/settings.py
+++ b/sites/scrapy.org/scrapyorg/settings.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 # Django settings for scrapy project.
 
-from os.path import abspath, dirname, basename, join
-import sys
+#from os.path import abspath, dirname, basename, join
+import os
 
-PROJECT_ABSOLUTE_DIR = dirname(abspath(__file__))
-PROJECT_NAME = basename(PROJECT_ABSOLUTE_DIR)
+PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
@@ -13,6 +12,8 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
+DEBUG=False
+
 DEFAULT_CHARSET = "utf-8"
 
 # Local time zone for this installation. Choices can be found here:
@@ -34,7 +35,7 @@ SITE_ID = 1
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = join(PROJECT_ABSOLUTE_DIR, "static")
+MEDIA_ROOT = os.path.join(PROJECT_ROOT, "static")
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -61,14 +62,13 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
-    #'%s.middleware.threadlocals.ThreadLocals' % PROJECT_NAME,
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )
 
-ROOT_URLCONF = '%s.urls' % PROJECT_NAME
+ROOT_URLCONF = 'scrapyorg.urls'
 
 TEMPLATE_DIRS = (
-    join(PROJECT_ABSOLUTE_DIR, "templates"),
+    os.path.join(PROJECT_ROOT, "templates"),
 )
 
 INSTALLED_APPS = (
@@ -79,15 +79,12 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.markup',
     'django.contrib.flatpages',
-    'link',
-    'article',
-    'download',
-    'blog',
+    'scrapyorg.link',
+    'scrapyorg.article',
+    'scrapyorg.download',
+    'scrapyorg.blog',
 )
 
-# Add apps/ dir to python path.
-sys.path.append(join(PROJECT_ABSOLUTE_DIR, "apps"))
-
 # Override previous settings with values in local_settings.py settings file.
 try:
     from local_settings import *
diff --git a/sites/scrapy.org/scrapyorg/urls.py b/sites/scrapy.org/scrapyorg/urls.py
index 78289e03d..8435792f4 100644
--- a/sites/scrapy.org/scrapyorg/urls.py
+++ b/sites/scrapy.org/scrapyorg/urls.py
@@ -5,10 +5,10 @@ from django.conf import settings
 
 urlpatterns = patterns('',
     (r"^$", direct_to_template, { "template": "home.html" }),
-    (r"^article/", include("article.urls")),
-    (r"^download/", include("download.urls")),
-    (r"^link/", include("link.urls")),
-    (r"^weblog/", include("blog.urls")),
+    (r"^article/", include("scrapyorg.article.urls")),
+    (r"^download/", include("scrapyorg.download.urls")),
+    (r"^link/", include("scrapyorg.link.urls")),
+    (r"^weblog/", include("scrapyorg.blog.urls")),
 
     (r"^admin/", include("django.contrib.admin.urls")),
 )
@@ -16,5 +16,5 @@ urlpatterns = patterns('',
 
 if settings.DEBUG: # devel
     urlpatterns += patterns('',         
-        (r"^site-media/(?P<path>.*)$", "django.views.static.serve", { "document_root": settings.MEDIA_ROOT }),
+        (r'^%s/(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
     )