Create core directory to contain most of code not in object classes used by tests

Change-Id: I9aec6c55ccd71894182057d36e0025b69925d314

71 files changed, 113 insertions, 89 deletions

diff --git a/selftest/_prep.py b/selftest/_prep.py
index 3ef6e81..582b8fb 100644
--- a/selftest/_prep.py
+++ b/selftest/_prep.py
@@ -7,11 +7,10 @@ src_dir = os.path.join(top_dir, 'src')
 # to find the osmo_gsm_tester py module
 sys.path.append(src_dir)
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 log.TestsTarget()
 log.set_all_levels(log.L_DBG)
 
 if '-v' in sys.argv:
     log.style_change(trace=True)
-
diff --git a/selftest/config_test.py b/selftest/config_test.py
index fa86adc..83a8d06 100755
--- a/selftest/config_test.py
+++ b/selftest/config_test.py
@@ -8,7 +8,7 @@ import io
 import pprint
 import copy
 
-from osmo_gsm_tester import config, log, schema
+from osmo_gsm_tester.core import config, log, schema
 
 example_config_file = 'test.cfg'
 example_config = os.path.join(_prep.script_dir, 'config_test', example_config_file)
diff --git a/selftest/lock_test_help.py b/selftest/lock_test_help.py
index f4e1f9b..d68bbf8 100644
--- a/selftest/lock_test_help.py
+++ b/selftest/lock_test_help.py
@@ -4,7 +4,7 @@ import os
 
 import _prep
 
-from osmo_gsm_tester.util import FileLock, touch_file
+from osmo_gsm_tester.core.util import FileLock, touch_file
 
 testdir, name = sys.argv[1:]
 stop_signalling_file = os.path.join(testdir, name)
diff --git a/selftest/log_test.py b/selftest/log_test.py
index 889a8a5..f6ce02b 100755
--- a/selftest/log_test.py
+++ b/selftest/log_test.py
@@ -24,7 +24,7 @@ import _prep
 import sys
 import os
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 #log.targets[0].get_time_str = lambda: '01:02:03'
 fake_time = '01:02:03'
@@ -45,7 +45,7 @@ class LogTest(log.Origin):
         super().__init__(log.C_TST, *name_items, **detail_items)
 
 t = LogTest('some', 'name', some="detail")
-	
+
 t.log("hello log")
 t.err("hello err")
 t.dbg("hello dbg not visible")
diff --git a/selftest/process_test.py b/selftest/process_test.py
index 71523c9..de4f7a6 100755
--- a/selftest/process_test.py
+++ b/selftest/process_test.py
@@ -4,7 +4,7 @@ import _prep
 import time
 import os
 
-from osmo_gsm_tester import process, util, log
+from osmo_gsm_tester.core import process, util, log
 
 tmpdir = util.Dir(util.get_tempdir())
 
diff --git a/selftest/resource_test.py b/selftest/resource_test.py
index cdfe021..f399e20 100755
--- a/selftest/resource_test.py
+++ b/selftest/resource_test.py
@@ -6,7 +6,8 @@ import pprint
 import shutil
 import atexit
 import _prep
-from osmo_gsm_tester import config, log, resource, util
+from osmo_gsm_tester.core import config, log, util
+from osmo_gsm_tester import resource
 
 workdir = util.get_tempdir()
 
diff --git a/selftest/suite_test.py b/selftest/suite_test.py
index 115d76e..c4dd5bf 100755
--- a/selftest/suite_test.py
+++ b/selftest/suite_test.py
@@ -2,7 +2,8 @@
 import os
 import _prep
 import shutil
-from osmo_gsm_tester import log, suite, config, report, util
+from osmo_gsm_tester.core import log, config, util
+from osmo_gsm_tester import suite, report
 
 config.ENV_CONF = './suite_test'
 
diff --git a/selftest/template_test.py b/selftest/template_test.py
index f4f1bd5..747d508 100755
--- a/selftest/template_test.py
+++ b/selftest/template_test.py
@@ -5,7 +5,7 @@ import _prep
 import sys
 import os
 
