From 6351d0581f5b744b01c3c716a53bca776f0d7cb4 Mon Sep 17 00:00:00 2001
From: kristyj <kristypjames@gmail.com>
Date: Mon, 7 Mar 2016 11:28:16 +0100
Subject: [PATCH] Move to relative imports where possible, update to new dir
 structure where not

---
 docs/todos.txt                                |  1 +
 ematoblender/dataserver.py                    |  6 +++---
 .../scripts/ema_blender/blender_networking.py | 10 +++++-----
 .../ema_blender/blender_shared_objects.py     |  2 +-
 .../bpy_operators/ops_bpy_palate_trace.py     |  6 +++---
 ematoblender/scripts/ema_blender/coil_info.py |  4 ++--
 .../scripts/ema_blender/coord_transforms.py   | 12 +++++------
 .../ema_blender/ema_bge/bge_camera_control.py | 11 +++++-----
 .../ema_blender/ema_bge/bge_emareadin.py      | 20 +++++++++----------
 .../ema_bge/bge_manual_constraints.py         |  2 +-
 .../ema_blender/ema_bge/bge_menus_overlays.py |  9 +++++----
 .../ema_blender/ema_bge/bge_move_objects.py   | 17 ++++++++--------
 .../ema_blender/ema_bge/bge_play_audio.py     |  4 ++--
 .../ema_blender/ema_bge/bge_splines_lines.py  |  6 +++---
 .../ema_blender/ema_bge/bge_static_video.py   |  5 +++--
 .../ema_bge/bge_update_armature.py            | 15 +++++++-------
 .../ema_bpy/bpy_add_game_objects.py           |  6 +++---
 .../ema_blender/ema_bpy/bpy_emareadin.py      | 18 ++++++++---------
 .../ema_blender/ema_bpy/bpy_import_assets.py  |  8 ++++----
 .../ema_bpy/bpy_link_assets_coils.py          |  4 ++--
 .../ema_blender/ema_bpy/bpy_move_objects.py   | 10 +++++-----
 .../ema_blender/ema_bpy/bpy_setup_cameras.py  |  2 +-
 .../ema_blender/ema_bpy/bpy_setup_meshes.py   |  2 +-
 .../ema_blender/ema_bpy/bpy_static_video.py   |  4 ++--
 .../scripts/ema_blender/ema_bpy/run_bpy.py    |  2 +-
 .../scripts/ema_io/client_server_comms.py     |  2 +-
 .../ema_gameserver/data_manipulation.py       |  4 ++--
 .../ema_io/ema_gameserver/gameserver.py       |  8 ++++----
 .../scripts/ema_io/ema_gameserver/rtclient.py |  4 ++--
 .../ema_io/ema_gameserver/wave_recording.py   |  2 +-
 .../ema_staticserver/mocap_file_parser.py     |  2 +-
 .../ema_io/ema_staticserver/rtserver.py       |  6 +++---
 .../ema_staticserver/rtserver_tester.py       |  2 +-
 ematoblender/scripts/ema_io/rtc3d_parser.py   |  4 ++--
 .../scripts/ema_shared/general_maths.py       |  1 -
 ematoblender/scripts/ema_shared/properties.py |  7 -------
 ematoblender/test_gameserver.py               |  8 ++++----
 37 files changed, 115 insertions(+), 121 deletions(-)

diff --git a/docs/todos.txt b/docs/todos.txt
index 64f5083..bedf74e 100644
--- a/docs/todos.txt
+++ b/docs/todos.txt
@@ -21,6 +21,7 @@ Eg should the setting of the file change a value in the pps file?
 
 Look at streaming ALL the possible information from the WAVE API, not just the location values.
 
+#TODO
 Set TCP_NODELAY on both the client and server side of the RTSERVER, as this may bring speed improvements
 
 FEATURES:
diff --git a/ematoblender/dataserver.py b/ematoblender/dataserver.py
index 5d78418..ea1f508 100644
--- a/ematoblender/dataserver.py
+++ b/ematoblender/dataserver.py
@@ -14,7 +14,7 @@ def main(level=2):
 
     if level == 0:
         # perform most basic server testing, using one static file only.
-        from scripts.ema_io.ema_staticserver import rtserver as rts
+        from ematoblender.scripts.ema_io.ema_staticserver import rtserver as rts
         st, so = rts.initialise_server(datafile=datafile, loop=loop)
 
         print('Starting first server thread.')
@@ -28,12 +28,12 @@ def main(level=2):
 
     elif level == 1:
         # use the command-line server-switcher
-        from scripts.ema_io.ema_staticserver import rtserver_switcher as rtss
+        from ematoblender.scripts.ema_io.ema_staticserver import rtserver_switcher as rtss
         rtss.main()
 
     else:
         # use the gui switcher
