diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py
index f881f9ac..4f33fa48 100644
--- a/src/controller/buffersController.py
+++ b/src/controller/buffersController.py
@@ -18,11 +18,11 @@ import sound
 import languageHandler
 import logging
 import youtube_utils
-from twitter import compose, utils
+from sessions.twitter import compose, utils
 from mysc.thread_utils import call_threaded
 from twython import TwythonError
 from pubsub import pub
-from long_tweets import twishort, tweets
+from sessions.twitter.long_tweets import twishort, tweets
 
 log = logging.getLogger("controller.buffers")
 
diff --git a/src/controller/listsController.py b/src/controller/listsController.py
index 84b19b08..c418af43 100644
--- a/src/controller/listsController.py
+++ b/src/controller/listsController.py
@@ -3,7 +3,7 @@ import widgetUtils
 import output
 from wxUI.dialogs import lists
 from twython import TwythonError
-from twitter import compose, utils
+from sessions.twitter import compose, utils
 from pubsub import pub
 
 class listsController(object):
diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 8ede2db2..16eb8c44 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -18,7 +18,7 @@ if system == "Windows":
 # from issueReporter import issueReporter
 elif system == "Linux":
  from gtkUI import (view, commonMessageDialogs)
-from twitter import utils, compose
+from sessions.twitter import utils, compose
 from sessionmanager import manager, sessionManager
 
 import buffersController
diff --git a/src/controller/messages.py b/src/controller/messages.py
index 259e0505..5cda8c0a 100644
--- a/src/controller/messages.py
+++ b/src/controller/messages.py
@@ -17,7 +17,7 @@ if system == "Windows":
  from extra.AudioUploader import audioUploader
 elif system == "Linux":
  from gtkUI.dialogs import message
-from twitter import utils
+from sessions.twitter import utils
 
 class basicTweet(object):
  """ This class handles the tweet main features. Other classes should derive from this class."""
diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py
index 9e9af7b8..0bfc7187 100644
--- a/src/sessionmanager/session.py
+++ b/src/sessionmanager/session.py
@@ -3,7 +3,6 @@
 import wx
 import urllib2
 import config
-import twitter
 from keys import keyring
 import session_exceptions as Exceptions
 import paths
@@ -11,7 +10,7 @@ import output
 import time
 import sound
 import logging
-from twitter import utils, compose
+from sessions.twitter import client, utils, compose
 from twython import TwythonError, TwythonRateLimitError, TwythonAuthError
 import config_utils
 import shelve
@@ -20,7 +19,7 @@ import os
 from mysc.thread_utils import stream_threaded, call_threaded
 from pubsub import pub
 log = logging.getLogger("sessionmanager.session")
-from long_tweets import tweets, twishort
+from sessions.twitter.long_tweets import tweets, twishort
 from wxUI import authorisationDialog
 
 sessions = {}
@@ -136,7 +135,7 @@ class Session(object):
   self.session_id = session_id
   self.logged = False
   self.settings = None
-  self.twitter = twitter.twitter.twitter()
+  self.twitter = client.twitter()
   self.db={}
   self.reconnection_function_active = False
   self.counter = 0
@@ -380,7 +379,7 @@ class Session(object):
    log.debug("Restarting connection after 5 minutes.")
    del self.twitter
    self.logged = False
-   self.twitter = twitter.twitter.twitter()
+   self.twitter = client.twitter()
    self.login(False)
    self.counter = 0
   if self.reconnection_function_active == True:  return