diff --git a/src/calibre/www/apps/blog/models.py b/src/calibre/www/apps/blog/models.py
index b719d8cb8a..16eab441b2 100644
--- a/src/calibre/www/apps/blog/models.py
+++ b/src/calibre/www/apps/blog/models.py
@@ -2,10 +2,10 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.db.models import permalink
 from django.contrib.auth.models import User
-from calibre.www.apps.tagging.fields import TagField
+from tagging.fields import TagField
 from calibre.www.apps.blog.managers import PublicManager
 
-import calibre.www.apps.tagging as tagging
+import tagging
 
 class Category(models.Model):
     """Category model."""
diff --git a/src/calibre/www/kovid/settings.py b/src/calibre/www/kovid/settings.py
index 8d89c5e373..3b1899bfdf 100644
--- a/src/calibre/www/kovid/settings.py
+++ b/src/calibre/www/kovid/settings.py
@@ -40,10 +40,10 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.comments',
+    'django.contrib.markup',
     'calibre.www.apps.inlines',
-    'calibre.www.apps.tagging',
+    'tagging',
     'calibre.www.apps.blog',
-
 )
 
 
diff --git a/src/calibre/www/kovid/urls.py b/src/calibre/www/kovid/urls.py
index e5a33b2597..05b2e451b0 100644
--- a/src/calibre/www/kovid/urls.py
+++ b/src/calibre/www/kovid/urls.py
@@ -2,14 +2,16 @@ from django.conf.urls.defaults import patterns, include, handler404, handler500
 from django.conf import settings
 
 # Uncomment the next two lines to enable the admin:
-#from django.contrib import admin
-#admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
 
- #       (r'^admin/(.*)', admin.site.root),
+    (r'^admin/(.*)', admin.site.root),
 
     (r'^comments/', include('django.contrib.comments.urls')),
+    (r'', include('calibre.www.apps.blog.urls')),
+
 
 
 )
diff --git a/src/calibre/www/apps/tagging/__init__.py b/src/tagging/__init__.py
similarity index 90%
rename from src/calibre/www/apps/tagging/__init__.py
rename to src/tagging/__init__.py
index 9cca99b771..9241c202c3 100644
--- a/src/calibre/www/apps/tagging/__init__.py
+++ b/src/tagging/__init__.py
@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext as _
 
-from calibre.www.apps.tagging.managers import ModelTaggedItemManager, TagDescriptor
+from tagging.managers import ModelTaggedItemManager, TagDescriptor
 
 VERSION = (0, 3, 'pre')
 
diff --git a/src/calibre/www/apps/tagging/admin.py b/src/tagging/admin.py
similarity index 60%
rename from src/calibre/www/apps/tagging/admin.py
rename to src/tagging/admin.py
index 51cb472e50..4c1ef38546 100644
--- a/src/calibre/www/apps/tagging/admin.py
+++ b/src/tagging/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from calibre.www.apps.tagging.models import Tag, TaggedItem
+from tagging.models import Tag, TaggedItem
 
 admin.site.register(TaggedItem)
 admin.site.register(Tag)
diff --git a/src/calibre/www/apps/tagging/fields.py b/src/tagging/fields.py
similarity index 94%
rename from src/calibre/www/apps/tagging/fields.py
rename to src/tagging/fields.py
index f6bb9fce15..f52daff0b2 100644
--- a/src/calibre/www/apps/tagging/fields.py
+++ b/src/tagging/fields.py
@@ -5,9 +5,9 @@ from django.db.models import signals
 from django.db.models.fields import CharField
 from django.utils.translation import ugettext_lazy as _
 
-from calibre.www.apps.tagging import settings
-from calibre.www.apps.tagging.models import Tag
-from calibre.www.apps.tagging.utils import edit_string_for_tags
+from tagging import settings
+from tagging.models import Tag
+from tagging.utils import edit_string_for_tags
 
 class TagField(CharField):
     """
@@ -101,7 +101,7 @@ class TagField(CharField):
         return 'CharField'
 
     def formfield(self, **kwargs):
-        from calibre.www.apps.tagging import forms
+        from tagging import forms
         defaults = {'form_class': forms.TagField}
         defaults.update(kwargs)
         return super(TagField, self).formfield(**defaults)
diff --git a/src/calibre/www/apps/tagging/forms.py b/src/tagging/forms.py
similarity index 88%
rename from src/calibre/www/apps/tagging/forms.py
rename to src/tagging/forms.py
index 997ff5c66b..a70ac6bac4 100644
--- a/src/calibre/www/apps/tagging/forms.py
+++ b/src/tagging/forms.py
@@ -4,9 +4,9 @@ Tagging components for Django's form library.
 from django import forms
 from django.utils.translation import ugettext as _
 
-from calibre.www.apps.tagging import settings
-from calibre.www.apps.tagging.models import Tag
-from calibre.www.apps.tagging.utils import parse_tag_input
+from tagging import settings
+from tagging.models import Tag
+from tagging.utils import parse_tag_input
 
 class AdminTagForm(forms.ModelForm):
     class Meta:
diff --git a/src/calibre/www/apps/tagging/generic.py b/src/tagging/generic.py
similarity index 100%
rename from src/calibre/www/apps/tagging/generic.py
rename to src/tagging/generic.py
diff --git a/src/calibre/www/apps/tagging/managers.py b/src/tagging/managers.py
similarity index 97%
rename from src/calibre/www/apps/tagging/managers.py
rename to src/tagging/managers.py
index b17269e146..02cd1c23c9 100644
--- a/src/calibre/www/apps/tagging/managers.py
+++ b/src/tagging/managers.py
@@ -5,7 +5,7 @@ application.
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
-from calibre.www.apps.tagging.models import Tag, TaggedItem
+from tagging.models import Tag, TaggedItem
 
 class ModelTagManager(models.Manager):
     """
