diff --git a/electrum b/electrum
index 1fc039b1f..32ec670fe 100755
--- a/electrum
+++ b/electrum
@@ -37,12 +37,11 @@ except ImportError:
     sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
 
 try:
-    from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
+    from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password, SimpleConfig
 except ImportError:
-    from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
+    from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password, SimpleConfig
 
 from decimal import Decimal
-from lib import SimpleConfig
 
 known_commands = {
     'help':'Prints this help',
diff --git a/lib/gui_lite.py b/lib/gui_lite.py
index dd71573fe..950598b14 100644
--- a/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@ -18,10 +18,7 @@ import webbrowser
 import history_widget
 import util
 
-try:
-    import lib.gui_qt as gui_qt
-except ImportError:
-    import electrum.gui_qt as gui_qt
+import gui_qt
 
 bitcoin = lambda v: v * 100000000
 
diff --git a/lib/simple_config.py b/lib/simple_config.py
index e2c8b1016..06f78bdc1 100644
--- a/lib/simple_config.py
+++ b/lib/simple_config.py
@@ -1,6 +1,6 @@
 import json
 import os
-from lib.util import user_dir
+from util import user_dir
 
 class SimpleConfig:
   default_options = {"gui": "lite"}
diff --git a/setup.py b/setup.py
index 0e2fcb3b4..a41ec8d31 100644
--- a/setup.py
+++ b/setup.py
@@ -54,6 +54,7 @@ setup(name = "Electrum",
                   'electrum.pyqrnative',
                   'electrum.qrscanner',
                   'electrum.history_widget',
+                  'electrum.simple_config',
                   'electrum.bmp',
                   'electrum.msqr',
                   'electrum.util',