-        from scripts.ema_io.ema_staticserver import rtserver_gui as rtg
+        from ematoblender.scripts.ema_io.ema_staticserver import rtserver_gui as rtg
         rtg.main()
 
 
diff --git a/ematoblender/scripts/ema_blender/blender_networking.py b/ematoblender/scripts/ema_blender/blender_networking.py
index 76ddca3..00853d9 100644
--- a/ematoblender/scripts/ema_blender/blender_networking.py
+++ b/ematoblender/scripts/ema_blender/blender_networking.py
@@ -16,11 +16,11 @@
 
 import xml.etree.ElementTree as ET
 from collections import deque
-
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_shared.properties as pps
 from subprocess import Popen
 
+from . import blender_shared_objects as bsh
+from ..ema_shared import properties as pps
+
 
 def setup_socket_to_gameserver(port=0, blocking=False):
     """Setup a persistent socket to the gameserver.
@@ -312,7 +312,7 @@ def get_one_df():
 
 #unused
 def bge_only_start_stream():
-    from scripts.ema_blender.ema_bge.bge_menus_overlays import bge_display_status_text
+    from ematoblender.scripts.ema_blender.ema_bge.bge_menus_overlays import bge_display_status_text
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='START_STREAM')
     reply1 = recv_from_gameserver(bsh.gs_soc_nonblocking)
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='STATUS')
@@ -321,7 +321,7 @@ def bge_only_start_stream():
 
 #unused
 def bge_only_stop_stream():
-    from scripts.ema_blender.ema_bge.bge_menus_overlays import bge_display_status_text
+    from .ema_bge.bge_menus_overlays import bge_display_status_text
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='STREAM_STOP')
     reply1 = recv_from_gameserver(bsh.gs_soc_nonblocking)
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='STATUS')
diff --git a/ematoblender/scripts/ema_blender/blender_shared_objects.py b/ematoblender/scripts/ema_blender/blender_shared_objects.py
index 0431e0a..53888eb 100644
--- a/ematoblender/scripts/ema_blender/blender_shared_objects.py
+++ b/ematoblender/scripts/ema_blender/blender_shared_objects.py
@@ -29,7 +29,7 @@
 ema_inferred_meshes = []
 
 # iterator over the lists of tuples above that re-evaluates whenever run
-from scripts.ema_shared.miscellanous import ReeevalIter
+from ..ema_shared.miscellanous import ReeevalIter
 ema_driven_meshes = ReeevalIter('bsh.ema_biteplate_meshes', 'bsh.ema_reference_meshes', 'bsh.ema_active_meshes')
 
 
diff --git a/ematoblender/scripts/ema_blender/bpy_operators/ops_bpy_palate_trace.py b/ematoblender/scripts/ema_blender/bpy_operators/ops_bpy_palate_trace.py
index 11eca14..c059d1c 100644
--- a/ematoblender/scripts/ema_blender/bpy_operators/ops_bpy_palate_trace.py
+++ b/ematoblender/scripts/ema_blender/bpy_operators/ops_bpy_palate_trace.py
@@ -18,12 +18,12 @@
 from collections import defaultdict
 
 from bpy_extras.view3d_utils import location_3d_to_region_2d as loc3d2d
-from scripts.ema_blender.coil_info import find_sensor_index
-from scripts.ema_io.rtc3d_parser import DataFrame
+from ematoblender.scripts.ema_blender.coil_info import find_sensor_index
+from ematoblender.scripts.ema_io.rtc3d_parser import DataFrame
 import scripts.ema_blender.blender_networking as bn
 import scripts.ema_blender.blender_shared_objects as bsh
 import scripts.ema_shared.properties as pps
-from scripts.ema_blender.ema_bpy.bpy_move_objects import apply_properties_transform
+from ematoblender.scripts.ema_blender.ema_bpy.bpy_move_objects import apply_properties_transform
 
 
 def draw_text_on_viewport(mystring):
diff --git a/ematoblender/scripts/ema_blender/coil_info.py b/ematoblender/scripts/ema_blender/coil_info.py
index 6ec3256..8a787a1 100644
--- a/ematoblender/scripts/ema_blender/coil_info.py
+++ b/ematoblender/scripts/ema_blender/coil_info.py
@@ -2,8 +2,8 @@
 
 import os
 import json
-from scripts.ema_blender import blender_shared_objects as bsh
-from scripts.ema_shared import properties as pps
+from . import blender_shared_objects as bsh
+from ..ema_shared import properties as pps
 
 
 def import_sensor_info_json(jsonfilename='./sensor_info.json'):
diff --git a/ematoblender/scripts/ema_blender/coord_transforms.py b/ematoblender/scripts/ema_blender/coord_transforms.py
index aaa12f9..d18b9e7 100644
--- a/ematoblender/scripts/ema_blender/coord_transforms.py
+++ b/ematoblender/scripts/ema_blender/coord_transforms.py
@@ -1,12 +1,12 @@
 __author__ = 'Kristy'
 
 import mathutils
-import scripts.ema_io.ema_gameserver.data_manipulation as dm
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender.ema_bpy.bpy_setup_cameras import delete_standard_camera
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_blender.coil_info as ci
-import scripts.ema_shared.general_maths as bm
+from . import coil_info as ci
+from . import blender_shared_objects as bsh
+
+import ematoblender.scripts.ema_io.ema_gameserver.data_manipulation as dm
+import ematoblender.scripts.ema_shared.properties as pps
+import ematoblender.scripts.ema_shared.general_maths as bm
 
 class ObjectResizingCS(dm.BitePlane):
     """Class that takes either three points or two points (plus the assumption that Z is up)
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_camera_control.py b/ematoblender/scripts/ema_blender/ema_bge/bge_camera_control.py
index a601f0f..87e2d25 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_camera_control.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_camera_control.py
@@ -5,9 +5,10 @@
 import mathutils
 import math
 import bge
