diff --git a/src/controller/messages.py b/src/controller/messages.py
index 9b93ed58..c87cbffe 100644
--- a/src/controller/messages.py
+++ b/src/controller/messages.py
@@ -11,8 +11,9 @@ from pubsub import pub
 from twitter_text import parse_tweet
 from wxUI.dialogs import twitterDialogs, urlList
 from wxUI import commonMessageDialogs
-from extra import translator, SpellChecker, autocompletionUsers
+from extra import translator, SpellChecker
 from extra.AudioUploader import audioUploader
+from extra.autocompletionUsers import completion
 from sessions.twitter import utils
 
 class basicTweet(object):
@@ -160,7 +161,7 @@ class tweet(basicTweet):
         self.text_processor()
 
     def autocomplete_users(self, *args, **kwargs):
-        c = autocompletionUsers.completion.autocompletionUsers(self.message, self.session.session_id)
+        c = completion.autocompletionUsers(self.message, self.session.session_id)
         c.show_menu()
 
     def add_tweet(self, event, update_gui=True, *args, **kwargs):
@@ -269,7 +270,7 @@ class dm(basicTweet):
         self.text_processor()
 
     def autocomplete_users(self, *args, **kwargs):
-        c = autocompletionUsers.completion.autocompletionUsers(self.message, self.session.session_id)
+        c = completion.autocompletionUsers(self.message, self.session.session_id)
         c.show_menu("dm")
 
     def text_processor(self, *args, **kwargs):
diff --git a/src/controller/userActionsController.py b/src/controller/userActionsController.py
index e9cbcd45..7f1b71a3 100644
--- a/src/controller/userActionsController.py
+++ b/src/controller/userActionsController.py
@@ -4,7 +4,7 @@ import output
 from wxUI.dialogs import userActions
 from pubsub import pub
 from tweepy.errors  import TweepyException
-from extra import autocompletionUsers
+from extra.autocompletionUsers import completion
 
 class userActionsController(object):
     def __init__(self, buffer, users=[], default="follow"):
@@ -17,7 +17,7 @@ class userActionsController(object):
             self.process_action()
 
     def autocomplete_users(self, *args, **kwargs):
-        c = autocompletionUsers.completion.autocompletionUsers(self.dialog, self.session.session_id)
+        c = completion.autocompletionUsers(self.dialog, self.session.session_id)
         c.show_menu("dm")
 
     def process_action(self):
diff --git a/src/controller/userAliasController.py b/src/controller/userAliasController.py
index 69a4fa8f..f40396d5 100644
--- a/src/controller/userAliasController.py
+++ b/src/controller/userAliasController.py
@@ -2,7 +2,6 @@
 import widgetUtils
 from pubsub import pub
 from wxUI.dialogs import userAliasDialogs
-from extra import autocompletionUsers
 
 class userAliasController(object):
     def __init__(self, settings):