diff --git a/pyreadline/__init__.py b/pyreadline/__init__.py
index fa8ff44..2a42456 100644
--- a/pyreadline/__init__.py
+++ b/pyreadline/__init__.py
@@ -7,7 +7,7 @@
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
-
+import lineeditor,modes
 from rlmain import *
 __all__ = [ 'parse_and_bind',
             'get_line_buffer',
diff --git a/pyreadline/modes/__init__.py b/pyreadline/modes/__init__.py
index 12e48ff..b75cb40 100644
--- a/pyreadline/modes/__init__.py
+++ b/pyreadline/modes/__init__.py
@@ -1,3 +1,4 @@
+__all__=["emacs","notemacs"]
 import emacs,notemacs
 editingmodes=[emacs.EmacsMode,notemacs.NotEmacsMode]
 
diff --git a/pyreadline/modes/emacs.py b/pyreadline/modes/emacs.py
index 4f7aba5..c2506ec 100644
--- a/pyreadline/modes/emacs.py
+++ b/pyreadline/modes/emacs.py
@@ -7,9 +7,9 @@
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 import os
-import clipboard,logger,console
-from   logger import log
-from   keysyms import key_text_to_keyinfo
+import pyreadline.logger as logger
+from   pyreadline.logger import log
+from   pyreadline.keysyms import key_text_to_keyinfo
 import pyreadline.lineeditor.lineobj as lineobj
 import pyreadline.lineeditor.history as history
 
diff --git a/pyreadline/modes/notemacs.py b/pyreadline/modes/notemacs.py
index f706c8a..2ebe2e7 100644
--- a/pyreadline/modes/notemacs.py
+++ b/pyreadline/modes/notemacs.py
@@ -7,9 +7,9 @@
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 import os
-import clipboard,logger,console
-from   logger import log
-from   keysyms import key_text_to_keyinfo
+import pyreadline.logger as logger
+from   pyreadline.logger import log
+from   pyreadline.keysyms import key_text_to_keyinfo
 import pyreadline.lineeditor.lineobj as lineobj
 import pyreadline.lineeditor.history as history