diff --git a/bl_types/__init__.py b/bl_types/__init__.py
index d5fe1fb..79ef099 100644
--- a/bl_types/__init__.py
+++ b/bl_types/__init__.py
@@ -13,7 +13,7 @@ __all__ = [
 ]  # Order here defines execution order
 
 from . import *
-from ..libs.replication.data import ReplicatedDataFactory
+from ..libs.replication.replication.data import ReplicatedDataFactory
 
 def types_to_register():
     return __all__
diff --git a/bl_types/bl_datablock.py b/bl_types/bl_datablock.py
index 63a9626..8cc8a11 100644
--- a/bl_types/bl_datablock.py
+++ b/bl_types/bl_datablock.py
@@ -2,7 +2,7 @@ import bpy
 import mathutils
 
 from .. import utils
-from ..libs.replication.data import ReplicatedDatablock
+from ..libs.replication.replication.data import ReplicatedDatablock
 
 class BlDatablock(ReplicatedDatablock):
     def __init__(self, *args, **kwargs):
diff --git a/bl_types/bl_user.py b/bl_types/bl_user.py
index 0869f49..ef034d6 100644
--- a/bl_types/bl_user.py
+++ b/bl_types/bl_user.py
@@ -4,7 +4,7 @@ import mathutils
 from .. import utils
 from .. import presence
 from .bl_datablock import BlDatablock
-from ..libs.replication.constants import UP
+from ..libs.replication.replication.constants import UP
 from ..libs.debug import draw_point
 
 
diff --git a/delayable.py b/delayable.py
index d95707e..fc54b20 100644
--- a/delayable.py
+++ b/delayable.py
@@ -3,7 +3,7 @@ import bpy
 from . import operators, utils
 from .bl_types.bl_user import BlUser
 from .libs import debug
-from .libs.replication.constants import FETCHED
+from .libs.replication.replication.constants import FETCHED
 
 
 class Delayable():
diff --git a/libs/replication b/libs/replication
index 200821a..929f624 160000
--- a/libs/replication
+++ b/libs/replication
@@ -1 +1 @@
-Subproject commit 200821a5127ca87b358f617f4a4b610f4a73170c
+Subproject commit 929f624919a1b56c4b5a00b824ad9f309ee403c4
diff --git a/operators.py b/operators.py
index 7a2a169..c198317 100644
--- a/operators.py
+++ b/operators.py
@@ -15,8 +15,8 @@ from bpy_extras.io_utils import ExportHelper
 
 from . import environment, presence, ui, utils, delayable
 from .libs import umsgpack
-from .libs.replication.data import ReplicatedDataFactory
-from .libs.replication.interface import Session
+from .libs.replication.replication.data import ReplicatedDataFactory
+from .libs.replication.replication.interface import Session
 from . import bl_types
 
 logger = logging.getLogger(__name__)
diff --git a/ui.py b/ui.py
index f96056e..d0ff2fb 100644
--- a/ui.py
+++ b/ui.py
@@ -1,6 +1,6 @@
 import bpy
 from . import operators
-from .libs.replication.constants import FETCHED, ERROR
+from .libs.replication.replication.constants import FETCHED, ERROR
 from .bl_types.bl_user import BlUser