diff --git a/setup.py b/setup.py
index dd95054be467f0e36fb3c85f2b0967eb8f9f610a..85f6b2ada7ee2cb26c065409707b0bc22cf94e4e 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,6 @@ setup(name='calng',
               'CalibrationManager = calng.CalibrationManager:CalibrationManager'
           ],
       },
-      package_data={},
+      package_data={'': ['*.cpp']},
       requires=[],
 )
diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py
index 1ab09cb16c6fe63975b3ce194f46f40d8ba04d6f..5aae298373aa4d6cbbe337e3e16454ea71d3a216 100644
--- a/src/calng/DsscCorrection.py
+++ b/src/calng/DsscCorrection.py
@@ -29,8 +29,8 @@ from karabo.bound import (
 )
 from karabo.common.states import State
 
-import shmem_utils
-import utils
+from . import shmem_utils
+from . import utils
 
 from ._version import version as deviceVersion
 from .dssc_gpu import DsscGpuRunner
diff --git a/src/calng/ShmemToZMQ.py b/src/calng/ShmemToZMQ.py
index c69fdd28c734600a9370f4780505462d4133857e..e1c2fc7877eaee11bd74be501399fda2a2907a61 100644
--- a/src/calng/ShmemToZMQ.py
+++ b/src/calng/ShmemToZMQ.py
@@ -4,7 +4,7 @@ from time import time
 from karabo.bound import KARABO_CLASSINFO
 from PipeToZeroMQ import PipeToZeroMQ, conversion
 
-import shmem_utils
+from . import shmem_utils
 
 from ._version import version as deviceVersion
 
diff --git a/src/calng/dssc_gpu.py b/src/calng/dssc_gpu.py
index 5efa4a4cc25af19230d37554457b83f12a7b234e..4e126ab3b1795bb26c319c35660b6f49fb6e2b21 100644
--- a/src/calng/dssc_gpu.py
+++ b/src/calng/dssc_gpu.py
@@ -5,7 +5,7 @@ import cupyx
 import jinja2
 import numpy as np
 
-import utils
+from . import utils
 
 
 class DsscGpuRunner:
diff --git a/src/gpu_utils.py b/src/calng/gpu_utils.py
similarity index 100%
rename from src/gpu_utils.py
rename to src/calng/gpu_utils.py
diff --git a/src/shmem_utils.py b/src/calng/shmem_utils.py
similarity index 100%
rename from src/shmem_utils.py
rename to src/calng/shmem_utils.py
diff --git a/src/utils.py b/src/calng/utils.py
similarity index 100%
rename from src/utils.py
rename to src/calng/utils.py