mv client/* . && rm -fr client

diff --git a/client/LICENCE b/LICENCE
similarity index 100%
rename from client/LICENCE
rename to LICENCE

diff --git a/client/MANIFEST.in b/MANIFEST.in
similarity index 100%
rename from client/MANIFEST.in
rename to MANIFEST.in

diff --git a/client/README b/README
similarity index 100%
rename from client/README
rename to README

diff --git a/client/RELEASE-NOTES b/RELEASE-NOTES
similarity index 100%
rename from client/RELEASE-NOTES
rename to RELEASE-NOTES

diff --git a/client/blocks b/blocks
similarity index 100%
rename from client/blocks
rename to blocks

diff --git a/client/bmp.py b/bmp.py
similarity index 100%
rename from client/bmp.py
rename to bmp.py

diff --git a/client/docs/android.html b/docs/android.html
similarity index 100%
rename from client/docs/android.html
rename to docs/android.html

diff --git a/client/electrum b/electrum
similarity index 100%
rename from client/electrum
rename to electrum

diff --git a/client/electrum4a.py b/electrum4a.py
similarity index 100%
rename from client/electrum4a.py
rename to electrum4a.py

diff --git a/client/electrum_text_320.png b/electrum_text_320.png
similarity index 100%
rename from client/electrum_text_320.png
rename to electrum_text_320.png

diff --git a/client/gui.py b/gui.py
similarity index 100%
rename from client/gui.py
rename to gui.py

diff --git a/client/gui_qt.py b/gui_qt.py
similarity index 100%
rename from client/gui_qt.py
rename to gui_qt.py

diff --git a/client/icons.qrc b/icons.qrc
similarity index 100%
rename from client/icons.qrc
rename to icons.qrc

diff --git a/client/icons/confirmed.png b/icons/confirmed.png
similarity index 100%
rename from client/icons/confirmed.png
rename to icons/confirmed.png

diff --git a/client/icons/lock.png b/icons/lock.png
similarity index 100%
rename from client/icons/lock.png
rename to icons/lock.png

diff --git a/client/icons/lock.svg b/icons/lock.svg
similarity index 100%
rename from client/icons/lock.svg
rename to icons/lock.svg

diff --git a/client/icons/network.png b/icons/network.png
similarity index 100%
rename from client/icons/network.png
rename to icons/network.png

diff --git a/client/icons/preferences.png b/icons/preferences.png
similarity index 100%
rename from client/icons/preferences.png
rename to icons/preferences.png

diff --git a/client/icons/seed.png b/icons/seed.png
similarity index 100%
rename from client/icons/seed.png
rename to icons/seed.png

diff --git a/client/icons/status_connected.png b/icons/status_connected.png
similarity index 100%
rename from client/icons/status_connected.png
rename to icons/status_connected.png

diff --git a/client/icons/status_disconnected.png b/icons/status_disconnected.png
similarity index 100%
rename from client/icons/status_disconnected.png
rename to icons/status_disconnected.png

diff --git a/client/icons/status_disconnected.svg b/icons/status_disconnected.svg
similarity index 100%
rename from client/icons/status_disconnected.svg
rename to icons/status_disconnected.svg

diff --git a/client/icons/status_waiting.png b/icons/status_waiting.png
similarity index 100%
rename from client/icons/status_waiting.png
rename to icons/status_waiting.png

diff --git a/client/icons/status_waiting.svg b/icons/status_waiting.svg
similarity index 100%
rename from client/icons/status_waiting.svg
rename to icons/status_waiting.svg

diff --git a/client/icons/unconfirmed.png b/icons/unconfirmed.png
similarity index 100%
rename from client/icons/unconfirmed.png
rename to icons/unconfirmed.png

diff --git a/client/icons/unconfirmed.svg b/icons/unconfirmed.svg
similarity index 100%
rename from client/icons/unconfirmed.svg
rename to icons/unconfirmed.svg

diff --git a/client/interface.py b/interface.py
similarity index 100%
rename from client/interface.py
rename to interface.py

diff --git a/client/mnemonic.py b/mnemonic.py
similarity index 100%
rename from client/mnemonic.py
rename to mnemonic.py

diff --cc msqr.py
Simple merge

diff --cc peers
Simple merge

diff --cc pyqrnative.py
Simple merge

diff --cc remote.php
Simple merge

diff --cc remote_wallet.py
Simple merge

diff --cc ripemd.py
Simple merge

diff --cc setup.py
Simple merge

diff --cc upgrade.py
Simple merge

diff --cc version.py
Simple merge

diff --cc wallet.py
Simple merge