@@ -5,16 +5,16 @@
 import os
 import re
 import time
 
 
-from .. import ibdawg
+from ..graphspell.ibdawg import IBDAWG
+from ..graphspell.echo import echo
 from . import gc_engine as gce
 from . import conj
 from . import phonet
 from . import mfsp
-from ..echo import echo
 
 
 def _fuckBackslashUTF8 (s):
     "fuck that shit"
     return s.replace("\u2019", "'").replace("\u2013", "–").replace("\u2014", "—")
@@ -22,11 +22,11 @@
 
 class TestDictionary (unittest.TestCase):
 
     @classmethod
     def setUpClass (cls):
-        cls.oDic = ibdawg.IBDAWG("French.bdic")
+        cls.oDic = IBDAWG("French.bdic")
 
     def test_lookup (self):
         for sWord in ["branche", "Émilie"]:
             self.assertTrue(self.oDic.lookup(sWord), sWord)