diff --git a/templates/eve_api/add.html b/eve_api/templates/eve_api/add.html
similarity index 100%
rename from templates/eve_api/add.html
rename to eve_api/templates/eve_api/add.html
diff --git a/templates/eve_api/character.html b/eve_api/templates/eve_api/character.html
similarity index 100%
rename from templates/eve_api/character.html
rename to eve_api/templates/eve_api/character.html
diff --git a/templates/eve_api/character_list.html b/eve_api/templates/eve_api/character_list.html
similarity index 100%
rename from templates/eve_api/character_list.html
rename to eve_api/templates/eve_api/character_list.html
diff --git a/templates/eve_api/corporation.html b/eve_api/templates/eve_api/corporation.html
similarity index 100%
rename from templates/eve_api/corporation.html
rename to eve_api/templates/eve_api/corporation.html
diff --git a/templates/eve_api/log.html b/eve_api/templates/eve_api/log.html
similarity index 100%
rename from templates/eve_api/log.html
rename to eve_api/templates/eve_api/log.html
diff --git a/eve_api/templatetags/__init__.py b/eve_api/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/eve_api/templatetags/naturaltimediff.py b/eve_api/templatetags/naturaltimediff.py
new file mode 100644
index 0000000..657155a
--- /dev/null
+++ b/eve_api/templatetags/naturaltimediff.py
@@ -0,0 +1,33 @@
+from django import template
+ 
+register = template.Library()
+ 
+MOMENT = 120    # duration in seconds within which the time difference 
+                # will be rendered as 'a moment ago'
+ 
+@register.filter
+def naturaltimediff(value):
+    """
+    Finds the difference between the datetime value given and now()
+    and returns appropriate humanize form
+    """
+ 
+    from datetime import datetime
+ 
+    if isinstance(value, datetime):
+        delta = datetime.now() - value
+        if delta.days > 6:
+            return value.strftime("%b %d")                    # May 15
+        if delta.days > 1:
+            return value.strftime("%A")                       # Wednesday
+        elif delta.days == 1:
+            return 'yesterday'                                # yesterday
+        elif delta.seconds > 3600:
+            return str(delta.seconds / 3600 ) + ' hours ago'  # 3 hours ago
+        elif delta.seconds >  MOMENT:
+            return str(delta.seconds/60) + ' minutes ago'     # 29 minutes ago
+        else:
+            return 'a moment ago'                             # a moment ago
+        return defaultfilters.date(value)
+    else:
+        return str(value)
diff --git a/eve_api/views.py b/eve_api/views.py
index 721e9c7..02a2017 100644
--- a/eve_api/views.py
+++ b/eve_api/views.py
@@ -10,7 +10,7 @@ from django.http import Http404
 from django.core import serializers
 
 from eve_proxy.models import ApiAccessLog
-from eve_api.api_exceptions import DocumentRetrievalError
+from eve_proxy.exceptions import DocumentRetrievalError
 from eve_api.forms import EveAPIForm
 from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation
 from eve_api.tasks import import_apikey_result