diff --git a/gui/__init__.py b/gui/__init__.py
index 9bccd2ad3..23cbbe221 100644
--- a/gui/__init__.py
+++ b/gui/__init__.py
@@ -1,2 +1,3 @@
 # do not remove this file
-from plugins import BasePlugin
+
+
diff --git a/gui/amountedit.py b/gui/gui_classic/amountedit.py
similarity index 100%
rename from gui/amountedit.py
rename to gui/gui_classic/amountedit.py
diff --git a/gui/exchange_rate.py b/gui/gui_classic/exchange_rate.py
similarity index 100%
rename from gui/exchange_rate.py
rename to gui/gui_classic/exchange_rate.py
diff --git a/gui/history_widget.py b/gui/gui_classic/history_widget.py
similarity index 100%
rename from gui/history_widget.py
rename to gui/gui_classic/history_widget.py
diff --git a/gui/installwizard.py b/gui/gui_classic/installwizard.py
similarity index 100%
rename from gui/installwizard.py
rename to gui/gui_classic/installwizard.py
diff --git a/gui/gui_lite.py b/gui/gui_classic/lite_window.py
similarity index 98%
rename from gui/gui_lite.py
rename to gui/gui_classic/lite_window.py
index dabe98a27..8eac55d36 100644
--- a/gui/gui_lite.py
+++ b/gui/gui_classic/lite_window.py
@@ -33,7 +33,8 @@ import datetime
 
 from electrum.version import ELECTRUM_VERSION as electrum_version
 from electrum.util import format_satoshis, age
-import gui_classic
+
+from main_window import ElectrumWindow
 import shutil
 
 from qt_util import *
@@ -186,7 +187,7 @@ class ElectrumGui(QObject):
             self.set_url(url)
             
         if self.expert is None:
-            self.expert = gui_classic.ElectrumWindow(self.config)
+            self.expert = ElectrumWindow(self.config)
             self.expert.load_wallet(self.wallet)
             self.expert.app = self.app
             timer = Timer()
@@ -218,7 +219,7 @@ class ElectrumGui(QObject):
         return choice == QMessageBox.Yes
 
     def restore_or_create(self):
-        qt_gui_object = gui_classic.ElectrumGui(self.wallet, self.app)
+        qt_gui_object = ElectrumGui(self.wallet, self.app)
         return qt_gui_object.restore_or_create()
 
 class TransactionWindow(QDialog):
@@ -934,7 +935,7 @@ class MiniActuator:
         webbrowser.open(url)
 
     def show_seed_dialog(self):
-        gui_classic.ElectrumWindow.show_seed_dialog(self.wallet)
+        ElectrumWindow.show_seed_dialog(self.wallet)
 
 class MiniDriver(QObject):
 
@@ -949,9 +950,9 @@ class MiniDriver(QObject):
         self.wallet = wallet
         self.window = window
 
-        self.wallet.interface.register_callback('updated',self.update_callback)
-        self.wallet.interface.register_callback('connected', self.update_callback)
-        self.wallet.interface.register_callback('disconnected', self.update_callback)
+        self.wallet.network.register_callback('updated',self.update_callback)
+        self.wallet.network.register_callback('connected', self.update_callback)
+        self.wallet.network.register_callback('disconnected', self.update_callback)
 
         self.state = None
 
diff --git a/gui/gui_classic.py b/gui/gui_classic/main_window.py
similarity index 97%
rename from gui/gui_classic.py
rename to gui/gui_classic/main_window.py
index d9fe6cc56..f45cc6079 100644
--- a/gui/gui_classic.py
+++ b/gui/gui_classic/main_window.py
@@ -1375,13 +1375,13 @@ class ElectrumWindow(QMainWindow):
 
         
     def go_lite(self):
-        import gui_lite
+        import lite_window
         self.config.set_key('gui', 'lite', True)
         self.hide()
         if self.lite:
             self.lite.mini.show()
         else:
-            self.lite = gui_lite.ElectrumGui(self.config, None, None, self)
+            self.lite = lite_window.ElectrumGui(self.config, None, None, self)
             self.lite.main(None)
 
 
@@ -1894,7 +1894,7 @@ class ElectrumWindow(QMainWindow):
 
 
     def do_export_history(self):
-        from gui_lite import csv_transaction
+        from lite_window import csv_transaction
         csv_transaction(self.wallet)
 
 
