diff --git a/seahub/contacts/__init__.py b/seahub/contacts/__init__.py
index 126d2e35e2..e69de29bb2 100644
--- a/seahub/contacts/__init__.py
+++ b/seahub/contacts/__init__.py
@@ -1,5 +0,0 @@
-# Copyright (c) 2012-2016 Seafile Ltd.
-from signals import *
-from handlers import *
-
-mail_sended.connect(mail_sended_cb, sender=None)
diff --git a/seahub/contacts/handlers.py b/seahub/contacts/handlers.py
deleted file mode 100644
index 1db13071a2..0000000000
--- a/seahub/contacts/handlers.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2012-2016 Seafile Ltd.
-from signals import mail_sended
-
-from models import Contact
-def mail_sended_cb(sender, **kwargs):
-    """
-    Callback function to add email to contacts.
-    """
-    
-    user = kwargs['user']
-    email = kwargs['email']
-
-    try:
-        Contact.objects.get(user_email=user, contact_email=email)
-        # Already in contacts list, pass.
-    except Contact.DoesNotExist:
-        # Add new contact
-        c = Contact(user_email=user, contact_email=email)
-        c.save()
diff --git a/seahub/contacts/models.py b/seahub/contacts/models.py
index 30cd5a87f7..81f0eed0d4 100644
--- a/seahub/contacts/models.py
+++ b/seahub/contacts/models.py
@@ -91,3 +91,23 @@ class ContactEditForm(ModelForm):
     def clean(self):
         # This is used to override unique index check
         return self.cleaned_data
+
+########## handle signals
+from django.dispatch import receiver
+from .signals import mail_sended
+
+@receiver(mail_sended)
+def mail_sended_cb(sender, **kwargs):
+    """
+    Callback function to add email to contacts.
+    """
+    user = kwargs['user']
+    email = kwargs['email']
+
+    try:
+        Contact.objects.get(user_email=user, contact_email=email)
+        # Already in contacts list, pass.
+    except Contact.DoesNotExist:
+        # Add new contact
+        c = Contact(user_email=user, contact_email=email)
+        c.save()
diff --git a/seahub/group/views.py b/seahub/group/views.py
index fefe8f5cec..777ff0d012 100644
--- a/seahub/group/views.py
+++ b/seahub/group/views.py
@@ -28,10 +28,10 @@ from seahub.auth import REDIRECT_FIELD_NAME
 from seahub.base.decorators import sys_staff_required, require_POST
 from seahub.group.utils import validate_group_name, BadGroupNameError, \
     ConflictGroupNameError
-from seahub.wiki import get_group_wiki_repo, get_group_wiki_page, \
-    get_wiki_pages
 from seahub.wiki.models import WikiDoesNotExist, WikiPageMissing, GroupWiki
-from seahub.wiki.utils import clean_page_name, page_name_to_file_name
+from seahub.wiki.utils import (clean_page_name, page_name_to_file_name,
+                               get_wiki_pages, get_group_wiki_repo,
+                               get_group_wiki_page)
 from seahub.settings import SITE_ROOT, SITE_NAME
 from seahub.utils import render_error, send_html_email, is_org_context
 from seahub.views import is_registered_user, check_folder_permission
diff --git a/seahub/views/tests/__init__.py b/seahub/views/tests/__init__.py
index 04559c5c1c..1d7f729456 100644
--- a/seahub/views/tests/__init__.py
+++ b/seahub/views/tests/__init__.py
@@ -63,7 +63,7 @@ class PersonalWikiTest(TestCase):
         res = personal_wiki(request)
         self.assertEqual('/home/wiki/home/', res['Location'])
 
-    @patch('seahub.views.wiki.get_personal_wiki_page')
+    @patch('seahub.views.wiki.utils.get_personal_wiki_page')
     @patch('seahub.base.models.FileContributors.objects.get_file_contributors')
     def test_wiki_found(self, mock_get_file_contributors,
                         mock_get_personal_wiki_page):
diff --git a/seahub/views/wiki.py b/seahub/views/wiki.py
index 3ba7a3a24a..d8260bf82b 100644
--- a/seahub/views/wiki.py
+++ b/seahub/views/wiki.py
@@ -32,10 +32,10 @@ from pysearpc import SearpcError
 from seahub.auth.decorators import login_required
 from seahub.base.decorators import user_mods_check
 from seahub.wiki.models import PersonalWiki, WikiDoesNotExist, WikiPageMissing
-from seahub.wiki import get_personal_wiki_page, get_personal_wiki_repo, \
-    convert_wiki_link, get_wiki_pages
+from seahub.wiki.utils import (get_personal_wiki_page,
+                               get_personal_wiki_repo, get_wiki_pages,
+                               clean_page_name, page_name_to_file_name)
 from seahub.wiki.forms import WikiCreateForm, WikiNewPageForm
-from seahub.wiki.utils import clean_page_name, page_name_to_file_name
 from seahub.utils import render_error
 from seahub.views import check_folder_permission
 
diff --git a/seahub/wiki/__init__.py b/seahub/wiki/__init__.py
index ba8405b62a..e69de29bb2 100644
--- a/seahub/wiki/__init__.py
+++ b/seahub/wiki/__init__.py
@@ -1,7 +0,0 @@
-# Copyright (c) 2012-2016 Seafile Ltd.
-# -*- coding: utf-8 -*-
-
-from utils import get_personal_wiki_page, get_personal_wiki_repo, \
-    convert_wiki_link, get_wiki_pages
-from utils import (get_group_wiki_repo, get_group_wiki_page,
-                   page_name_to_file_name)