Move trial.py and suite.py to core/

Change-Id: Ic9a4c90c190e9d8e1829fbef83a9243f3c6f655b
diff --git a/selftest/suite_test.py b/selftest/suite_test.py
index 560ca50..de5c6df 100755
--- a/selftest/suite_test.py
+++ b/selftest/suite_test.py
@@ -3,8 +3,8 @@
 import _prep
 import shutil
 from osmo_gsm_tester.core import log, config, util, report
+from osmo_gsm_tester.core import suite
 from osmo_gsm_tester.core.schema import generate_schemas
-from osmo_gsm_tester import suite
 
 config.ENV_CONF = './suite_test'
 
diff --git a/selftest/trial_test.py b/selftest/trial_test.py
index e73ca37..41d71e6 100755
--- a/selftest/trial_test.py
+++ b/selftest/trial_test.py
@@ -4,7 +4,7 @@
 import _prep
 import os
 from osmo_gsm_tester.core import util
-from osmo_gsm_tester.trial import Trial
+from osmo_gsm_tester.core.trial import Trial
 
 workdir = util.get_tempdir()