@@ -2165,63 +2165,3 @@ class ElectrumWindow(QMainWindow):
         self.config.set_key("console-history", self.console.history[-50:], True)
         event.accept()
 
-class OpenFileEventFilter(QObject):
-    def __init__(self, windows):
-        self.windows = windows
-        super(OpenFileEventFilter, self).__init__()
-
-    def eventFilter(self, obj, event):
-        if event.type() == QtCore.QEvent.FileOpen:
-            if len(self.windows) >= 1:
-                self.windows[0].set_url(event.url().toString())
-                return True
-        return False
-
-
-
-
-class ElectrumGui:
-
-    def __init__(self, config, network, app=None):
-        self.network = network
-        #self.interface = interface
-        self.config = config
-        #self.blockchain = network.blockchain
-        self.windows = []
-        self.efilter = OpenFileEventFilter(self.windows)
-        if app is None:
-            self.app = QApplication(sys.argv)
-        self.app.installEventFilter(self.efilter)
-
-
-    def main(self, url):
-
-        storage = WalletStorage(self.config)
-        if not storage.file_exists:
-            import installwizard
-            wizard = installwizard.InstallWizard(self.config, self.network, storage)
-            wallet = wizard.run()
-            if not wallet: 
-                exit()
-        else:
-            wallet = Wallet(storage)
-
-        wallet.start_threads(self.network)
-
-        s = Timer()
-        s.start()
-        w = ElectrumWindow(self.config, self.network)
-        w.load_wallet(wallet)
-
-        self.windows.append(w)
-        if url: w.set_url(url)
-        w.app = self.app
-        w.connect_slots(s)
-        w.update_wallet()
-        w.show()
-
-        self.app.exec_()
-
-        wallet.stop_threads()
-
-
diff --git a/gui/network_dialog.py b/gui/gui_classic/network_dialog.py
similarity index 100%
rename from gui/network_dialog.py
rename to gui/gui_classic/network_dialog.py
diff --git a/gui/password_dialog.py b/gui/gui_classic/password_dialog.py
similarity index 100%
rename from gui/password_dialog.py
rename to gui/gui_classic/password_dialog.py
diff --git a/gui/qrcodewidget.py b/gui/gui_classic/qrcodewidget.py
similarity index 100%
rename from gui/qrcodewidget.py
rename to gui/gui_classic/qrcodewidget.py
diff --git a/gui/qt_console.py b/gui/gui_classic/qt_console.py
similarity index 100%
rename from gui/qt_console.py
rename to gui/gui_classic/qt_console.py
diff --git a/gui/qt_util.py b/gui/gui_classic/qt_util.py
similarity index 100%
rename from gui/qt_util.py
rename to gui/gui_classic/qt_util.py
diff --git a/gui/receiving_widget.py b/gui/gui_classic/receiving_widget.py
similarity index 100%
rename from gui/receiving_widget.py
rename to gui/gui_classic/receiving_widget.py
diff --git a/gui/seed_dialog.py b/gui/gui_classic/seed_dialog.py
similarity index 100%
rename from gui/seed_dialog.py
rename to gui/gui_classic/seed_dialog.py
diff --git a/gui/version_getter.py b/gui/gui_classic/version_getter.py
similarity index 100%
rename from gui/version_getter.py
rename to gui/gui_classic/version_getter.py
diff --git a/lib/__init__.py b/lib/__init__.py
index 07f8fd7ca..a56b6462d 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -9,7 +9,7 @@ from simple_config import SimpleConfig
 import bitcoin
 import account
 from transaction import Transaction
-
+from plugins import BasePlugin
 from mnemonic import mn_encode as mnemonic_encode
 from mnemonic import mn_decode as mnemonic_decode
 from commands import protected_commands, known_commands, offline_commands, Commands
diff --git a/gui/bmp.py b/lib/bmp.py
similarity index 100%
rename from gui/bmp.py
rename to lib/bmp.py
diff --git a/gui/i18n.py b/lib/i18n.py
similarity index 100%
rename from gui/i18n.py
rename to lib/i18n.py
diff --git a/gui/plugins.py b/lib/plugins.py
similarity index 100%
rename from gui/plugins.py
rename to lib/plugins.py
diff --git a/gui/pyqrnative.py b/lib/pyqrnative.py
similarity index 100%
rename from gui/pyqrnative.py
rename to lib/pyqrnative.py
diff --git a/plugins/aliases.py b/plugins/aliases.py
index 2cfac48d0..90e83a2ca 100644
--- a/plugins/aliases.py
+++ b/plugins/aliases.py
@@ -7,9 +7,8 @@ from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 import PyQt4.QtGui as QtGui
 
