diff --git a/sites/scrapy.org/scrapyorg/apps/article/__init__.py b/sites/scrapy.org/scrapyorg/article/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/article/__init__.py
rename to sites/scrapy.org/scrapyorg/article/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/article/models.py b/sites/scrapy.org/scrapyorg/article/models.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/article/models.py
rename to sites/scrapy.org/scrapyorg/article/models.py
diff --git a/sites/scrapy.org/scrapyorg/apps/article/templatetags/__init__.py b/sites/scrapy.org/scrapyorg/article/templatetags/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/article/templatetags/__init__.py
rename to sites/scrapy.org/scrapyorg/article/templatetags/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/article/templatetags/article_tags.py b/sites/scrapy.org/scrapyorg/article/templatetags/article_tags.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/article/templatetags/article_tags.py
rename to sites/scrapy.org/scrapyorg/article/templatetags/article_tags.py
diff --git a/sites/scrapy.org/scrapyorg/apps/article/urls.py b/sites/scrapy.org/scrapyorg/article/urls.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/article/urls.py
rename to sites/scrapy.org/scrapyorg/article/urls.py
diff --git a/sites/scrapy.org/scrapyorg/apps/article/views.py b/sites/scrapy.org/scrapyorg/article/views.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/article/views.py
rename to sites/scrapy.org/scrapyorg/article/views.py
diff --git a/sites/scrapy.org/scrapyorg/apps/blog/__init__.py b/sites/scrapy.org/scrapyorg/blog/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/blog/__init__.py
rename to sites/scrapy.org/scrapyorg/blog/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/blog/feeds.py b/sites/scrapy.org/scrapyorg/blog/feeds.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/blog/feeds.py
rename to sites/scrapy.org/scrapyorg/blog/feeds.py
diff --git a/sites/scrapy.org/scrapyorg/apps/blog/models.py b/sites/scrapy.org/scrapyorg/blog/models.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/blog/models.py
rename to sites/scrapy.org/scrapyorg/blog/models.py
diff --git a/sites/scrapy.org/scrapyorg/apps/blog/templatetags/__init__.py b/sites/scrapy.org/scrapyorg/blog/templatetags/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/blog/templatetags/__init__.py
rename to sites/scrapy.org/scrapyorg/blog/templatetags/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/blog/templatetags/lastblogentry.py b/sites/scrapy.org/scrapyorg/blog/templatetags/lastblogentry.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/blog/templatetags/lastblogentry.py
rename to sites/scrapy.org/scrapyorg/blog/templatetags/lastblogentry.py
diff --git a/sites/scrapy.org/scrapyorg/apps/blog/urls.py b/sites/scrapy.org/scrapyorg/blog/urls.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/blog/urls.py
rename to sites/scrapy.org/scrapyorg/blog/urls.py
diff --git a/sites/scrapy.org/scrapyorg/apps/download/__init__.py b/sites/scrapy.org/scrapyorg/download/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/download/__init__.py
rename to sites/scrapy.org/scrapyorg/download/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/download/models.py b/sites/scrapy.org/scrapyorg/download/models.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/download/models.py
rename to sites/scrapy.org/scrapyorg/download/models.py
diff --git a/sites/scrapy.org/scrapyorg/apps/download/templatetags/__init__.py b/sites/scrapy.org/scrapyorg/download/templatetags/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/download/templatetags/__init__.py
rename to sites/scrapy.org/scrapyorg/download/templatetags/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/download/templatetags/download_tags.py b/sites/scrapy.org/scrapyorg/download/templatetags/download_tags.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/download/templatetags/download_tags.py
rename to sites/scrapy.org/scrapyorg/download/templatetags/download_tags.py
diff --git a/sites/scrapy.org/scrapyorg/apps/download/urls.py b/sites/scrapy.org/scrapyorg/download/urls.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/download/urls.py
rename to sites/scrapy.org/scrapyorg/download/urls.py
diff --git a/sites/scrapy.org/scrapyorg/apps/download/views.py b/sites/scrapy.org/scrapyorg/download/views.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/download/views.py
rename to sites/scrapy.org/scrapyorg/download/views.py
diff --git a/sites/scrapy.org/scrapyorg/apps/link/__init__.py b/sites/scrapy.org/scrapyorg/link/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/link/__init__.py
rename to sites/scrapy.org/scrapyorg/link/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/link/models.py b/sites/scrapy.org/scrapyorg/link/models.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/link/models.py
rename to sites/scrapy.org/scrapyorg/link/models.py
diff --git a/sites/scrapy.org/scrapyorg/apps/link/templatetags/__init__.py b/sites/scrapy.org/scrapyorg/link/templatetags/__init__.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/link/templatetags/__init__.py
rename to sites/scrapy.org/scrapyorg/link/templatetags/__init__.py
diff --git a/sites/scrapy.org/scrapyorg/apps/link/templatetags/link_tags.py b/sites/scrapy.org/scrapyorg/link/templatetags/link_tags.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/link/templatetags/link_tags.py
rename to sites/scrapy.org/scrapyorg/link/templatetags/link_tags.py
diff --git a/sites/scrapy.org/scrapyorg/apps/link/urls.py b/sites/scrapy.org/scrapyorg/link/urls.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/link/urls.py
rename to sites/scrapy.org/scrapyorg/link/urls.py
diff --git a/sites/scrapy.org/scrapyorg/apps/link/views.py b/sites/scrapy.org/scrapyorg/link/views.py
similarity index 100%
rename from sites/scrapy.org/scrapyorg/apps/link/views.py
rename to sites/scrapy.org/scrapyorg/link/views.py
diff --git a/sites/scrapy.org/scrapyorg/static/images/box-borders-bottom.gif b/sites/scrapy.org/static/images/box-borders-bottom.gif
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/box-borders-bottom.gif
rename to sites/scrapy.org/static/images/box-borders-bottom.gif
diff --git a/sites/scrapy.org/scrapyorg/static/images/box-borders-bottom.png b/sites/scrapy.org/static/images/box-borders-bottom.png
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/box-borders-bottom.png
rename to sites/scrapy.org/static/images/box-borders-bottom.png
diff --git a/sites/scrapy.org/scrapyorg/static/images/box-borders-top.png b/sites/scrapy.org/static/images/box-borders-top.png
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/box-borders-top.png
rename to sites/scrapy.org/static/images/box-borders-top.png
diff --git a/sites/scrapy.org/scrapyorg/static/images/footer-bg.jpg b/sites/scrapy.org/static/images/footer-bg.jpg
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/footer-bg.jpg
rename to sites/scrapy.org/static/images/footer-bg.jpg
diff --git a/sites/scrapy.org/scrapyorg/static/images/icon-arrow.gif b/sites/scrapy.org/static/images/icon-arrow.gif
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/icon-arrow.gif
rename to sites/scrapy.org/static/images/icon-arrow.gif
diff --git a/sites/scrapy.org/scrapyorg/static/images/icon-author.gif b/sites/scrapy.org/static/images/icon-author.gif
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/icon-author.gif
rename to sites/scrapy.org/static/images/icon-author.gif
diff --git a/sites/scrapy.org/scrapyorg/static/images/logo.jpg b/sites/scrapy.org/static/images/logo.jpg
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/logo.jpg
rename to sites/scrapy.org/static/images/logo.jpg
diff --git a/sites/scrapy.org/scrapyorg/static/images/main-bg.jpg b/sites/scrapy.org/static/images/main-bg.jpg
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/images/main-bg.jpg
rename to sites/scrapy.org/static/images/main-bg.jpg
diff --git a/sites/scrapy.org/scrapyorg/static/style/style.css b/sites/scrapy.org/static/style/style.css
similarity index 100%
rename from sites/scrapy.org/scrapyorg/static/style/style.css
rename to sites/scrapy.org/static/style/style.css
diff --git a/sites/scrapy.org/scrapyorg/templates/base.html b/sites/scrapy.org/templates/base.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/base.html
rename to sites/scrapy.org/templates/base.html
diff --git a/sites/scrapy.org/scrapyorg/templates/base_home.html b/sites/scrapy.org/templates/base_home.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/base_home.html
rename to sites/scrapy.org/templates/base_home.html
diff --git a/sites/scrapy.org/scrapyorg/templates/base_weblog.html b/sites/scrapy.org/templates/base_weblog.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/base_weblog.html
rename to sites/scrapy.org/templates/base_weblog.html
diff --git a/sites/scrapy.org/scrapyorg/templates/blog/entry_archive.html b/sites/scrapy.org/templates/blog/entry_archive.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/blog/entry_archive.html
rename to sites/scrapy.org/templates/blog/entry_archive.html
diff --git a/sites/scrapy.org/scrapyorg/templates/blog/entry_archive_day.html b/sites/scrapy.org/templates/blog/entry_archive_day.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/blog/entry_archive_day.html
rename to sites/scrapy.org/templates/blog/entry_archive_day.html
diff --git a/sites/scrapy.org/scrapyorg/templates/blog/entry_archive_month.html b/sites/scrapy.org/templates/blog/entry_archive_month.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/blog/entry_archive_month.html
rename to sites/scrapy.org/templates/blog/entry_archive_month.html
diff --git a/sites/scrapy.org/scrapyorg/templates/blog/entry_archive_year.html b/sites/scrapy.org/templates/blog/entry_archive_year.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/blog/entry_archive_year.html
rename to sites/scrapy.org/templates/blog/entry_archive_year.html
diff --git a/sites/scrapy.org/scrapyorg/templates/blog/entry_detail.html b/sites/scrapy.org/templates/blog/entry_detail.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/blog/entry_detail.html
rename to sites/scrapy.org/templates/blog/entry_detail.html
diff --git a/sites/scrapy.org/scrapyorg/templates/home.html b/sites/scrapy.org/templates/home.html
similarity index 100%
rename from sites/scrapy.org/scrapyorg/templates/home.html
rename to sites/scrapy.org/templates/home.html