diff --git a/RoboidControl/ParticipantUDP.py b/RoboidControl/ParticipantUDP.py
index 0e217ad..850036d 100644
--- a/RoboidControl/ParticipantUDP.py
+++ b/RoboidControl/ParticipantUDP.py
@@ -4,12 +4,12 @@ import time
 
 from RoboidControl.Participant import Participant
 from RoboidControl.Thing import Thing
-from Messages.ParticipantMsg import ParticipantMsg
-from Messages.NetworkIdMsg import NetworkIdMsg
-from Messages.ThingMsg import ThingMsg
-from Messages.NameMsg import NameMsg
-from Messages.ModelUrlMsg import ModelUrlMsg
-from Messages import *
+from RoboidControl.Messages.ParticipantMsg import ParticipantMsg
+from RoboidControl.Messages.NetworkIdMsg import NetworkIdMsg
+from RoboidControl.Messages.ThingMsg import ThingMsg
+from RoboidControl.Messages.NameMsg import NameMsg
+from RoboidControl.Messages.ModelUrlMsg import ModelUrlMsg
+from RoboidControl.Messages import *
 
 import sys
 micropython = 'micropython' in sys.modules
diff --git a/RoboidControl/Participants/SiteServer.py b/RoboidControl/Participants/SiteServer.py
index 0e09168..c3042b0 100644
--- a/RoboidControl/Participants/SiteServer.py
+++ b/RoboidControl/Participants/SiteServer.py
@@ -1,8 +1,8 @@
-from ParticipantUDP import ParticipantUDP
-from Messages.ParticipantMsg import ParticipantMsg
-from Messages.NetworkIdMsg import NetworkIdMsg
-from Things.TemperatureSensor import TemperatureSensor
-from Thing import Thing
+from RoboidControl.ParticipantUDP import ParticipantUDP
+from RoboidControl.Messages.ParticipantMsg import ParticipantMsg
+from RoboidControl.Messages.NetworkIdMsg import NetworkIdMsg
+from RoboidControl.Things.TemperatureSensor import TemperatureSensor
+from RoboidControl.Thing import Thing
 
 import socket
 import threading