-from electrum_gui.qrcodewidget import QRCodeWidget
-from electrum_gui import bmp, pyqrnative
-from electrum_gui.i18n import _
+from electrum import bmp, pyqrnative
+from electrum.i18n import _
 
 from electrum import util
 
@@ -17,7 +16,8 @@ ALIAS_REGEXP = '^(|([\w\-\.]+)@)((\w[\w\-]+\.)+[\w\-]+)$'
 
 
 
-from electrum_gui import BasePlugin
+from electrum.plugins import BasePlugin
+
 class Plugin(BasePlugin):
 
     def fullname(self): return 'Aliases'
diff --git a/plugins/labels.py b/plugins/labels.py
index b119635ac..7a130f901 100644
--- a/plugins/labels.py
+++ b/plugins/labels.py
@@ -1,5 +1,5 @@
 from electrum.util import print_error
-from electrum_gui.i18n import _
+
 import httplib, urllib
 import socket
 import hashlib
@@ -16,8 +16,10 @@ import PyQt4.QtCore as QtCore
 import PyQt4.QtGui as QtGui
 import aes
 import base64
-from electrum_gui import bmp, pyqrnative, BasePlugin
-from electrum_gui.i18n import _
+from electrum import bmp, pyqrnative
+from electrum.plugins import BasePlugin
+from electrum.i18n import _
+
 from electrum_gui.gui_classic import HelpButton
 
 class Plugin(BasePlugin):
diff --git a/plugins/pointofsale.py b/plugins/pointofsale.py
index 1630577dc..3dcb30ad5 100644
--- a/plugins/pointofsale.py
+++ b/plugins/pointofsale.py
@@ -7,9 +7,10 @@ from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 import PyQt4.QtGui as QtGui
 
-from electrum_gui.qrcodewidget import QRCodeWidget
-from electrum_gui import bmp, pyqrnative, BasePlugin
-from electrum_gui.i18n import _
+from electrum_gui.gui_classic.qrcodewidget import QRCodeWidget
+
+from electrum import bmp, pyqrnative, BasePlugin
+from electrum.i18n import _
 
 
 if platform.system() == 'Windows':
@@ -105,8 +106,8 @@ class Plugin(BasePlugin):
 
         self.gui.expert_mode = True
         self.gui.receive_list.setHeaderLabels([ _('Address'), _('Label'), _('Balance'), _('Request')])
-        self.toggle_QR_window(True)
         self.requested_amounts = {}
+        self.toggle_QR_window(True)
 
     def load_wallet(self):
         self.requested_amounts = self.gui.wallet.storage.get('requested_amounts',{}) 
diff --git a/plugins/qrscanner.py b/plugins/qrscanner.py
index 97b588d05..d49096ea7 100644
--- a/plugins/qrscanner.py
+++ b/plugins/qrscanner.py
@@ -2,13 +2,13 @@ from electrum.util import print_error
 from urlparse import urlparse, parse_qs
 from PyQt4.QtGui import QPushButton, QMessageBox, QDialog, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel
 from PyQt4.QtCore import Qt
-from electrum_gui.i18n import _
 
+from electrum.i18n import _
 import re
 from electrum import Transaction
 from electrum.bitcoin import MIN_RELAY_TX_FEE, is_valid
-from electrum_gui.qrcodewidget import QRCodeWidget
-import electrum_gui.bmp
+from electrum_gui.gui_classic.qrcodewidget import QRCodeWidget
+from electrum import bmp
 import json
 
 try:
@@ -16,7 +16,7 @@ try:
 except ImportError:
     zbar = None
 
-from electrum_gui import BasePlugin
+from electrum import BasePlugin
 class Plugin(BasePlugin):
 
     def fullname(self): return 'QR scans'
diff --git a/plugins/virtualkeyboard.py b/plugins/virtualkeyboard.py
index 6d081a086..bb9ee917c 100644
--- a/plugins/virtualkeyboard.py
+++ b/plugins/virtualkeyboard.py
@@ -1,6 +1,6 @@
 from PyQt4.QtGui import *
-from electrum_gui import BasePlugin
-from electrum_gui.i18n import _
+from electrum import BasePlugin
+from electrum.i18n import _
 
 class Plugin(BasePlugin):