diff --git a/camera_streaming/camera_stream.py b/camera_streaming/camera_stream.py
index f6a43a69329a1dfa75c2f36567d87e17f18fed4e..3a4f982a89a7f92633cc887592e15b522dc816f8 100644
--- a/camera_streaming/camera_stream.py
+++ b/camera_streaming/camera_stream.py
@@ -25,7 +25,6 @@ from rclpy.qos import (
 )
 from rclpy.qos import QoSPresetProfiles
 
-from sniffing import sniffer
 
 from mission_manager.client import MissionExecutor, MissionClient
 from infdist.optimization.agent import EstimatingAgent
@@ -33,8 +32,10 @@ from infdist.robot.ros2_network import ROS2Network, ROS2NativeMessage
 from infdist.optimization.simplesim import (
     create_msgnum_constraint_violations,
 )
-from mission import generate_mission_context
-from detect import detect_red
+
+from .sniffing import sniffer
+from .mission import generate_mission_context
+from .detect import detect_red
 
 CUSTOM_QOS = QoSProfile(
     history=QoSHistoryPolicy.RMW_QOS_POLICY_HISTORY_KEEP_LAST,
diff --git a/camera_streaming/mission.py b/camera_streaming/mission.py
index be44eeb1efa33d648041dcdf24d726fdacc3dd19..fd2ac3d9bbad9fdb92759fcec65df2381c325fc4 100644
--- a/camera_streaming/mission.py
+++ b/camera_streaming/mission.py
@@ -3,7 +3,7 @@
 from infdist.optimization.models import MissionContext, InformationType
 from infdist.optimization.aggregations import AggregationMostRecent
 
-from utility import PeriodicTypeForecast, UtilityVideo
+from .utility import PeriodicTypeForecast, UtilityVideo
 # from infdist.optimization.message_forecast import PeriodicTypeForecast
 
 
diff --git a/setup.py b/setup.py
index 76942d44ac5a6d1b921f8e2d0cab86a431ba405b..f2c2fe223aed545120ab7be7354d1c6361cea033 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,6 @@
+import glob
+import os
+
 from setuptools import find_packages
 from setuptools import setup
 
@@ -11,8 +14,10 @@ setup(
         ('share/ament_index/resource_index/packages',
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
+        ('share/' + package_name + '/launch',
+         glob.glob(os.path.join('launch', '*.launch.py'))),
     ],
-    install_requires=['setuptools'],
+    install_requires=['launch', 'setuptools'],
     zip_safe=True,
     author='Michal Barcis',
     author_email='michal.barcis@aau.at',
@@ -30,7 +35,7 @@ setup(
     tests_require=['pytest'],
     entry_points={
         'console_scripts': [
-            'camera_streaming = camera_streaming.camera_streaming:main',
+            'camera_streaming = camera_streaming.camera_stream:main',
             'camera_subscriber = camera_streaming.camera_subscriber:main',
         ],
     },