-import scripts.ema_blender.ema_bge.bge_splines_lines as sl
-import scripts.ema_blender.ema_bge.bge_menus_overlays as mo
-import scripts.ema_blender.blender_shared_objects as bsh
+from . import bge_splines_lines as sl
+from . import bge_menus_overlays as mo
+from .. import blender_shared_objects as bsh
+from ematoblender.scripts.ema_shared import properties as pps
 
 neutral_position = None # todo: get the basic position
 speed_factor=50
@@ -81,7 +82,6 @@ def bge_circular_camera_control(keys, target_name='CameraFocus', camera_name='Ci
 
 def bge_apply_head_movement(cameraempty='CameraFocus'):
     """Move the camera position relative to the parent empty based on the head-correction matrix"""
-    import scripts.ema_blender.blender_networking as bn
     matlist, *cam_pos = bsh.head_inversion
     print('got matlist', matlist)
     if matlist is not None:
@@ -128,7 +128,7 @@ def bge_point_cam_at_origin(camname="CircularCamera"):
 
 def bge_rotate_with_mouse(camname='CircularCamera'):
     """Rotate with the mouse position, if holding t (track)"""
-    from scripts.ema_blender.ema_bge.bge_standard_gamefns import get_scene_info
+    from .bge_standard_gamefns import get_scene_info
     scn, objs, cont, own, acts = get_scene_info()
     print([x for x in own.sensors])
     mouse = own.sensors["MouseSensor"]
@@ -187,7 +187,6 @@ def use_viewports(vertical=True):
     Choose vertical or horizontal split.
     """
 
-    import scripts.ema_shared.properties as pps
     scn = bge.logic.getCurrentScene()
     cams = [scn.objects.get(cam) for cam in pps.display_cameras]
 
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_emareadin.py b/ematoblender/scripts/ema_blender/ema_bge/bge_emareadin.py
index c0a064e..26736b0 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_emareadin.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_emareadin.py
@@ -25,12 +25,12 @@
 
 # My scripts for networking with the EMA (file)
 # client script that connects to EMA server
-from scripts.ema_blender import blender_networking as bn
-from scripts.ema_blender.blender_networking import send_to_gameserver
+from .. import blender_networking as bn
+from ..blender_networking import send_to_gameserver
 
 # external modules relevant to bge, stored separately for convenience
 # below illustrates absolute and relative imports of same directory
-import scripts.ema_blender.ema_bge.bge_standard_gamefns as gf
+from . import bge_standard_gamefns as gf
 from . import bge_camera_control as cc
 from . import bge_menus_overlays as mo
 from . import bge_update_armature as ua
@@ -39,13 +39,13 @@
 from . import bge_splines_lines as sl
 from . import bge_static_video as vid
 
-from scripts.ema_blender import coil_info as ci
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender import blender_shared_objects as bsh
-import scripts.ema_blender.coord_transforms as ct
+from .. import coil_info as ci
+from .. import blender_shared_objects as bsh
+from .. import coord_transforms as ct
+from ...ema_shared import properties as pps
 
-from scripts.ema_io.rtc3d_parser import DataFrame
-from scripts.ema_shared.miscellanous import reload_modules_for_testing
+from ...ema_io.rtc3d_parser import DataFrame
+from ...ema_shared.miscellanous import reload_modules_for_testing
 
 ##### global variables #####
 
@@ -64,7 +64,7 @@
 from queue import deque
 bsh.gs_answers = deque()  # store responses from gameserver (deque to can restrict length if req'd)
 # persistent socket that connects to the gameserver
-from scripts.ema_blender.blender_shared_objects import gs_soc_blocking, gs_soc_nonblocking
+from ..blender_shared_objects import gs_soc_blocking, gs_soc_nonblocking
 #bsh.gs_soc_blocking = None
 #bsh.gs_soc_nonblocking = None
 
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_manual_constraints.py b/ematoblender/scripts/ema_blender/ema_bge/bge_manual_constraints.py
index 3fcd44d..dea2ff9 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_manual_constraints.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_manual_constraints.py
@@ -1,7 +1,7 @@
 __author__ = 'Kristy'
 
 import mathutils
-from scripts.ema_blender import blender_shared_objects as bsh
+from ematoblender.scripts.ema_blender import blender_shared_objects as bsh
 
 """This file controls manual constraints on objects that are executed every frame.
 For example, if one object must always mirror another, it is controlled here.
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_menus_overlays.py b/ematoblender/scripts/ema_blender/ema_bge/bge_menus_overlays.py
index 9a98988..e97d6ec 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_menus_overlays.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_menus_overlays.py
@@ -4,10 +4,11 @@
 import bge
 import mathutils
 import math
-import scripts.ema_blender.ema_bge.bge_standard_gamefns as sg
-from scripts.ema_blender.blender_networking import send_to_gameserver, recv_from_gameserver
-import scripts.ema_shared.properties as pps
-import scripts.ema_blender.blender_shared_objects as bsh
+
+from . import bge_standard_gamefns as sg
+from ..blender_networking import send_to_gameserver, recv_from_gameserver
+from .. import blender_shared_objects as bsh
+from ...ema_shared import properties as pps
 
 ##########################################################################
 ##                   STATUS OVERLAY SCENE
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_move_objects.py b/ematoblender/scripts/ema_blender/ema_bge/bge_move_objects.py
index 65855db..f3965f1 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_move_objects.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_move_objects.py
@@ -1,13 +1,14 @@
 __author__ = 'Kristy'
 import mathutils
-from scripts.ema_blender.blender_networking import send_to_gameserver, recv_from_gameserver
-from scripts.ema_blender.blender_shared_objects import ema_active_meshes
-from scripts.ema_blender.ema_bge.bge_menus_overlays import bge_update_overlay_status_decorator
-from scripts.ema_blender.coil_info import find_transform_by_index
-from scripts.ema_blender import  blender_shared_objects as bsh
-from scripts.ema_blender.coord_transforms import PointsTransformationMatrix
-import scripts.ema_shared.properties as pps
-import scripts.ema_blender.coord_transforms as ct
+
+from .bge_menus_overlays import bge_update_overlay_status_decorator
+from ..blender_networking import send_to_gameserver, recv_from_gameserver
+from ..blender_shared_objects import ema_active_meshes
+from ..coil_info import find_transform_by_index
+from .. import  blender_shared_objects as bsh
+from ..coord_transforms import PointsTransformationMatrix
+from .. import coord_transforms as ct
+from ...ema_shared import properties as pps
 
 
 def bge_update_from_df(scene_objs, df, showall=True):
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_play_audio.py b/ematoblender/scripts/ema_blender/ema_bge/bge_play_audio.py
index 1c7cc3e..43b4e56 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_play_audio.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_play_audio.py
@@ -5,8 +5,8 @@
 import time
 import random
 import math
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_shared.properties as pps
+from .. import blender_shared_objects as bsh
+from ...ema_shared import properties as pps
 
 sound_first_exec = True
 
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_splines_lines.py b/ematoblender/scripts/ema_blender/ema_bge/bge_splines_lines.py
index 2b4bc88..d960803 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_splines_lines.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_splines_lines.py
@@ -4,11 +4,11 @@
 # note: you can also draw on images in Blender with
 #bpy.data.images['Image Name'].pixels[0:4] = (Red, Green, Blue, Alpha) #Here "Red, Green, Blue, Alfa" are floating values.
 
-import mathutils
 import bge
-from mathutils import Vector
 import math
-from scripts.ema_shared.general_maths import *
+import mathutils
+from mathutils import Vector
+from ...ema_shared.general_maths import *
 
 
 def draw_line_through_points(*points, color=(1, 0, 0)):
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_static_video.py b/ematoblender/scripts/ema_blender/ema_bge/bge_static_video.py
index 706a8d6..21764ab 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_static_video.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_static_video.py
@@ -5,11 +5,12 @@
 so when it is restarted the coils will be out of sync. Also if streaming takes a moment to initialise,
 the video plays (almost) immediately, also leading to timing mismatches."""
 
-from scripts.ema_shared.properties import video_override
-
 import bge
 import os
 
+from ...ema_shared.properties import video_override
+
+
 
 def bge_update_videoplane(timestamp_secs, videolocation, planename='UltrasoundPlane'):
     """Update the video appropriately based on timestamp"""
diff --git a/ematoblender/scripts/ema_blender/ema_bge/bge_update_armature.py b/ematoblender/scripts/ema_blender/ema_bge/bge_update_armature.py
index b8e75da..ee5086f 100644
--- a/ematoblender/scripts/ema_blender/ema_bge/bge_update_armature.py
+++ b/ematoblender/scripts/ema_blender/ema_bge/bge_update_armature.py
@@ -1,8 +1,8 @@
 __author__ = 'Kristy'
 import bge
-import scripts.ema_blender.coil_info as ci
-import scripts.ema_blender.ema_bge.bge_splines_lines as sl
-import scripts.ema_shared.general_maths as bm
+from .. import coil_info as ci
+from . import bge_splines_lines as sl
+from ...ema_shared import general_maths as bm
 
 ###############################################
 ##   NEW APPROACH - UPDATE ARMATURES WITH IK EMPTIES
@@ -29,11 +29,10 @@ def update_tongue_surface():
     else:
         print("Tongue armature not found in scene. This is problematic.")
 
-
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_blender.ema_bge.bge_splines_lines as splines
-import scripts.ema_blender.ema_bge.bge_standard_gamefns as gf
-import scripts.ema_shared.properties as pps
+from . import bge_splines_lines as splines
+from . import bge_standard_gamefns as gf
+from .. import blender_shared_objects as bsh
+from ...ema_shared import properties as pps
 
 
 def update_these_bones(armature_name='Mid-Saggital'):
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_add_game_objects.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_add_game_objects.py
index f206386..45b7d5d 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_add_game_objects.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_add_game_objects.py
@@ -4,9 +4,9 @@
 from . import bpy_workspace as ws
 
 
-from scripts.ema_shared import properties as pps
-from scripts.ema_shared.miscellanous import get_random_color
-from scripts.ema_blender import blender_shared_objects as bsh
+from ematoblender.scripts.ema_shared import properties as pps
+from ematoblender.scripts.ema_shared.miscellanous import get_random_color
+from ematoblender.scripts.ema_blender import blender_shared_objects as bsh
 
 
 @ws.postfn_gamemaster_reset_decorator
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_emareadin.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_emareadin.py
index 7121029..8840214 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_emareadin.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_emareadin.py
@@ -25,15 +25,15 @@
 from . import bpy_move_objects as mo
 from . import bpy_static_video as vid
 
-from scripts.ema_blender import coil_info as ci
-from scripts.ema_blender import blender_shared_objects as bsh
-from scripts.ema_blender import coord_transforms as ct
-from scripts.ema_blender import blender_networking as bn
-
-from scripts.ema_shared import miscellanous as misc
-from scripts.ema_shared import properties as pps
-from scripts.ema_shared import general_maths as bm
-from scripts.ema_shared.miscellanous import reload_modules_for_testing
+from .. import coil_info as ci
+from .. import blender_shared_objects as bsh
+from .. import coord_transforms as ct
+from .. import blender_networking as bn
+
+from ...ema_shared import miscellanous as misc
+from ...ema_shared import properties as pps
+from ...ema_shared import general_maths as bm
+from ...ema_shared.miscellanous import reload_modules_for_testing
 
 
 def main():
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_import_assets.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_import_assets.py
index 7fe46ac..8daeee2 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_import_assets.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_import_assets.py
@@ -5,9 +5,9 @@
 import mathutils
 import re, os, copy
 from .bpy_workspace import postfn_gamemaster_reset_decorator, prefn_gamemaster_select_decorator
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender.ema_bpy.bpy_setup_cameras import delete_standard_camera
-import scripts.ema_blender.coil_info as ci
+from .bpy_setup_cameras import delete_standard_camera
+from .. import coil_info as ci
+from ...ema_shared import properties as pps
 
 ##########################################################################
 ##                    GENERAL IMPORT FUNCTIONS
@@ -130,7 +130,7 @@ def add_statusbar_scene():
     bpy.ops.object.select_all(action='DESELECT')
 
     # get the circling camera object, it is on this that the scene is overlaid
-    from scripts.ema_blender.blender_shared_objects import circling_cam
+    from ematoblender.scripts.ema_blender.blender_shared_objects import circling_cam
     camname = circling_cam.name
 
     # add a low-frequency sensor logic brick to the camera
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_link_assets_coils.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_link_assets_coils.py
index 354ec0c..2e7b540 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_link_assets_coils.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_link_assets_coils.py
@@ -3,8 +3,8 @@
 from . import bpy_workspace as ws
 import os
 import json
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender import blender_shared_objects as bsh
+from ematoblender.scripts.ema_shared import properties as pps
+from .. import blender_shared_objects as bsh
 
 import scripts.ema_shared.general_maths as bm
 import scripts.ema_blender.coil_info as ci
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_move_objects.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_move_objects.py
index 789f6da..07a775d 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_move_objects.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_move_objects.py
@@ -8,12 +8,12 @@
 import bpy
 #from .bpy_workspace import postfn_gamemaster_reset_decorator
 from ..ema_bpy import bpy_link_assets_coils as lac
-from scripts.ema_blender import coil_info as ci
-from scripts.ema_blender import blender_networking as bn
-from scripts.ema_blender import blender_shared_objects as bsh
+from .. import coil_info as ci
+from .. import blender_networking as bn
+from .. import blender_shared_objects as bsh
+from .. import coord_transforms as ct
 
-from scripts.ema_shared import properties as pps
-import scripts.ema_blender.coord_transforms as ct
+from ematoblender.scripts.ema_shared import properties as pps
 
 
 def show_all_coils_in_position(df, active=True, biteplate=True, reference=True):
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_cameras.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_cameras.py
index 47fa570..031ab88 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_cameras.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_cameras.py
@@ -3,7 +3,7 @@
 import mathutils
 import math
 from .bpy_workspace import postfn_gamemaster_reset_decorator
-from scripts.ema_blender import blender_shared_objects as bsh
+from .. import blender_shared_objects as bsh
 
 
 @postfn_gamemaster_reset_decorator
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_meshes.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_meshes.py
index c07afe5..d238d55 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_meshes.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_setup_meshes.py
@@ -1,6 +1,6 @@
 __author__ = 'Kristy'
 import bpy
-from scripts.ema_shared import properties as pps
+from ematoblender.scripts.ema_shared import properties as pps
 #note: meshes and objects can be created in three different ways:
 # http://wiki.blender.org/index.php/Dev:2.5/Py/Scripts/Cookbook/Code_snippets/Three_ways_to_create_objects
 
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/bpy_static_video.py b/ematoblender/scripts/ema_blender/ema_bpy/bpy_static_video.py
index e5e0482..82b44c1 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/bpy_static_video.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/bpy_static_video.py
@@ -10,8 +10,8 @@
 
 import bpy
 import os
-from scripts.ema_blender.ema_bpy.bpy_workspace import set_workspace_properties, postfn_gamemaster_reset_decorator
-from scripts.ema_shared import properties as pps
+from .bpy_workspace import set_workspace_properties, postfn_gamemaster_reset_decorator
+from ematoblender.scripts.ema_shared import properties as pps
 
 @postfn_gamemaster_reset_decorator
 def create_video_plane(alpha='ADD', planename='UltrasoundPlane', placeholderfile='./images/black.jpg'):
diff --git a/ematoblender/scripts/ema_blender/ema_bpy/run_bpy.py b/ematoblender/scripts/ema_blender/ema_bpy/run_bpy.py
index c70ac0e..72b0cbf 100644
--- a/ematoblender/scripts/ema_blender/ema_bpy/run_bpy.py
+++ b/ematoblender/scripts/ema_blender/ema_bpy/run_bpy.py
@@ -37,7 +37,7 @@ def check_script_access():
 
 print('FAILED MODULE TEST:',check_script_access())
 
-from scripts.ema_blender.ema_bpy import bpy_emareadin as be
+from . import bpy_emareadin as be
 import importlib as imp
 imp.reload(be)
 be.main()
diff --git a/ematoblender/scripts/ema_io/client_server_comms.py b/ematoblender/scripts/ema_io/client_server_comms.py
index 56c9f0f..a708642 100644
--- a/ematoblender/scripts/ema_io/client_server_comms.py
+++ b/ematoblender/scripts/ema_io/client_server_comms.py
@@ -111,7 +111,7 @@ def __init__(self, myprotocol):
         print("Standard socket created", self.s)
 
         #set the port
-        from scripts.ema_shared.properties import waveserver_host, waveserver_port
+        from ematoblender.scripts.ema_shared.properties import waveserver_host, waveserver_port
         self.HOST = waveserver_host
         self.PORT = waveserver_port
 
diff --git a/ematoblender/scripts/ema_io/ema_gameserver/data_manipulation.py b/ematoblender/scripts/ema_io/ema_gameserver/data_manipulation.py
index b8827e2..c274492 100644
--- a/ematoblender/scripts/ema_io/ema_gameserver/data_manipulation.py
+++ b/ematoblender/scripts/ema_io/ema_gameserver/data_manipulation.py
@@ -1,7 +1,7 @@
 __author__ = 'Kristy'
 import math
-from scripts.ema_io.ema_gameserver.biteplate_headcorr import BitePlane, ReferencePlane
-import scripts.ema_blender.coil_info as ci
+from .biteplate_headcorr import BitePlane, ReferencePlane
+import ematoblender.scripts.ema_blender.coil_info as ci
 
 
 #######################
diff --git a/ematoblender/scripts/ema_io/ema_gameserver/gameserver.py b/ematoblender/scripts/ema_io/ema_gameserver/gameserver.py
index 7d72b6b..4088726 100644
--- a/ematoblender/scripts/ema_io/ema_gameserver/gameserver.py
+++ b/ematoblender/scripts/ema_io/ema_gameserver/gameserver.py
@@ -26,15 +26,15 @@
 # used for saving and manipulating incoming data
 import scripts.ema_io.ema_gameserver.wave_recording as wr
 import scripts.ema_io.ema_gameserver.data_manipulation as dm
-from scripts.ema_io.ema_gameserver.biteplate_headcorr import BitePlane, ReferencePlane
+from ematoblender.scripts.ema_io.ema_gameserver.biteplate_headcorr import BitePlane, ReferencePlane
 
 # global properties, coil definitions
-from scripts.ema_shared import properties as pps
+from ematoblender.scripts.ema_shared import properties as pps
 import scripts.ema_blender.coil_info as ci
 
 # connection objects (this server essentially wraps rtc behaviour)
 import scripts.ema_io.ema_gameserver.rtclient as rtc
-from scripts.ema_io.rtc3d_parser import DataFrame
+from ematoblender.scripts.ema_io.rtc3d_parser import DataFrame
 
 
 def main():
@@ -262,7 +262,7 @@ def shutdown_server_threads(self):
     def handle(self):
         """Handle requests sent to the gameserver from Blender."""
         if pps.development_mode:
-            from scripts.ema_shared.miscellanous import reload_modules_for_testing
+            from ematoblender.scripts.ema_shared.miscellanous import reload_modules_for_testing
             reload_modules_for_testing(dm)
 
         ### self.request is the TCP socket connected to the client
diff --git a/ematoblender/scripts/ema_io/ema_gameserver/rtclient.py b/ematoblender/scripts/ema_io/ema_gameserver/rtclient.py
index 5b078f5..7adefa9 100644
--- a/ematoblender/scripts/ema_io/ema_gameserver/rtclient.py
+++ b/ematoblender/scripts/ema_io/ema_gameserver/rtclient.py
@@ -6,8 +6,8 @@
 """
 
 # communication with the server, parsing the objects to and from Coil/DataFrame etc
-from scripts.ema_io.rtc3d_parser import BasicProtocol, DataFrame
-from scripts.ema_io.client_server_comms import ClientConnection
+from ematoblender.scripts.ema_io.rtc3d_parser import BasicProtocol, DataFrame
+from ematoblender.scripts.ema_io.client_server_comms import ClientConnection
 
 # threading of replies
 from threading import Thread
diff --git a/ematoblender/scripts/ema_io/ema_gameserver/wave_recording.py b/ematoblender/scripts/ema_io/ema_gameserver/wave_recording.py
index 6705b97..0fe48d4 100644
--- a/ematoblender/scripts/ema_io/ema_gameserver/wave_recording.py
+++ b/ematoblender/scripts/ema_io/ema_gameserver/wave_recording.py
@@ -9,7 +9,7 @@
 from threading import Thread, Event
 from collections import deque
 
-from scripts.ema_shared.properties import wave_writing_chunk_size
+from ematoblender.scripts.ema_shared.properties import wave_writing_chunk_size
 
 recording = None
 stop_recording = Event()
diff --git a/ematoblender/scripts/ema_io/ema_staticserver/mocap_file_parser.py b/ematoblender/scripts/ema_io/ema_staticserver/mocap_file_parser.py
index a5b3157..f913b0d 100644
--- a/ematoblender/scripts/ema_io/ema_staticserver/mocap_file_parser.py
+++ b/ematoblender/scripts/ema_io/ema_staticserver/mocap_file_parser.py
@@ -11,7 +11,7 @@
 import math
 import struct
 import os
-from scripts.ema_io.rtc3d_parser import DataFrame, Component, Coil
+from ematoblender.scripts.ema_io.rtc3d_parser import DataFrame, Component, Coil
 
 xml_skeleton_location = './scripts/ema_io/ema_staticserver/parameter_skeleton.xml'
 
diff --git a/ematoblender/scripts/ema_io/ema_staticserver/rtserver.py b/ematoblender/scripts/ema_io/ema_staticserver/rtserver.py
index 863b807..c1784ef 100644
--- a/ematoblender/scripts/ema_io/ema_staticserver/rtserver.py
+++ b/ematoblender/scripts/ema_io/ema_staticserver/rtserver.py
@@ -16,9 +16,9 @@
 # server functionality
 import socketserver
 
-from scripts.ema_io.client_server_comms import ServerConnection, BasicProtocol
-from scripts.ema_io.ema_staticserver.rtserver_emulate_func import RTServer_Static
-from scripts.ema_shared import properties as pps
+from ematoblender.scripts.ema_io.client_server_comms import ServerConnection, BasicProtocol
+from ematoblender.scripts.ema_io.ema_staticserver.rtserver_emulate_func import RTServer_Static
+from ematoblender.scripts.ema_shared import properties as pps
 
 # for debugging
 import sys
diff --git a/ematoblender/scripts/ema_io/ema_staticserver/rtserver_tester.py b/ematoblender/scripts/ema_io/ema_staticserver/rtserver_tester.py
index 4704806..00d8cd2 100644
--- a/ematoblender/scripts/ema_io/ema_staticserver/rtserver_tester.py
+++ b/ematoblender/scripts/ema_io/ema_staticserver/rtserver_tester.py
@@ -7,7 +7,7 @@
 """
 
 
-from scripts.ema_io.client_server_comms import ClientConnection
+from ematoblender.scripts.ema_io.client_server_comms import ClientConnection
 import scripts.ema_shared.properties as pps
 import time
 
diff --git a/ematoblender/scripts/ema_io/rtc3d_parser.py b/ematoblender/scripts/ema_io/rtc3d_parser.py
index 522b401..61fbd17 100644
--- a/ematoblender/scripts/ema_io/rtc3d_parser.py
+++ b/ematoblender/scripts/ema_io/rtc3d_parser.py
@@ -21,7 +21,7 @@
 # decode bytes -> ascii -> unicode
 import struct
 import copy
-from scripts.ema_shared.general_maths import average_quaternions
+from ematoblender.scripts.ema_shared.general_maths import average_quaternions
 
 
 class BasicProtocol(object):
@@ -224,7 +224,7 @@ def __init__(self,  componentbytes=None, fileparser=None,):
     def create_coils(self, dimensions=3, mappings=None, marker_channels=None, n=1):
         """Build coil objects (called within Component init).
         Return a list of coil objects with the appropriate mappings."""
-        from scripts.ema_io.ema_staticserver.mocap_file_parser import MocapParent
+        from ematoblender.scripts.ema_io.ema_staticserver.mocap_file_parser import MocapParent
 
         # data frame component type is 3d or 6d, based on the minimum number of channels sent
         self.comp_type = 1 if dimensions < 5 else 4 # dfct, 3D or 6D
diff --git a/ematoblender/scripts/ema_shared/general_maths.py b/ematoblender/scripts/ema_shared/general_maths.py
index ce3e1c5..553b2bf 100644
--- a/ematoblender/scripts/ema_shared/general_maths.py
+++ b/ematoblender/scripts/ema_shared/general_maths.py
@@ -1,7 +1,6 @@
 __author__ = 'Kristy'
 import math
 import mathutils
-import scripts.ema_blender.coil_info as ci
 
 
 def get_intermediate_coords(k1, k2, k3, n=10):
diff --git a/ematoblender/scripts/ema_shared/properties.py b/ematoblender/scripts/ema_shared/properties.py
index 2c9f879..a000928 100644
--- a/ematoblender/scripts/ema_shared/properties.py
+++ b/ematoblender/scripts/ema_shared/properties.py
@@ -79,13 +79,6 @@
 name_of_tongue_object = "Scene"  # presumes object is in default scene, called 'Scene'
 name_of_tongue_armature = 'tongue_arm'  # name of the tongue armature that is changed to fit a spline
 
-# names of objects on tongue that need to be connected to data input
-# the value is a string that is the name of the empty object.
-# it is connected to a coil empty, as defined by other properties.
-import scripts.ema_blender.blender_shared_objects as bsh
-TT_empty_name = bsh.tongue_top_empty_name(1)
-TM_empty_name = bsh.tongue_top_empty_name(5)
-TB_empty_name = bsh.tongue_top_empty_name(10)
 
 tonguemesh_name = 'tonguemesh'
 cube_scale = 1
diff --git a/ematoblender/test_gameserver.py b/ematoblender/test_gameserver.py
index 94a2a72..6f6a975 100644
--- a/ematoblender/test_gameserver.py
+++ b/ematoblender/test_gameserver.py
@@ -12,8 +12,8 @@ def main():
     testing_active = True  # pretend to make some calls from Blender
 
     if testing_passive:  # for running the gameserver in a thread, to operate normally
-        from scripts.ema_io.ema_gameserver import gameserver as gs
-        from scripts.ema_shared.properties import game_server_cl_args
+        from ematoblender.scripts.ema_io.ema_gameserver import gameserver as gs
+        from ematoblender.scripts.ema_shared.properties import game_server_cl_args
 
         print('About to run the gameserver with arguments in pps file')
         print('CL args are:', game_server_cl_args)
@@ -36,7 +36,7 @@ def main():
         s = bn.setup_socket_to_gameserver(blocking=False)
 
         print('Performing some simple tests.')
-        from scripts.ema_blender.blender_networking import send_to_gameserver
+        from ematoblender.scripts.ema_blender.blender_networking import send_to_gameserver
         print(send_to_gameserver(s, mode='TEST_ALIVE'))
         single_dfs = [send_to_gameserver(s) for i in range(10)]
         for df in single_dfs:
@@ -51,7 +51,7 @@ def main():
         mydf = send_to_gameserver(s, mode="START_STREAM")
         print('start streaming df:', mydf)
 
-        from scripts.ema_io.rtc3d_parser import DataFrame
+        from ematoblender.scripts.ema_io.rtc3d_parser import DataFrame
         while True:
             send_to_gameserver(s, mode='STREAM_DF')
             this_df = b''