-from osmo_gsm_tester import template, log
+from osmo_gsm_tester.core import template, log
 
 log.set_level(log.C_CNF, log.L_DBG)
 
diff --git a/selftest/trial_test.py b/selftest/trial_test.py
index ba3f01b..e73ca37 100755
--- a/selftest/trial_test.py
+++ b/selftest/trial_test.py
@@ -3,7 +3,7 @@
 import time
 import _prep
 import os
-from osmo_gsm_tester import util
+from osmo_gsm_tester.core import util
 from osmo_gsm_tester.trial import Trial
 
 workdir = util.get_tempdir()
diff --git a/selftest/util_test.py b/selftest/util_test.py
index c517655..e07b2d4 100755
--- a/selftest/util_test.py
+++ b/selftest/util_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import _prep
 
-from osmo_gsm_tester.util import hash_obj
+from osmo_gsm_tester.core.util import hash_obj
 
 print('- expect the same hashes on every test run')
 print(hash_obj('abc'))
@@ -9,4 +9,3 @@ print(hash_obj(1))
 print(hash_obj([1, 2, 3]))
 print(hash_obj({ 'k': [ {'a': 1, 'b': 2}, {'a': 3, 'b': 4}, ],
                  'i': [ {'c': 1, 'd': 2}, {'c': 3, 'd': 4}, ] }))
-
diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py
index 18b852b..df87957 100755
--- a/src/osmo-gsm-tester.py
+++ b/src/osmo-gsm-tester.py
@@ -70,7 +70,8 @@ import sys
 import argparse
 from signal import *
 from osmo_gsm_tester import __version__
-from osmo_gsm_tester import trial, suite, log, config
+from osmo_gsm_tester.core import log, config
+from osmo_gsm_tester import trial, suite
 
 def sig_handler_cleanup(signum, frame):
     print("killed by signal %d" % signum)
diff --git a/src/osmo_gsm_tester/bsc_osmo.py b/src/osmo_gsm_tester/bsc_osmo.py
index 4160527..e9d1631 100644
--- a/src/osmo_gsm_tester/bsc_osmo.py
+++ b/src/osmo_gsm_tester/bsc_osmo.py
@@ -21,7 +21,8 @@ import os
 import re
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder
+from .core import log, util, config, template, process
+from . import osmo_ctrl, pcap_recorder
 
 class OsmoBsc(log.Origin):
 
diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py
index 2ca44d2..a20bd53 100644
--- a/src/osmo_gsm_tester/bts.py
+++ b/src/osmo_gsm_tester/bts.py
@@ -19,7 +19,7 @@
 
 import copy
 from abc import ABCMeta, abstractmethod
-from . import log, config, schema
+from .core import log, config, schema
 
 class Bts(log.Origin, metaclass=ABCMeta):
 
diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py
index 4cdb98e..539e5ed 100644
--- a/src/osmo_gsm_tester/bts_nanobts.py
+++ b/src/osmo_gsm_tester/bts_nanobts.py
@@ -20,9 +20,10 @@
 import os
 import re
 import json
-from . import log, config, util, process, pcap_recorder, bts, pcu
+from .core import log, config, util, process
+from .core.event_loop import MainLoop
+from . import pcap_recorder, bts, pcu
 from . import powersupply
-from .event_loop import MainLoop
 
 class NanoBts(bts.Bts):
 
diff --git a/src/osmo_gsm_tester/bts_oc2g.py b/src/osmo_gsm_tester/bts_oc2g.py
index d1f80b7..0cebc09 100644
--- a/src/osmo_gsm_tester/bts_oc2g.py
+++ b/src/osmo_gsm_tester/bts_oc2g.py
@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, remote, pcu_oc2g, bts_osmo
+from .core import log, config, util, template, process, remote
+from . import pcu_oc2g, bts_osmo
 
 class OsmoBtsOC2G(bts_osmo.OsmoBts):
 ##############
diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py
index a1dd494..e15cc15 100644
--- a/src/osmo_gsm_tester/bts_octphy.py
+++ b/src/osmo_gsm_tester/bts_octphy.py
@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, bts_osmo
+from .core import log, config, util, template, process
+from . import bts_osmo
 
 class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit):
 
diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py
index 9105c28..39ca264 100644
--- a/src/osmo_gsm_tester/bts_osmo.py
+++ b/src/osmo_gsm_tester/bts_osmo.py
@@ -20,7 +20,8 @@
 import os
 import tempfile
 from abc import ABCMeta, abstractmethod
-from . import log, bts, pcu_osmo
+from .core import log
+from . import bts, pcu_osmo
 
 class OsmoBts(bts.Bts, metaclass=ABCMeta):
 
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 22ff4b6..91a1dd8 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -20,9 +20,9 @@
 import os
 import pprint
 from abc import ABCMeta, abstractmethod
-from . import log, config, util, template, process, remote, bts_osmo
-from . import powersupply
-from .event_loop import MainLoop
+from .core import log, config, util, template, process, remote
+from .core.event_loop import MainLoop
+from . import powersupply, bts_osmo
 
 class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):
 ##############
diff --git a/src/osmo_gsm_tester/bts_osmovirtual.py b/src/osmo_gsm_tester/bts_osmovirtual.py
index 516d992..262c805 100644
--- a/src/osmo_gsm_tester/bts_osmovirtual.py
+++ b/src/osmo_gsm_tester/bts_osmovirtual.py
@@ -20,7 +20,8 @@
 
 import os
 import pprint
-from . import config, util, template, process, bts_osmo
+from .core import config, util, template, process
+from . import bts_osmo
 
 class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit):
 ##############
@@ -112,4 +113,3 @@ class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit):
         self.suite_run.poll()
 
 # vim: expandtab tabstop=4 shiftwidth=4
-
diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py
index d616e29..d28b034 100644
--- a/src/osmo_gsm_tester/bts_sysmo.py
+++ b/src/osmo_gsm_tester/bts_sysmo.py
@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, remote, pcu_sysmo, bts_osmo
+from .core import log, config, util, template, process, remote
+from . import pcu_sysmo, bts_osmo
 
 class SysmoBts(bts_osmo.OsmoBts):
 ##############
diff --git a/src/osmo_gsm_tester/core/__init__.py b/src/osmo_gsm_tester/core/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/osmo_gsm_tester/core/__init__.py
diff --git a/src/osmo_gsm_tester/config.py b/src/osmo_gsm_tester/core/config.py
index 9333601..9333601 100644
--- a/src/osmo_gsm_tester/config.py
+++ b/src/osmo_gsm_tester/core/config.py
diff --git a/src/osmo_gsm_tester/event_loop.py b/src/osmo_gsm_tester/core/event_loop.py
index fe88ef4..fe88ef4 100644
--- a/src/osmo_gsm_tester/event_loop.py
+++ b/src/osmo_gsm_tester/core/event_loop.py
diff --git a/src/osmo_gsm_tester/log.py b/src/osmo_gsm_tester/core/log.py
index d60bf0b..d60bf0b 100644
--- a/src/osmo_gsm_tester/log.py
+++ b/src/osmo_gsm_tester/core/log.py
diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/core/process.py
index 5d02ab5..5d02ab5 100644
--- a/src/osmo_gsm_tester/process.py
+++ b/src/osmo_gsm_tester/core/process.py
diff --git a/src/osmo_gsm_tester/remote.py b/src/osmo_gsm_tester/core/remote.py
index ba1a5e1..95b8967 100644
--- a/src/osmo_gsm_tester/remote.py
+++ b/src/osmo_gsm_tester/core/remote.py
@@ -22,7 +22,7 @@ import os
 import re
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder
+from . import log, util, config, template, process
 
 class RemoteHost(log.Origin):
 
diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/core/schema.py
index d343bef..d343bef 100644
--- a/src/osmo_gsm_tester/schema.py
+++ b/src/osmo_gsm_tester/core/schema.py
diff --git a/src/osmo_gsm_tester/template.py b/src/osmo_gsm_tester/core/template.py
index dac89f2..2bf4fed 100644
--- a/src/osmo_gsm_tester/template.py
+++ b/src/osmo_gsm_tester/core/template.py
@@ -32,7 +32,7 @@ def set_templates_dir(*templates_dirs):
     global _logger
     if not templates_dirs:
         # default templates dir is relative to this source file
-        templates_dirs = [os.path.join(os.path.dirname(__file__), 'templates')]
+        templates_dirs = [os.path.join(os.path.dirname(os.path.dirname(__file__)), 'templates')]
     for d in templates_dirs:
         if not os.path.isdir(d):
             raise RuntimeError('templates dir is not a dir: %r'
diff --git a/src/osmo_gsm_tester/util.py b/src/osmo_gsm_tester/core/util.py
index a5b2bbf..a5b2bbf 100644
--- a/src/osmo_gsm_tester/util.py
+++ b/src/osmo_gsm_tester/core/util.py
diff --git a/src/osmo_gsm_tester/enb.py b/src/osmo_gsm_tester/enb.py
index d069f84..edaf462 100644
--- a/src/osmo_gsm_tester/enb.py
+++ b/src/osmo_gsm_tester/enb.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log, config
+from .core import log, config
 
 
 class eNodeB(log.Origin, metaclass=ABCMeta):
diff --git a/src/osmo_gsm_tester/enb_amarisoft.py b/src/osmo_gsm_tester/enb_amarisoft.py
index 1487bdd..a058653 100644
--- a/src/osmo_gsm_tester/enb_amarisoft.py
+++ b/src/osmo_gsm_tester/enb_amarisoft.py
@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from . import enb
 
 def rf_type_valid(rf_type_str):
diff --git a/src/osmo_gsm_tester/enb_srs.py b/src/osmo_gsm_tester/enb_srs.py
index 372848d..079671a 100644
--- a/src/osmo_gsm_tester/enb_srs.py
+++ b/src/osmo_gsm_tester/enb_srs.py
@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from . import enb
 
 def rf_type_valid(rf_type_str):
diff --git a/src/osmo_gsm_tester/epc.py b/src/osmo_gsm_tester/epc.py
index 6aa17e7..9141455 100644
--- a/src/osmo_gsm_tester/epc.py
+++ b/src/osmo_gsm_tester/epc.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log, config
+from .core import log, config
 
 
 class EPC(log.Origin, metaclass=ABCMeta):
diff --git a/src/osmo_gsm_tester/epc_amarisoft.py b/src/osmo_gsm_tester/epc_amarisoft.py
index a117a9e..33b8162 100644
--- a/src/osmo_gsm_tester/epc_amarisoft.py
+++ b/src/osmo_gsm_tester/epc_amarisoft.py
@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from . import epc
 
 class AmarisoftEPC(epc.EPC):
diff --git a/src/osmo_gsm_tester/epc_srs.py b/src/osmo_gsm_tester/epc_srs.py
index 7c32486..4a45c7e 100644
--- a/src/osmo_gsm_tester/epc_srs.py
+++ b/src/osmo_gsm_tester/epc_srs.py
@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from . import epc
 
 class srsEPC(epc.EPC):
diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py
index de3ac16..048b69e 100644
--- a/src/osmo_gsm_tester/esme.py
+++ b/src/osmo_gsm_tester/esme.py
@@ -23,8 +23,8 @@ import smpplib.command
 import smpplib.consts
 import smpplib.exceptions
 
-from . import log
-from .event_loop import MainLoop
+from .core import log
+from .core.event_loop import MainLoop
 
 # if you want to know what's happening inside python-smpplib
 #import logging
diff --git a/src/osmo_gsm_tester/ggsn_osmo.py b/src/osmo_gsm_tester/ggsn_osmo.py
index 0ece596..e699203 100644
--- a/src/osmo_gsm_tester/ggsn_osmo.py
+++ b/src/osmo_gsm_tester/ggsn_osmo.py
@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoGgsn(log.Origin):
 
diff --git a/src/osmo_gsm_tester/hlr_osmo.py b/src/osmo_gsm_tester/hlr_osmo.py
index 1c361dd..245328b 100644
--- a/src/osmo_gsm_tester/hlr_osmo.py
+++ b/src/osmo_gsm_tester/hlr_osmo.py
@@ -21,7 +21,8 @@ import os
 import pprint
 import sqlite3
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoHlr(log.Origin):
     run_dir = None
diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py
index 7103193..331a3ba 100644
--- a/src/osmo_gsm_tester/iperf3.py
+++ b/src/osmo_gsm_tester/iperf3.py
@@ -20,7 +20,8 @@
 import os
 import json
 
-from . import log, util, config, process, pcap_recorder, run_node, remote
+from .core import log, util, config, process, remote
+from . import pcap_recorder, run_node
 
 def iperf3_result_to_json(file):
     with open(file) as f:
diff --git a/src/osmo_gsm_tester/mgcpgw_osmo.py b/src/osmo_gsm_tester/mgcpgw_osmo.py
index 20bb689..0c9a13a 100644
--- a/src/osmo_gsm_tester/mgcpgw_osmo.py
+++ b/src/osmo_gsm_tester/mgcpgw_osmo.py
@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoMgcpgw(log.Origin):
 
diff --git a/src/osmo_gsm_tester/mgw_osmo.py b/src/osmo_gsm_tester/mgw_osmo.py
index ea8e652..b7bd681 100644
--- a/src/osmo_gsm_tester/mgw_osmo.py
+++ b/src/osmo_gsm_tester/mgw_osmo.py
@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoMgw(log.Origin):
 
diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py
index a1e5e97..6759e70 100644
--- a/src/osmo_gsm_tester/modem.py
+++ b/src/osmo_gsm_tester/modem.py
@@ -17,9 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from . import log, util, sms, process
-from .event_loop import MainLoop
+from .core import log, util, process
+from .core.event_loop import MainLoop
 from .ms import MS
+from . import sms
 
 from pydbus import SystemBus, Variant
 import os
diff --git a/src/osmo_gsm_tester/ms.py b/src/osmo_gsm_tester/ms.py
index 3276aff..d310f5f 100644
--- a/src/osmo_gsm_tester/ms.py
+++ b/src/osmo_gsm_tester/ms.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log
+from .core import log
 
 class MS(log.Origin, metaclass=ABCMeta):
     """Base for everything about mobile/modem and SIMs."""
diff --git a/src/osmo_gsm_tester/ms_amarisoft.py b/src/osmo_gsm_tester/ms_amarisoft.py
index 422f28d..9527fa9 100644
--- a/src/osmo_gsm_tester/ms_amarisoft.py
+++ b/src/osmo_gsm_tester/ms_amarisoft.py
@@ -20,9 +20,9 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
+from .core.event_loop import MainLoop
 from .run_node import RunNode
-from .event_loop import MainLoop
 from .ms import MS
 
 def rf_type_valid(rf_type_str):
diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py
index f1334fc..ef45b8b 100644
--- a/src/osmo_gsm_tester/ms_driver.py
+++ b/src/osmo_gsm_tester/ms_driver.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from datetime import timedelta
-from . import log, util
+from .core import log, util
 from osmo_ms_driver.cdf import cdfs
 from osmo_ms_driver.event_server import EventServer
 from osmo_ms_driver.simple_loop import SimpleLoop
diff --git a/src/osmo_gsm_tester/ms_srs.py b/src/osmo_gsm_tester/ms_srs.py
index 119a477..d23cf40 100644
--- a/src/osmo_gsm_tester/ms_srs.py
+++ b/src/osmo_gsm_tester/ms_srs.py
@@ -20,9 +20,9 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from .run_node import RunNode
-from .event_loop import MainLoop
+from .core.event_loop import MainLoop
 from .ms import MS
 
 def rf_type_valid(rf_type_str):
diff --git a/src/osmo_gsm_tester/msc_osmo.py b/src/osmo_gsm_tester/msc_osmo.py
index 51f50c4..fd5d41f 100644
--- a/src/osmo_gsm_tester/msc_osmo.py
+++ b/src/osmo_gsm_tester/msc_osmo.py
@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc
+from .core import log, util, config, template, process
+from . import osmo_ctrl, pcap_recorder, smsc
 
 class OsmoMsc(log.Origin):
 
diff --git a/src/osmo_gsm_tester/nitb_osmo.py b/src/osmo_gsm_tester/nitb_osmo.py
index e161ccb..ec4912f 100644
--- a/src/osmo_gsm_tester/nitb_osmo.py
+++ b/src/osmo_gsm_tester/nitb_osmo.py
@@ -21,7 +21,8 @@ import os
 import re
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc
+from .core import log, util, config, template, process
+from . import osmo_ctrl, pcap_recorder, smsc
 
 class OsmoNitb(log.Origin):
 
diff --git a/src/osmo_gsm_tester/osmo_ctrl.py b/src/osmo_gsm_tester/osmo_ctrl.py
index be27b75..3bc21bd 100644
--- a/src/osmo_gsm_tester/osmo_ctrl.py
+++ b/src/osmo_gsm_tester/osmo_ctrl.py
@@ -21,7 +21,7 @@
 import socket
 import struct
 
-from . import log
+from .core import log
 
 class CtrlInterfaceExn(Exception):
     pass
diff --git a/src/osmo_gsm_tester/osmocon.py b/src/osmo_gsm_tester/osmocon.py
index 8b6040f..a6b3221 100644
--- a/src/osmo_gsm_tester/osmocon.py
+++ b/src/osmo_gsm_tester/osmocon.py
@@ -20,8 +20,8 @@
 import os
 import tempfile
 
-from . import log, util, process
-from .event_loop import MainLoop
+from .core import log, util, process
+from .core.event_loop import MainLoop
 
 class Osmocon(log.Origin):
 
diff --git a/src/osmo_gsm_tester/pcap_recorder.py b/src/osmo_gsm_tester/pcap_recorder.py
index e0f0098..a9ba3a7 100644
--- a/src/osmo_gsm_tester/pcap_recorder.py
+++ b/src/osmo_gsm_tester/pcap_recorder.py
@@ -19,7 +19,7 @@
 
 import os
 
-from . import log, process
+from .core import log, process
 
 class PcapRecorder(log.Origin):
 
diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py
index cc338cf..9dd6f59 100644
--- a/src/osmo_gsm_tester/pcu.py
+++ b/src/osmo_gsm_tester/pcu.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log
+from .core import log
 
 class Pcu(log.Origin, metaclass=ABCMeta):
     """PCU Abstract Base Class."""
diff --git a/src/osmo_gsm_tester/pcu_oc2g.py b/src/osmo_gsm_tester/pcu_oc2g.py
index 67c49b3..714f6fd 100644
--- a/src/osmo_gsm_tester/pcu_oc2g.py
+++ b/src/osmo_gsm_tester/pcu_oc2g.py
@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, pcu
+from .core import log, config, util, template, process
+from . import pcu
 
 class OsmoPcuOC2G(pcu.Pcu):
 
diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py
index aac6901..11d3805 100644
--- a/src/osmo_gsm_tester/pcu_osmo.py
+++ b/src/osmo_gsm_tester/pcu_osmo.py
@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import config, util, template, process, pcu
+from .core import config, util, template, process
+from . import pcu
 
 class OsmoPcu(pcu.Pcu):
 
diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py
index 55d6f53..e907367 100644
--- a/src/osmo_gsm_tester/pcu_sysmo.py
+++ b/src/osmo_gsm_tester/pcu_sysmo.py
@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, pcu
+from .core import log, config, util, template, process
+from . import pcu
 
 class OsmoPcuSysmo(pcu.Pcu):
 
diff --git a/src/osmo_gsm_tester/powersupply.py b/src/osmo_gsm_tester/powersupply.py
index 1cf7106..4a9205d 100644
--- a/src/osmo_gsm_tester/powersupply.py
+++ b/src/osmo_gsm_tester/powersupply.py
@@ -18,8 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log
-from .event_loop import MainLoop
+from .core import log
+from .core.event_loop import MainLoop
 
 class PowerSupply(log.Origin, metaclass=ABCMeta):
 
diff --git a/src/osmo_gsm_tester/powersupply_intellinet.py b/src/osmo_gsm_tester/powersupply_intellinet.py
index 792d929..02dc803 100644
--- a/src/osmo_gsm_tester/powersupply_intellinet.py
+++ b/src/osmo_gsm_tester/powersupply_intellinet.py
@@ -20,7 +20,7 @@
 import urllib.request
 import xml.etree.ElementTree as ET
 
-from . import log
+from .core import log
 from .powersupply import PowerSupply
 
 class PowerSupplyIntellinet(PowerSupply):
diff --git a/src/osmo_gsm_tester/powersupply_sispm.py b/src/osmo_gsm_tester/powersupply_sispm.py
index 4505b17..b392f73 100644
--- a/src/osmo_gsm_tester/powersupply_sispm.py
+++ b/src/osmo_gsm_tester/powersupply_sispm.py
@@ -20,8 +20,8 @@
 import sispm
 from usb.core import USBError
 
-from . import log
-from .event_loop import MainLoop
+from .core import log
+from .core.event_loop import MainLoop
 from .powersupply import PowerSupply
 
 class PowerSupplySispm(PowerSupply):
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index fa17bcd..5b86a08 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -22,16 +22,16 @@ import copy
 import atexit
 import pprint
 
-from . import log
-from . import config
-from . import util
-from . import schema
+from .core import log
+from .core import config
+from .core import util
+from .core import schema
 from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts, bts_oc2g
-from . import modem
-from . import ms_osmo_mobile
-from . import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft
+from .  import modem
+from .  import ms_osmo_mobile
+from .  import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft
 
-from .util import is_dict, is_list
+from .core.util import is_dict, is_list
 
 HASH_KEY = '_hash'
 RESERVED_KEY = '_reserved_by'
diff --git a/src/osmo_gsm_tester/run_node.py b/src/osmo_gsm_tester/run_node.py
index 88555a6..e5f7d56 100644
--- a/src/osmo_gsm_tester/run_node.py
+++ b/src/osmo_gsm_tester/run_node.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from . import log
+from .core import log
 
 class RunNode(log.Origin):
 
diff --git a/src/osmo_gsm_tester/sgsn_osmo.py b/src/osmo_gsm_tester/sgsn_osmo.py
index 9ffaaed..647d848 100644
--- a/src/osmo_gsm_tester/sgsn_osmo.py
+++ b/src/osmo_gsm_tester/sgsn_osmo.py
@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoSgsn(log.Origin):
 
diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py
index d154801..1083d22 100644
--- a/src/osmo_gsm_tester/smsc.py
+++ b/src/osmo_gsm_tester/smsc.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from . import log, config
+from .core import log, config
 
 class Smsc:
 
diff --git a/src/osmo_gsm_tester/stp_osmo.py b/src/osmo_gsm_tester/stp_osmo.py
index 5a7f0d3..500c5da 100644
--- a/src/osmo_gsm_tester/stp_osmo.py
+++ b/src/osmo_gsm_tester/stp_osmo.py
@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoStp(log.Origin):
 
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index 0ddd95f..586c518 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -21,9 +21,10 @@ import os
 import sys
 import time
 import pprint
-from . import config, log, util, resource, test
-from .event_loop import MainLoop
-from . import nitb_osmo, hlr_osmo, mgcpgw_osmo, mgw_osmo, msc_osmo, bsc_osmo, stp_osmo, ggsn_osmo, sgsn_osmo, esme, osmocon, ms_driver, iperf3, process
+from .core import config, log, util, process
+from .core.event_loop import MainLoop
+from . import resource, test
+from . import nitb_osmo, hlr_osmo, mgcpgw_osmo, mgw_osmo, msc_osmo, bsc_osmo, stp_osmo, ggsn_osmo, sgsn_osmo, esme, osmocon, ms_driver, iperf3
 from . import run_node
 
 class Timeout(Exception):
diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py
index 0bbff41..f517b52 100644
--- a/src/osmo_gsm_tester/test.py
+++ b/src/osmo_gsm_tester/test.py
@@ -23,7 +23,8 @@ import time
 import traceback
 from . import testenv
 
-from . import log, util, resource
+from .core import log, util
+from . import resource
 
 class Test(log.Origin):
     UNKNOWN = 'UNKNOWN' # matches junit 'error'
@@ -56,8 +57,9 @@ class Test(log.Origin):
             log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3)
             self.status = Test.UNKNOWN
             self.start_timestamp = time.time()
