Merge remote-tracking branch 'kali/feature/create_bitmask_namespace' into develop

84 files changed, 223 insertions, 196 deletions

diff --git a/Makefile b/Makefile
index 0c9b7951..011c060e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@
 
 #Directory with ui and resource files
 RESOURCE_DIR = data/resources
-UI_DIR = src/leap/gui/ui
+UI_DIR = src/leap/bitmask/gui/ui
 
 #Directory for compiled resources
-COMPILED_DIR = src/leap/gui
+COMPILED_DIR = src/leap/bitmask/gui
 
 #Directory for (finished) translations
 TRANSLAT_DIR = data/translations
@@ -61,7 +61,7 @@ manpages:
 	rst2man docs/man/bitmask.1.rst docs/man/bitmask.1
 
 apidocs:
-	@sphinx-apidoc -o docs/api src/leap
+	@sphinx-apidoc -o docs/api src/leap/bitmask
 
 clean :
 	$(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
diff --git a/changes/feature_2959_create_bitmask_namespace b/changes/feature_2959_create_bitmask_namespace
new file mode 100644
index 00000000..9f7e9cd4
--- /dev/null
+++ b/changes/feature_2959_create_bitmask_namespace
@@ -0,0 +1 @@
+  o Move all client code into its own namespace (leap.bitmask). Closes: #2959
diff --git a/data/bitmask.pro b/data/bitmask.pro
index ff26ad1a..e117668b 100644
--- a/data/bitmask.pro
+++ b/data/bitmask.pro
@@ -6,51 +6,50 @@
 # find . -iname "*.py" | grep -Ev "__init__.py|/build/|/docs/|/gui/ui_[a-z]*.py|/gui/[a-z]*_rc.py|./.venv/|/tests/"
 # and remove by hand the few files that we do not want.
 
-SOURCES += ../src/leap/app.py \
-           ../src/leap/config/leapsettings.py \
-           ../src/leap/config/providerconfig.py \
-           ../src/leap/crypto/srpauth.py \
-           ../src/leap/crypto/srpregister.py \
-           ../src/leap/gui/loggerwindow.py \
-           ../src/leap/gui/login.py \
-           ../src/leap/gui/mainwindow.py \
-           ../src/leap/gui/statuspanel.py \
-           ../src/leap/gui/twisted_main.py \
-           ../src/leap/gui/wizardpage.py \
-           ../src/leap/gui/wizard.py \
-           ../src/leap/platform_init/initializers.py \
-           ../src/leap/platform_init/locks.py \
-           ../src/leap/provider/supportedapis.py \
-           ../src/leap/services/abstractbootstrapper.py \
-           ../src/leap/services/eip/eipbootstrapper.py \
-           ../src/leap/services/eip/eipconfig.py \
-           ../src/leap/services/eip/providerbootstrapper.py \
-           ../src/leap/services/eip/udstelnet.py \
-           ../src/leap/services/eip/vpnlaunchers.py \
-           ../src/leap/services/eip/vpnprocess.py \
-           ../src/leap/services/mail/smtpbootstrapper.py \
-           ../src/leap/services/mail/smtpconfig.py \
-           ../src/leap/services/soledad/soledadbootstrapper.py \
-           ../src/leap/services/soledad/soledadconfig.py \
-           ../src/leap/services/tx.py \
-           ../src/leap/util/constants.py \
-           ../src/leap/util/keyring_helpers.py \
-           ../src/leap/util/leap_argparse.py \
-           ../src/leap/util/leap_log_handler.py \
-           ../src/leap/util/privilege_policies.py \
-           ../src/leap/util/pyside_tests_helper.py \
-           ../src/leap/util/request_helpers.py \
-           ../src/leap/util/requirement_checker.py
-
-FORMS += ../src/leap/gui/ui/loggerwindow.ui \
-         ../src/leap/gui/ui/login.ui \
-         ../src/leap/gui/ui/mainwindow.ui \
-         ../src/leap/gui/ui/statuspanel.ui \
-         ../src/leap/gui/ui/wizard.ui \
+SOURCES += ../src/leap/bitmask/app.py \
+           ../src/leap/bitmask/config/leapsettings.py \
+           ../src/leap/bitmask/config/providerconfig.py \
+           ../src/leap/bitmask/crypto/srpauth.py \
+           ../src/leap/bitmask/crypto/srpregister.py \
+           ../src/leap/bitmask/gui/loggerwindow.py \
+           ../src/leap/bitmask/gui/login.py \
+           ../src/leap/bitmask/gui/mainwindow.py \
+           ../src/leap/bitmask/gui/statuspanel.py \
+           ../src/leap/bitmask/gui/twisted_main.py \
+           ../src/leap/bitmask/gui/wizardpage.py \
+           ../src/leap/bitmask/gui/wizard.py \
+           ../src/leap/bitmask/platform_init/initializers.py \
+           ../src/leap/bitmask/platform_init/locks.py \
+           ../src/leap/bitmask/provider/supportedapis.py \
+           ../src/leap/bitmask/services/abstractbootstrapper.py \
+           ../src/leap/bitmask/services/eip/eipbootstrapper.py \
+           ../src/leap/bitmask/services/eip/eipconfig.py \
+           ../src/leap/bitmask/services/eip/providerbootstrapper.py \
+           ../src/leap/bitmask/services/eip/udstelnet.py \
+           ../src/leap/bitmask/services/eip/vpnlaunchers.py \
+           ../src/leap/bitmask/services/eip/vpnprocess.py \
+           ../src/leap/bitmask/services/mail/smtpbootstrapper.py \
+           ../src/leap/bitmask/services/mail/smtpconfig.py \
+           ../src/leap/bitmask/services/soledad/soledadbootstrapper.py \
+           ../src/leap/bitmask/services/soledad/soledadconfig.py \
+           ../src/leap/bitmask/services/tx.py \
+           ../src/leap/bitmask/util/constants.py \
+           ../src/leap/bitmask/util/keyring_helpers.py \
+           ../src/leap/bitmask/util/leap_argparse.py \
+           ../src/leap/bitmask/util/leap_log_handler.py \
+           ../src/leap/bitmask/util/privilege_policies.py \
+           ../src/leap/bitmask/util/pyside_tests_helper.py \
+           ../src/leap/bitmask/util/request_helpers.py \
+           ../src/leap/bitmask/util/requirement_checker.py
+
+FORMS += ../src/leap/bitmask/gui/ui/loggerwindow.ui \
+         ../src/leap/bitmask/gui/ui/login.ui \
+         ../src/leap/bitmask/gui/ui/mainwindow.ui \
+         ../src/leap/bitmask/gui/ui/statuspanel.ui \
+         ../src/leap/bitmask/gui/ui/wizard.ui \
 
 # where to generate ts files -- tx will pick from here
 
 # original file, english
 
 TRANSLATIONS    += ts/en_US.ts
-
diff --git a/setup.py b/setup.py
index 4b36ad72..49bbc061 100755
--- a/setup.py
+++ b/setup.py
@@ -16,12 +16,12 @@ import os
 from pkg import utils
 
 import versioneer
-versioneer.versionfile_source = 'src/leap/_version.py'
-versioneer.versionfile_build = 'leap/_version.py'
+versioneer.versionfile_source = 'src/leap/bitmask/_version.py'
+versioneer.versionfile_build = 'leap/bitmask/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
-versioneer.parentdir_prefix = 'bitmask-'
+#versioneer.parentdir_prefix = 'bitmask-'
 
-from setuptools import Command
+#from setuptools import Command
 
 # The following import avoids the premature unloading of the `util` submodule
 # when running tests, which would cause an error when nose finishes tests and
@@ -110,7 +110,7 @@ cmdclass["sdist"] = cmd_sdist
 
 
 setup(
-    name="bitmask",
+    name="leap.bitmask",
     package_dir={"": "src"},
     version=versioneer.get_version(),
     cmdclass=cmdclass,
diff --git a/src/leap/config/__init__.py b/src/leap/bitmask/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/config/__init__.py
+++ b/src/leap/bitmask/__init__.py
diff --git a/src/leap/_version.py b/src/leap/bitmask/_version.py
index 05542975..412b0c9e 100644
--- a/src/leap/_version.py
+++ b/src/leap/bitmask/_version.py
@@ -185,7 +185,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source,
 
 tag_prefix = ""
 parentdir_prefix = "bitmask-"
-versionfile_source = "src/leap/_version.py"
+versionfile_source = "src/leap/bitmask/_version.py"
 
 
 def get_versions(default={"version": "unknown", "full": ""}, verbose=False):
diff --git a/src/leap/app.py b/src/leap/bitmask/app.py
index 22340d4d..3c418258 100644
--- a/src/leap/app.py
+++ b/src/leap/bitmask/app.py
@@ -24,18 +24,18 @@ from functools import partial
 
 from PySide import QtCore, QtGui
 
+from leap.bitmask.gui import locale_rc
+from leap.bitmask.gui import twisted_main
+from leap.bitmask.gui.mainwindow import MainWindow
+from leap.bitmask.platform_init import IS_MAC
+from leap.bitmask.platform_init.locks import we_are_the_one_and_only
+#from leap.bitmask.services.tx import leap_services
+from leap.bitmask.util import __version__ as VERSION
+from leap.bitmask.util import leap_argparse
+from leap.bitmask.util.leap_log_handler import LeapLogHandler
+from leap.bitmask.util.streamtologger import StreamToLogger
+from leap.bitmask.util.requirement_checker import check_requirements
 from leap.common.events import server as event_server
-from leap.util import __version__ as VERSION
-from leap.util import leap_argparse
-from leap.util.leap_log_handler import LeapLogHandler
-from leap.util.streamtologger import StreamToLogger
-from leap.util.requirement_checker import check_requirements
-from leap.gui import locale_rc
-from leap.gui import twisted_main
-from leap.gui.mainwindow import MainWindow
-from leap.platform_init import IS_MAC
-from leap.platform_init.locks import we_are_the_one_and_only
-from leap.services.tx import leap_services
 
 
 import codecs
diff --git a/src/leap/crypto/__init__.py b/src/leap/bitmask/config/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/crypto/__init__.py
+++ b/src/leap/bitmask/config/__init__.py
diff --git a/src/leap/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py
index 35010280..35010280 100644
--- a/src/leap/config/leapsettings.py
+++ b/src/leap/bitmask/config/leapsettings.py
diff --git a/src/leap/config/provider_spec.py b/src/leap/bitmask/config/provider_spec.py
index cf942c7b..cf942c7b 100644
--- a/src/leap/config/provider_spec.py
+++ b/src/leap/bitmask/config/provider_spec.py
diff --git a/src/leap/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index f899b17c..c65932be 100644
--- a/src/leap/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -21,9 +21,9 @@ Provider configuration
 import logging
 import os
 
+from leap.bitmask.config.provider_spec import leap_provider_spec
 from leap.common.check import leap_check
 from leap.common.config.baseconfig import BaseConfig, LocalizedKey
-from leap.config.provider_spec import leap_provider_spec
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/config/tests/test_providerconfig.py b/src/leap/bitmask/config/tests/test_providerconfig.py
index ff2828e6..7661a1ce 100644
--- a/src/leap/config/tests/test_providerconfig.py
+++ b/src/leap/bitmask/config/tests/test_providerconfig.py
@@ -27,9 +27,9 @@ import os
 import json
 import copy
 
+from leap.bitmask.config.providerconfig import ProviderConfig, MissingCACert
+from leap.bitmask.services import get_supported
 from leap.common.testing.basetest import BaseLeapTest
-from leap.config.providerconfig import ProviderConfig, MissingCACert
-from leap.services import get_supported
 
 from mock import Mock
 
diff --git a/src/leap/provider/__init__.py b/src/leap/bitmask/crypto/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/provider/__init__.py
+++ b/src/leap/bitmask/crypto/__init__.py
diff --git a/src/leap/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index fc0533fc..2d34bb74 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
@@ -29,9 +29,9 @@ from functools import partial
 from PySide import QtCore
 from twisted.internet import threads
 
+from leap.bitmask.util import request_helpers as reqhelper
+from leap.bitmask.util.constants import REQUEST_TIMEOUT
 from leap.common.check import leap_assert
-from leap.util.constants import REQUEST_TIMEOUT
-from leap.util import request_helpers as reqhelper
 from leap.common.events import signal as events_signal
 from leap.common.events import events_pb2 as proto
 
diff --git a/src/leap/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index de1978b5..c69294d7 100644
--- a/src/leap/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -24,8 +24,8 @@ import srp
 from PySide import QtCore
 from urlparse import urlparse
 
-from leap.config.providerconfig import ProviderConfig
-from leap.util.constants import SIGNUP_TIMEOUT
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.util.constants import SIGNUP_TIMEOUT
 from leap.common.check import leap_assert, leap_assert_type
 
 logger = logging.getLogger(__name__)
diff --git a/src/leap/crypto/tests/__init__.py b/src/leap/bitmask/crypto/tests/__init__.py
index 7f118735..7f118735 100644
--- a/src/leap/crypto/tests/__init__.py
+++ b/src/leap/bitmask/crypto/tests/__init__.py
diff --git a/src/leap/crypto/tests/eip-service.json b/src/leap/bitmask/crypto/tests/eip-service.json
index 24df42a2..24df42a2 100644
--- a/src/leap/crypto/tests/eip-service.json
+++ b/src/leap/bitmask/crypto/tests/eip-service.json
diff --git a/src/leap/crypto/tests/fake_provider.py b/src/leap/bitmask/crypto/tests/fake_provider.py
index 54af485d..54af485d 100755
--- a/src/leap/crypto/tests/fake_provider.py
+++ b/src/leap/bitmask/crypto/tests/fake_provider.py
diff --git a/src/leap/crypto/tests/openvpn.pem b/src/leap/bitmask/crypto/tests/openvpn.pem
index a95e9370..a95e9370 100644
--- a/src/leap/crypto/tests/openvpn.pem
+++ b/src/leap/bitmask/crypto/tests/openvpn.pem
diff --git a/src/leap/crypto/tests/test_provider.json b/src/leap/bitmask/crypto/tests/test_provider.json
index c37bef8f..c37bef8f 100644
--- a/src/leap/crypto/tests/test_provider.json
+++ b/src/leap/bitmask/crypto/tests/test_provider.json
diff --git a/src/leap/crypto/tests/test_srpauth.py b/src/leap/bitmask/crypto/tests/test_srpauth.py
index e3258fd3..043da15e 100644
--- a/src/leap/crypto/tests/test_srpauth.py
+++ b/src/leap/bitmask/crypto/tests/test_srpauth.py
@@ -28,19 +28,20 @@ import binascii
 import requests
 import mock
 
+from functools import partial
+
 from mock import MagicMock
 from nose.twistedtools import reactor, deferred
 from twisted.python import log
 from twisted.internet import threads
-from functools import partial
 from requests.models import Response
 from simplejson.decoder import JSONDecodeError
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto import srpregister, srpauth
+from leap.bitmask.crypto.tests import fake_provider
+from leap.bitmask.util.request_helpers import get_content
 from leap.common.testing.https_server import where
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto import srpregister, srpauth
-from leap.crypto.tests import fake_provider
-from leap.util.request_helpers import get_content
 
 log.startLogging(sys.stdout)
 
diff --git a/src/leap/crypto/tests/test_srpregister.py b/src/leap/bitmask/crypto/tests/test_srpregister.py
index 66b815f2..4d6e7be3 100644
--- a/src/leap/crypto/tests/test_srpregister.py
+++ b/src/leap/bitmask/crypto/tests/test_srpregister.py
@@ -30,10 +30,10 @@ from nose.twistedtools import reactor, deferred
 from twisted.python import log
 from twisted.internet import threads
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto import srpregister, srpauth
+from leap.bitmask.crypto.tests import fake_provider
 from leap.common.testing.https_server import where
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto import srpregister, srpauth
-from leap.crypto.tests import fake_provider
 
 log.startLogging(sys.stdout)
 
diff --git a/src/leap/crypto/tests/wrongcert.pem b/src/leap/bitmask/crypto/tests/wrongcert.pem
index e6cff38a..e6cff38a 100644
--- a/src/leap/crypto/tests/wrongcert.pem
+++ b/src/leap/bitmask/crypto/tests/wrongcert.pem
diff --git a/src/leap/gui/__init__.py b/src/leap/bitmask/gui/__init__.py
index 4b289442..4b289442 100644
--- a/src/leap/gui/__init__.py
+++ b/src/leap/bitmask/gui/__init__.py
diff --git a/src/leap/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index fcbdbf19..981bf65d 100644
--- a/src/leap/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
@@ -21,9 +21,11 @@ History log window
 import logging
 
 from PySide import QtGui
+
 from ui_loggerwindow import Ui_LoggerWindow
+
+from leap.bitmask.util.leap_log_handler import LeapLogHandler
 from leap.common.check import leap_assert, leap_assert_type
-from leap.util.leap_log_handler import LeapLogHandler
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/gui/login.py b/src/leap/bitmask/gui/login.py
index de0b2d50..db7b8e2a 100644
--- a/src/leap/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
@@ -23,7 +23,7 @@ import logging
 from PySide import QtCore, QtGui
 from ui_login import Ui_LoginWidget
 
-from leap.util.keyring_helpers import has_keyring
+from leap.bitmask.util.keyring_helpers import has_keyring
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 49a65867..6dd28f04 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -29,44 +29,47 @@ import keyring
 from PySide import QtCore, QtGui
 from twisted.internet import threads
 
-from leap.common.check import leap_assert
-from leap.common.events import register
-from leap.common.events import events_pb2 as proto
-from leap.config.leapsettings import LeapSettings
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.srpauth import SRPAuth
-from leap.gui.loggerwindow import LoggerWindow
-from leap.gui.wizard import Wizard
-from leap.gui.login import LoginWidget
-from leap.gui.statuspanel import StatusPanelWidget
-from leap.services.eip.eipbootstrapper import EIPBootstrapper
-from leap.services.eip.eipconfig import EIPConfig
-from leap.services.eip.providerbootstrapper import ProviderBootstrapper
+from leap.bitmask.config.leapsettings import LeapSettings
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.gui.loggerwindow import LoggerWindow
+from leap.bitmask.gui.wizard import Wizard
+from leap.bitmask.gui.login import LoginWidget
+from leap.bitmask.gui.statuspanel import StatusPanelWidget
+from leap.bitmask.services.eip.eipbootstrapper import EIPBootstrapper
+from leap.bitmask.services.eip.eipconfig import EIPConfig
+from leap.bitmask.services.eip.providerbootstrapper import ProviderBootstrapper
 # XXX: Soledad might not work out of the box in Windows, issue #2932
-from leap.services.soledad.soledadbootstrapper import SoledadBootstrapper
-from leap.services.mail.smtpbootstrapper import SMTPBootstrapper
-from leap.services.mail import imap
-from leap.platform_init import IS_WIN, IS_MAC
-from leap.platform_init.initializers import init_platform
+from leap.bitmask.services.soledad.soledadbootstrapper import \
+    SoledadBootstrapper
+from leap.bitmask.services.mail.smtpbootstrapper import SMTPBootstrapper
+from leap.bitmask.services.mail import imap
+from leap.bitmask.platform_init import IS_WIN, IS_MAC
+from leap.bitmask.platform_init.initializers import init_platform
 
-from leap.services.eip.vpnprocess import VPN
-from leap.services.eip.vpnprocess import OpenVPNAlreadyRunning
-from leap.services.eip.vpnprocess import AlienOpenVPNAlreadyRunning
+from leap.bitmask.services.eip.vpnprocess import VPN
+from leap.bitmask.services.eip.vpnprocess import OpenVPNAlreadyRunning
+from leap.bitmask.services.eip.vpnprocess import AlienOpenVPNAlreadyRunning
 
-from leap.services.eip.vpnlaunchers import VPNLauncherException
-from leap.services.eip.vpnlaunchers import OpenVPNNotFoundException
-from leap.services.eip.vpnlaunchers import EIPNoPkexecAvailable
-from leap.services.eip.vpnlaunchers import EIPNoPolkitAuthAgentAvailable
-from leap.services.eip.vpnlaunchers import EIPNoTunKextLoaded
+from leap.bitmask.services.eip.vpnlaunchers import VPNLauncherException
+from leap.bitmask.services.eip.vpnlaunchers import OpenVPNNotFoundException
+from leap.bitmask.services.eip.vpnlaunchers import EIPNoPkexecAvailable
+from leap.bitmask.services.eip.vpnlaunchers import \
+    EIPNoPolkitAuthAgentAvailable
+from leap.bitmask.services.eip.vpnlaunchers import EIPNoTunKextLoaded
 
-from leap.util import __version__ as VERSION
-from leap.util.keyring_helpers import has_keyring
+from leap.bitmask.util import __version__ as VERSION
+from leap.bitmask.util.keyring_helpers import has_keyring
 
-from leap.services.mail.smtpconfig import SMTPConfig
+from leap.bitmask.services.mail.smtpconfig import SMTPConfig
 
 if IS_WIN:
-    from leap.platform_init.locks import WindowsLock
-    from leap.platform_init.locks import raise_window_ack
+    from leap.bitmask.platform_init.locks import WindowsLock
+    from leap.bitmask.platform_init.locks import raise_window_ack
+
+from leap.common.check import leap_assert
+from leap.common.events import register
+from leap.common.events import events_pb2 as proto
 
 from ui_mainwindow import Ui_MainWindow
 
diff --git a/src/leap/gui/statuspanel.py b/src/leap/bitmask/gui/statuspanel.py
index f3424c7c..8f5427ad 100644
--- a/src/leap/gui/statuspanel.py
+++ b/src/leap/bitmask/gui/statuspanel.py
@@ -22,14 +22,15 @@ import logging
 
 from datetime import datetime
 from functools import partial
-from PySide import QtCore, QtGui
 
-from ui_statuspanel import Ui_StatusPanel
+from PySide import QtCore, QtGui
 
+from leap.bitmask.services.eip.vpnprocess import VPNManager
+from leap.bitmask.platform_init import IS_WIN, IS_LINUX
+from leap.bitmask.util import first
 from leap.common.check import leap_assert_type
-from leap.services.eip.vpnprocess import VPNManager
-from leap.platform_init import IS_WIN, IS_LINUX
-from leap.util import first
+
+from ui_statuspanel import Ui_StatusPanel
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/gui/twisted_main.py b/src/leap/bitmask/gui/twisted_main.py
index c7add3ee..c7add3ee 100644
--- a/src/leap/gui/twisted_main.py
+++ b/src/leap/bitmask/gui/twisted_main.py
diff --git a/src/leap/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui
index b08428a9..b08428a9 100644
--- a/src/leap/gui/ui/loggerwindow.ui
+++ b/src/leap/bitmask/gui/ui/loggerwindow.ui
diff --git a/src/leap/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index 42a6897a..42a6897a 100644
--- a/src/leap/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
diff --git a/src/leap/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index ecd3cbe9..ecd3cbe9 100644
--- a/src/leap/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
diff --git a/src/leap/gui/ui/statuspanel.ui b/src/leap/bitmask/gui/ui/statuspanel.ui
index 3482ac7c..3482ac7c 100644
--- a/src/leap/gui/ui/statuspanel.ui
+++ b/src/leap/bitmask/gui/ui/statuspanel.ui
diff --git a/src/leap/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 5e0108dc..5e0108dc 100644
--- a/src/leap/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
diff --git a/src/leap/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 1710b09b..ed6c1da0 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -22,18 +22,20 @@ import os
 import logging
 import json
 
-from PySide import QtCore, QtGui
 from functools import partial
+
+from PySide import QtCore, QtGui
 from twisted.internet import threads
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.srpregister import SRPRegister
+from leap.bitmask.util.privilege_policies import is_missing_policy_permissions
+from leap.bitmask.util.request_helpers import get_content
+from leap.bitmask.util.keyring_helpers import has_keyring
+from leap.bitmask.services.eip.providerbootstrapper import ProviderBootstrapper
+from leap.bitmask.services import get_supported
+
 from ui_wizard import Ui_Wizard
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.srpregister import SRPRegister
-from leap.util.privilege_policies import is_missing_policy_permissions
-from leap.util.request_helpers import get_content
-from leap.util.keyring_helpers import has_keyring
-from leap.services.eip.providerbootstrapper import ProviderBootstrapper
-from leap.services import get_supported
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/gui/wizardpage.py b/src/leap/bitmask/gui/wizardpage.py
index b2a00028..b2a00028 100644
--- a/src/leap/gui/wizardpage.py
+++ b/src/leap/bitmask/gui/wizardpage.py
diff --git a/src/leap/platform_init/__init__.py b/src/leap/bitmask/platform_init/__init__.py
index 2a262a30..2a262a30 100644
--- a/src/leap/platform_init/__init__.py
+++ b/src/leap/bitmask/platform_init/__init__.py
diff --git a/src/leap/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index 81fc002b..831c6a1c 100644
--- a/src/leap/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -28,10 +28,10 @@ import tempfile
 
 from PySide import QtGui
 
-from leap.config.leapsettings import LeapSettings
-from leap.services.eip import vpnlaunchers
-from leap.util import first
-from leap.util import privilege_policies
+from leap.bitmask.config.leapsettings import LeapSettings
+from leap.bitmask.services.eip import vpnlaunchers
+from leap.bitmask.util import first
+from leap.bitmask.util import privilege_policies
 
 
 logger = logging.getLogger(__name__)
diff --git a/src/leap/platform_init/locks.py b/src/leap/bitmask/platform_init/locks.py
index 39b18648..ecfe3b1f 100644
--- a/src/leap/platform_init/locks.py
+++ b/src/leap/bitmask/platform_init/locks.py
@@ -22,9 +22,9 @@ import errno
 import os
 import platform
 
+from leap.bitmask import platform_init
 from leap.common.events import signal as signal_event
 from leap.common.events import events_pb2 as proto
-from leap import platform_init
 
 if platform_init.IS_UNIX:
     from fcntl import flock, LOCK_EX, LOCK_NB
@@ -36,7 +36,7 @@ else:  # WINDOWS
 
     from tempfile import gettempdir
 
-    from leap.util import get_modification_ts, update_modification_ts
+    from leap.bitmask.util import get_modification_ts, update_modification_ts
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/eip/__init__.py b/src/leap/bitmask/provider/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/eip/__init__.py
+++ b/src/leap/bitmask/provider/__init__.py
diff --git a/src/leap/provider/supportedapis.py b/src/leap/bitmask/provider/supportedapis.py
index 3e650ba2..3e650ba2 100644
--- a/src/leap/provider/supportedapis.py
+++ b/src/leap/bitmask/provider/supportedapis.py
diff --git a/src/leap/services/__init__.py b/src/leap/bitmask/services/__init__.py
index 253359cd..253359cd 100644
--- a/src/leap/services/__init__.py
+++ b/src/leap/bitmask/services/__init__.py
diff --git a/src/leap/services/abstractbootstrapper.py b/src/leap/bitmask/services/abstractbootstrapper.py
index 9e50948c..6f246f47 100644
--- a/src/leap/services/abstractbootstrapper.py
+++ b/src/leap/bitmask/services/abstractbootstrapper.py
@@ -26,6 +26,7 @@ from functools import partial
 
 from PySide import QtCore
 from twisted.internet import threads
+
 from leap.common.check import leap_assert, leap_assert_type
 
 logger = logging.getLogger(__name__)
diff --git a/src/leap/services/eip/tests/__init__.py b/src/leap/bitmask/services/eip/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/eip/tests/__init__.py
+++ b/src/leap/bitmask/services/eip/__init__.py
diff --git a/src/leap/services/eip/eipbootstrapper.py b/src/leap/bitmask/services/eip/eipbootstrapper.py
index 1d7bc342..6393e53a 100644
--- a/src/leap/services/eip/eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/eipbootstrapper.py
@@ -24,15 +24,15 @@ import os
 
 from PySide import QtCore
 
-from leap.common.check import leap_assert, leap_assert_type
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.services.eip.eipconfig import EIPConfig
+from leap.bitmask.util.request_helpers import get_content
+from leap.bitmask.util.constants import REQUEST_TIMEOUT
+from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
 from leap.common import certs
+from leap.common.check import leap_assert, leap_assert_type
 from leap.common.files import check_and_fix_urw_only, get_mtime, mkdir_p
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.srpauth import SRPAuth
-from leap.services.eip.eipconfig import EIPConfig
-from leap.util.request_helpers import get_content
-from leap.util.constants import REQUEST_TIMEOUT
-from leap.services.abstractbootstrapper import AbstractBootstrapper
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py
index d69e1fd8..843e7397 100644
--- a/src/leap/services/eip/eipconfig.py
+++ b/src/leap/bitmask/services/eip/eipconfig.py
@@ -25,10 +25,10 @@ import time
 
 import ipaddr
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.services.eip.eipspec import get_schema
 from leap.common.check import leap_assert, leap_assert_type
 from leap.common.config.baseconfig import BaseConfig
-from leap.config.providerconfig import ProviderConfig
-from leap.services.eip.eipspec import get_schema
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/eip/eipspec.py b/src/leap/bitmask/services/eip/eipspec.py
index 9cc56be3..9cc56be3 100644
--- a/src/leap/services/eip/eipspec.py
+++ b/src/leap/bitmask/services/eip/eipspec.py
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/bitmask/services/eip/providerbootstrapper.py
index bf5938dc..ac3a44db 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/bitmask/services/eip/providerbootstrapper.py
@@ -26,14 +26,14 @@ import requests
 
 from PySide import QtCore
 
+from leap.bitmask.config.providerconfig import ProviderConfig, MissingCACert
+from leap.bitmask.util.request_helpers import get_content
+from leap.bitmask.util.constants import REQUEST_TIMEOUT
+from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
+from leap.bitmask.provider.supportedapis import SupportedAPIs
 from leap.common.certs import get_digest
 from leap.common.files import check_and_fix_urw_only, get_mtime, mkdir_p
 from leap.common.check import leap_assert, leap_assert_type, leap_check
-from leap.config.providerconfig import ProviderConfig, MissingCACert
-from leap.util.request_helpers import get_content
-from leap.util.constants import REQUEST_TIMEOUT
-from leap.services.abstractbootstrapper import AbstractBootstrapper
-from leap.provider.supportedapis import SupportedAPIs
 
 
 logger = logging.getLogger(__name__)
diff --git a/src/leap/services/mail/__init__.py b/src/leap/bitmask/services/eip/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/mail/__init__.py
+++ b/src/leap/bitmask/services/eip/tests/__init__.py
diff --git a/src/leap/services/eip/tests/test_eipbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
index f2331eca..d0d78eed 100644
--- a/src/leap/services/eip/tests/test_eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
@@ -36,13 +36,13 @@ from nose.twistedtools import deferred, reactor
 from twisted.internet import threads
 from requests.models import Response
 
+from leap.bitmask.services.eip.eipbootstrapper import EIPBootstrapper
+from leap.bitmask.services.eip.eipconfig import EIPConfig
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.tests import fake_provider
+from leap.bitmask.crypto.srpauth import SRPAuth
 from leap.common.testing.basetest import BaseLeapTest
-from leap.services.eip.eipbootstrapper import EIPBootstrapper
-from leap.services.eip.eipconfig import EIPConfig
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.tests import fake_provider
 from leap.common.files import mkdir_p
-from leap.crypto.srpauth import SRPAuth
 
 
 class EIPBootstrapperActiveTest(BaseLeapTest):
diff --git a/src/leap/services/eip/tests/test_eipconfig.py b/src/leap/bitmask/services/eip/tests/test_eipconfig.py
index 87ce04c2..f8489e07 100644
--- a/src/leap/services/eip/tests/test_eipconfig.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipconfig.py
@@ -22,9 +22,9 @@ import json
 import os
 import unittest
 
+from leap.bitmask.services.eip.eipconfig import EIPConfig
+from leap.bitmask.config.providerconfig import ProviderConfig
 from leap.common.testing.basetest import BaseLeapTest
-from leap.services.eip.eipconfig import EIPConfig
-from leap.config.providerconfig import ProviderConfig
 
 from mock import Mock
 
diff --git a/src/leap/services/eip/tests/test_providerbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
index b24334a2..96ab53ce 100644
--- a/src/leap/services/eip/tests/test_providerbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
@@ -39,15 +39,16 @@ from nose.twistedtools import deferred, reactor
 from twisted.internet import threads
 from requests.models import Response
 
+from leap.bitmask.services.eip.providerbootstrapper import ProviderBootstrapper
+from leap.bitmask.services.eip.providerbootstrapper import \
+    UnsupportedProviderAPI
+from leap.bitmask.services.eip.providerbootstrapper import WrongFingerprint
+from leap.bitmask.provider.supportedapis import SupportedAPIs
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.tests import fake_provider
+from leap.common.files import mkdir_p
 from leap.common.testing.https_server import where
 from leap.common.testing.basetest import BaseLeapTest
-from leap.services.eip.providerbootstrapper import ProviderBootstrapper
-from leap.services.eip.providerbootstrapper import UnsupportedProviderAPI
-from leap.services.eip.providerbootstrapper import WrongFingerprint
-from leap.provider.supportedapis import SupportedAPIs
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.tests import fake_provider
-from leap.common.files import mkdir_p
 
 
 class ProviderBootstrapperTest(BaseLeapTest):
diff --git a/src/leap/services/eip/tests/test_vpngatewayselector.py b/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
index c90681d7..f9a177a9 100644
--- a/src/leap/services/eip/tests/test_vpngatewayselector.py
+++ b/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
@@ -20,8 +20,9 @@ tests for vpngatewayselector
 
 import unittest
 
-from leap.services.eip.eipconfig import EIPConfig, VPNGatewaySelector
+from leap.bitmask.services.eip.eipconfig import EIPConfig, VPNGatewaySelector
 from leap.common.testing.basetest import BaseLeapTest
+
 from mock import Mock
 
 
diff --git a/src/leap/services/eip/tests/wrongcert.pem b/src/leap/bitmask/services/eip/tests/wrongcert.pem
index e6cff38a..e6cff38a 100644
--- a/src/leap/services/eip/tests/wrongcert.pem
+++ b/src/leap/bitmask/services/eip/tests/wrongcert.pem
diff --git a/src/leap/services/eip/udstelnet.py b/src/leap/bitmask/services/eip/udstelnet.py
index e6c82350..e6c82350 100644
--- a/src/leap/services/eip/udstelnet.py
+++ b/src/leap/bitmask/services/eip/udstelnet.py
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/bitmask/services/eip/vpnlaunchers.py
index 17950a25..8a127ce9 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/bitmask/services/eip/vpnlaunchers.py
@@ -33,13 +33,13 @@ except ImportError:
 from abc import ABCMeta, abstractmethod
 from functools import partial
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.services.eip.eipconfig import EIPConfig, VPNGatewaySelector
+from leap.bitmask.util import first
+from leap.bitmask.util.privilege_policies import LinuxPolicyChecker
+from leap.bitmask.util import privilege_policies
 from leap.common.check import leap_assert, leap_assert_type
 from leap.common.files import which
-from leap.config.providerconfig import ProviderConfig
-from leap.services.eip.eipconfig import EIPConfig, VPNGatewaySelector
-from leap.util import first
-from leap.util.privilege_policies import LinuxPolicyChecker
-from leap.util import privilege_policies
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 5b07a3cf..497df188 100644
--- a/src/leap/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -26,20 +26,20 @@ import socket
 
 from PySide import QtCore
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.services.eip.vpnlaunchers import get_platform_launcher
+from leap.bitmask.services.eip.eipconfig import EIPConfig
+from leap.bitmask.services.eip.udstelnet import UDSTelnet
+from leap.bitmask.util import first
 from leap.common.check import leap_assert, leap_assert_type
-from leap.config.providerconfig import ProviderConfig
-from leap.services.eip.vpnlaunchers import get_platform_launcher
-from leap.services.eip.eipconfig import EIPConfig
-from leap.services.eip.udstelnet import UDSTelnet
-from leap.util import first
 
 logger = logging.getLogger(__name__)
 vpnlog = logging.getLogger('leap.openvpn')
 
 from twisted.internet import protocol
 from twisted.internet import defer
-from twisted.internet.task import LoopingCall
 from twisted.internet import error as internet_error
+from twisted.internet.task import LoopingCall
 
 
 class VPNSignals(QtCore.QObject):
diff --git a/src/leap/services/soledad/__init__.py b/src/leap/bitmask/services/mail/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/soledad/__init__.py
+++ b/src/leap/bitmask/services/mail/__init__.py
diff --git a/src/leap/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py
index 4dceb2ad..cf93c60e 100644
--- a/src/leap/services/mail/imap.py
+++ b/src/leap/bitmask/services/mail/imap.py
@@ -18,10 +18,10 @@
 Initialization of imap service
 """
 import logging
-import sys
+#import sys
 
 from leap.mail.imap.service import imap
-from twisted.python import log
+#from twisted.python import log
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/bitmask/services/mail/smtpbootstrapper.py
index 48040035..0e83424c 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/bitmask/services/mail/smtpbootstrapper.py
@@ -24,12 +24,12 @@ import os
 
 from PySide import QtCore
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.util.request_helpers import get_content
+from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
 from leap.common.check import leap_assert, leap_assert_type
 from leap.common.files import get_mtime
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.srpauth import SRPAuth
-from leap.util.request_helpers import get_content
-from leap.services.abstractbootstrapper import AbstractBootstrapper
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/mail/smtpconfig.py b/src/leap/bitmask/services/mail/smtpconfig.py
index ea0f9c37..20041c30 100644
--- a/src/leap/services/mail/smtpconfig.py
+++ b/src/leap/bitmask/services/mail/smtpconfig.py
@@ -20,8 +20,8 @@ SMTP configuration
 """
 import logging
 
+from leap.bitmask.services.mail.smtpspec import get_schema
 from leap.common.config.baseconfig import BaseConfig
-from leap.services.mail.smtpspec import get_schema
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/mail/smtpspec.py b/src/leap/bitmask/services/mail/smtpspec.py
index ff9d1bf8..ff9d1bf8 100644
--- a/src/leap/services/mail/smtpspec.py
+++ b/src/leap/bitmask/services/mail/smtpspec.py
diff --git a/src/leap/services/tests/__init__.py b/src/leap/bitmask/services/soledad/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/tests/__init__.py
+++ b/src/leap/bitmask/services/soledad/__init__.py
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index c67bc004..fba74d60 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -25,16 +25,16 @@ import os
 from PySide import QtCore
 from u1db import errors as u1db_errors
 
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
+from leap.bitmask.services.soledad.soledadconfig import SoledadConfig
+from leap.bitmask.util.request_helpers import get_content
 from leap.common.check import leap_assert, leap_assert_type
 from leap.common.files import get_mtime
 from leap.keymanager import KeyManager, openpgp
 from leap.keymanager.errors import KeyNotFound
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.srpauth import SRPAuth
-from leap.services.soledad.soledadconfig import SoledadConfig
-from leap.util.request_helpers import get_content
 from leap.soledad import Soledad
-from leap.services.abstractbootstrapper import AbstractBootstrapper
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/soledad/soledadconfig.py b/src/leap/bitmask/services/soledad/soledadconfig.py
index a2367692..7ed21f77 100644
--- a/src/leap/services/soledad/soledadconfig.py
+++ b/src/leap/bitmask/services/soledad/soledadconfig.py
@@ -20,8 +20,8 @@ Soledad configuration
 """
 import logging
 
+from leap.bitmask.services.soledad.soledadspec import get_schema
 from leap.common.config.baseconfig import BaseConfig
-from leap.services.soledad.soledadspec import get_schema
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/services/soledad/soledadspec.py b/src/leap/bitmask/services/soledad/soledadspec.py
index 111175dd..111175dd 100644
--- a/src/leap/services/soledad/soledadspec.py
+++ b/src/leap/bitmask/services/soledad/soledadspec.py
diff --git a/src/leap/util/tests/__init__.py b/src/leap/bitmask/services/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/util/tests/__init__.py
+++ b/src/leap/bitmask/services/tests/__init__.py
diff --git a/src/leap/services/tests/test_abstractbootstrapper.py b/src/leap/bitmask/services/tests/test_abstractbootstrapper.py
index a9ee220f..3ac126ac 100644
--- a/src/leap/services/tests/test_abstractbootstrapper.py
+++ b/src/leap/bitmask/services/tests/test_abstractbootstrapper.py
@@ -26,8 +26,9 @@ from PySide import QtCore
 
 from nose.twistedtools import deferred
 
-from leap.services.abstractbootstrapper import AbstractBootstrapper
-from leap.util.pyside_tests_helper import UsesQApplication, BasicPySlotCase
+from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
+from leap.bitmask.util.pyside_tests_helper import \
+    UsesQApplication, BasicPySlotCase
 
 
 class TesterBootstrapper(AbstractBootstrapper):
diff --git a/src/leap/services/tx.py b/src/leap/bitmask/services/tx.py
index 7da1cb01..adc6fcea 100644
--- a/src/leap/services/tx.py
+++ b/src/leap/bitmask/services/tx.py
@@ -20,7 +20,7 @@ Twisted services launched by the client
 import logging
 
 from twisted.application.service import Application
-from twisted.internet.task import LoopingCall
+#from twisted.internet.task import LoopingCall
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/util/__init__.py b/src/leap/bitmask/util/__init__.py
index f39b52e9..ce8323cd 100644
--- a/src/leap/util/__init__.py
+++ b/src/leap/bitmask/util/__init__.py
@@ -49,7 +49,7 @@ __version__ = "unknown"
 IS_RELEASE_VERSION = False
 
 try:
-    from leap._version import get_versions
+    from leap.bitmask._version import get_versions
     __version__ = get_versions()['version']
     IS_RELEASE_VERSION = _is_release_version(__version__)
     del get_versions
diff --git a/src/leap/util/constants.py b/src/leap/bitmask/util/constants.py
index 63f6b1f7..63f6b1f7 100644
--- a/src/leap/util/constants.py
+++ b/src/leap/bitmask/util/constants.py
diff --git a/src/leap/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py
index 8f354f28..8f354f28 100644
--- a/src/leap/util/keyring_helpers.py
+++ b/src/leap/bitmask/util/keyring_helpers.py
diff --git a/src/leap/util/leap_argparse.py b/src/leap/bitmask/util/leap_argparse.py
index f60c4e10..71f5163d 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/bitmask/util/leap_argparse.py
@@ -17,7 +17,7 @@
 
 import argparse
 
-from leap.util import IS_RELEASE_VERSION
+from leap.bitmask.util import IS_RELEASE_VERSION
 
 
 def build_parser():
diff --git a/src/leap/util/leap_log_handler.py b/src/leap/bitmask/util/leap_log_handler.py
index 9adb21a5..9adb21a5 100644
--- a/src/leap/util/leap_log_handler.py
+++ b/src/leap/bitmask/util/leap_log_handler.py
diff --git a/src/leap/util/privilege_policies.py b/src/leap/bitmask/util/privilege_policies.py
index 72442553..72442553 100644
--- a/src/leap/util/privilege_policies.py
+++ b/src/leap/bitmask/util/privilege_policies.py
diff --git a/src/leap/util/pyside_tests_helper.py b/src/leap/bitmask/util/pyside_tests_helper.py
index 5c0eb8d6..5c0eb8d6 100644
--- a/src/leap/util/pyside_tests_helper.py
+++ b/src/leap/bitmask/util/pyside_tests_helper.py
diff --git a/src/leap/bitmask/util/reqs.txt b/src/leap/bitmask/util/reqs.txt
new file mode 100644
index 00000000..0bcf85dc
--- /dev/null
+++ b/src/leap/bitmask/util/reqs.txt
@@ -0,0 +1,14 @@
+requests
+srp>=1.0.2
+pyopenssl
+keyring
+python-dateutil
+psutil
+ipaddr
+twisted
+qt4reactor
+python-gnupg
+leap.common>=0.2.5
+leap.soledad>=0.1.0
+mock
+oauth
\ No newline at end of file
diff --git a/src/leap/util/request_helpers.py b/src/leap/bitmask/util/request_helpers.py
index 74aaa06b..60256b1e 100644
--- a/src/leap/util/request_helpers.py
+++ b/src/leap/bitmask/util/request_helpers.py
@@ -18,9 +18,7 @@
 """
 Request helpers for backward compatible "parsing" of requests
 """
-
 import time
-
 import json
 
 from dateutil import parser as dateparser
diff --git a/src/leap/util/requirement_checker.py b/src/leap/bitmask/util/requirement_checker.py
index 1d9b9923..1d9b9923 100644
--- a/src/leap/util/requirement_checker.py
+++ b/src/leap/bitmask/util/requirement_checker.py
diff --git a/src/leap/util/streamtologger.py b/src/leap/bitmask/util/streamtologger.py
index 25a06718..25a06718 100644
--- a/src/leap/util/streamtologger.py
+++ b/src/leap/bitmask/util/streamtologger.py
diff --git a/src/leap/bitmask/util/tests/__init__.py b/src/leap/bitmask/util/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/leap/bitmask/util/tests/__init__.py
diff --git a/src/leap/util/tests/test_is_release_version.py b/src/leap/bitmask/util/tests/test_is_release_version.py
index 4199f603..088ec66d 100644
--- a/src/leap/util/tests/test_is_release_version.py
+++ b/src/leap/bitmask/util/tests/test_is_release_version.py
@@ -17,10 +17,10 @@
 """
 tests for _is_release_version function
 """
-
 import unittest
+
+from leap.bitmask.util import _is_release_version as is_release_version
 from leap.common.testing.basetest import BaseLeapTest
-from leap.util import _is_release_version as is_release_version
 
 
 class TestIsReleaseVersion(BaseLeapTest):
diff --git a/src/leap/util/tests/test_leap_log_handler.py b/src/leap/bitmask/util/tests/test_leap_log_handler.py
index ea509ea8..518fd35b 100644
--- a/src/leap/util/tests/test_leap_log_handler.py
+++ b/src/leap/bitmask/util/tests/test_leap_log_handler.py
@@ -17,14 +17,16 @@
 """
 tests for leap_log_handler
 """
-
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 import logging
 
-from leap.util.leap_log_handler import LeapLogHandler
+from leap.bitmask.util.leap_log_handler import LeapLogHandler
+from leap.bitmask.util.pyside_tests_helper import BasicPySlotCase
 from leap.common.testing.basetest import BaseLeapTest
-from leap.util.pyside_tests_helper import BasicPySlotCase
 
 from mock import Mock
 
diff --git a/src/leap/util/tests/test_streamtologger.py b/src/leap/bitmask/util/tests/test_streamtologger.py
index 4c98e562..c4e55b3a 100644
--- a/src/leap/util/tests/test_streamtologger.py
+++ b/src/leap/bitmask/util/tests/test_streamtologger.py
@@ -26,7 +26,7 @@ except ImportError:
 import logging
 import sys
 
-from leap.util.streamtologger import StreamToLogger
+from leap.bitmask.util.streamtologger import StreamToLogger
 from leap.common.testing.basetest import BaseLeapTest