diff --git a/src/calibre/www/apps/tagging/models.py b/src/tagging/models.py
similarity index 98%
rename from src/calibre/www/apps/tagging/models.py
rename to src/tagging/models.py
index 59fe7682c4..d43f22d964 100644
--- a/src/calibre/www/apps/tagging/models.py
+++ b/src/tagging/models.py
@@ -13,9 +13,9 @@ from django.db import connection, models
 from django.db.models.query import QuerySet
 from django.utils.translation import ugettext_lazy as _
 
-from calibre.www.apps.tagging import settings
-from calibre.www.apps.tagging.utils import calculate_cloud, get_tag_list, get_queryset_and_model, parse_tag_input
-from calibre.www.apps.tagging.utils import LOGARITHMIC
+from tagging import settings
+from tagging.utils import calculate_cloud, get_tag_list, get_queryset_and_model, parse_tag_input
+from tagging.utils import LOGARITHMIC
 
 qn = connection.ops.quote_name
 
diff --git a/src/calibre/www/apps/tagging/settings.py b/src/tagging/settings.py
similarity index 100%
rename from src/calibre/www/apps/tagging/settings.py
rename to src/tagging/settings.py
diff --git a/src/calibre/www/apps/tagging/templatetags/__init__.py b/src/tagging/templatetags/__init__.py
similarity index 100%
rename from src/calibre/www/apps/tagging/templatetags/__init__.py
rename to src/tagging/templatetags/__init__.py
diff --git a/src/calibre/www/apps/tagging/templatetags/tagging_tags.py b/src/tagging/templatetags/tagging_tags.py
similarity index 100%
rename from src/calibre/www/apps/tagging/templatetags/tagging_tags.py
rename to src/tagging/templatetags/tagging_tags.py
diff --git a/src/calibre/www/apps/tagging/utils.py b/src/tagging/utils.py
similarity index 98%
rename from src/calibre/www/apps/tagging/utils.py
rename to src/tagging/utils.py
index 5750c7a0f7..e89bab0e5a 100644
--- a/src/calibre/www/apps/tagging/utils.py
+++ b/src/tagging/utils.py
@@ -159,7 +159,7 @@ def get_tag_list(tags):
        * A ``Tag`` ``QuerySet``.
 
     """
-    from calibre.www.apps.tagging.models import Tag
+    from tagging.models import Tag
     if isinstance(tags, Tag):
         return [tags]
     elif isinstance(tags, QuerySet) and tags.model is Tag:
@@ -201,7 +201,7 @@ def get_tag(tag):
 
     If no matching tag can be found, ``None`` will be returned.
     """
-    from calibre.www.apps.tagging.models import Tag
+    from tagging.models import Tag
     if isinstance(tag, Tag):
         return tag
 
diff --git a/src/calibre/www/apps/tagging/views.py b/src/tagging/views.py
similarity index 93%
rename from src/calibre/www/apps/tagging/views.py
rename to src/tagging/views.py
index 53360da383..9e7e2f534b 100644
--- a/src/calibre/www/apps/tagging/views.py
+++ b/src/tagging/views.py
@@ -5,8 +5,8 @@ from django.http import Http404
 from django.utils.translation import ugettext as _
 from django.views.generic.list_detail import object_list
 
-from calibre.www.apps.tagging.models import Tag, TaggedItem
-from calibre.www.apps.tagging.utils import get_tag, get_queryset_and_model
+from tagging.models import Tag, TaggedItem
+from tagging.utils import get_tag, get_queryset_and_model
 
 def tagged_object_list(request, queryset_or_model=None, tag=None,
         related_tags=False, related_tag_counts=True, **kwargs):