diff --git a/retweeter.py b/retweeter.py
index 8b0d7eb..0ca2b0a 100755
--- a/retweeter.py
+++ b/retweeter.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-import argparse, tools
+import argparse, dbtools, setuptools, twitools
 
 def getSavepoint(db, user):
  db.executeQuery("SELECT MAX(tweet_id) FROM retweets WHERE LOWER(author) = '%s'" % user.lower())
@@ -10,7 +10,7 @@ def getSavepoint(db, user):
   print("No tweets from %s stored yet." % user)
   return 0
 
-def retweet(user, two=tools.twObject(), db=tools.dbHelper(tools.dbpath())):
+def retweet(user, two=twitools.twObject(), db=dbtools.dbHelper()):
  query = "from:" + user
 
  savepoint = getSavepoint(db, user)