-            from . import suite, sms, process
-            from .event_loop import MainLoop
+            from .core import process
+            from .core.event_loop import MainLoop
+            from . import suite, sms
             testenv.setup(self.suite_run, self, suite, MainLoop, sms, process)
             with self.redirect_stdout():
                 util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename),
diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/trial.py
index 149d34c..9dcc188 100644
--- a/src/osmo_gsm_tester/trial.py
+++ b/src/osmo_gsm_tester/trial.py
@@ -22,7 +22,8 @@ import time
 import shutil
 import tarfile
 
-from . import log, util, suite, report
+from .core import log, util
+from . import suite, report
 
 FILE_MARK_TAKEN = 'taken'
 FILE_CHECKSUMS = 'checksums.md5'
diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py
index a752c37..a4276d9 100644
--- a/src/osmo_ms_driver/__main__.py
+++ b/src/osmo_ms_driver/__main__.py
@@ -22,7 +22,7 @@ from .location_update_test import MassUpdateLocationTest
 from .cdf import cdfs
 from .starter import BinaryOptions, MobileTestStarter
 from .test_support import imsi_ki_gen
-from osmo_gsm_tester import log, util
+from osmo_gsm_tester.core import log, util
 from osmo_gsm_tester import ms_osmo_mobile
 
 # System modules
diff --git a/src/osmo_ms_driver/event_server.py b/src/osmo_ms_driver/event_server.py
index ce9d5c1..fb8a6c7 100644
--- a/src/osmo_ms_driver/event_server.py
+++ b/src/osmo_ms_driver/event_server.py
@@ -1,5 +1,5 @@
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 import time
 
diff --git a/src/osmo_ms_driver/simple_loop.py b/src/osmo_ms_driver/simple_loop.py
index 29a4b5b..373fa20 100644
--- a/src/osmo_ms_driver/simple_loop.py
+++ b/src/osmo_ms_driver/simple_loop.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 import os
 import selectors
diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py
index 8757e40..702baf0 100644
--- a/src/osmo_ms_driver/starter.py
+++ b/src/osmo_ms_driver/starter.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from osmo_gsm_tester import log, util, process, template
+from osmo_gsm_tester.core import log, util, process, template
 
 from .test_support import ResultStore
 
diff --git a/src/osmo_ms_driver/test_support.py b/src/osmo_ms_driver/test_support.py
index ce3f5f1..cb2b9af 100644
--- a/src/osmo_ms_driver/test_support.py
+++ b/src/osmo_ms_driver/test_support.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 import time