diff --git a/src/opticalcontroller/OpticalController.py b/src/opticalcontroller/OpticalController.py
index 97e097c8a94382b71903b4a57ab66382beec5eb2..de4d3ae54111c8bce077c28c1e1ab35133a945e6 100644
--- a/src/opticalcontroller/OpticalController.py
+++ b/src/opticalcontroller/OpticalController.py
@@ -16,11 +16,11 @@ import time
 from flask import Flask
 from flask import render_template
 from flask_restplus import Resource, Api
-from tools import *
-from variables import *
-from RSA import RSA
-from common.proto.context_pb2 import TopologyId
 from google.protobuf.json_format import MessageToDict
+from common.proto.context_pb2 import TopologyId
+from opticalcontroller.tools import *
+from opticalcontroller.variables import *
+from opticalcontroller.RSA import RSA
 
 
 global rsa
diff --git a/src/opticalcontroller/RSA.py b/src/opticalcontroller/RSA.py
index 61a74edbecc2ac635398ee8482800514295e9473..c13aef49e2b6a4064e0e0d6a0470cc9087fd24f6 100644
--- a/src/opticalcontroller/RSA.py
+++ b/src/opticalcontroller/RSA.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import dijsktra
-from tools import *
-from variables import *
+from opticalcontroller.tools import *
+from opticalcontroller.variables import *
 
 
 class RSA():
diff --git a/src/opticalcontroller/tools.py b/src/opticalcontroller/tools.py
index 08441f5c0010de1be503ee307410431ddfee54ab..12743699181d1384e6277044ff6e1339c1fdc502 100644
--- a/src/opticalcontroller/tools.py
+++ b/src/opticalcontroller/tools.py
@@ -14,10 +14,10 @@
 
 import json
 import numpy as np
-from variables import  *
 from common.proto.context_pb2 import TopologyId , LinkId , OpticalLink , OpticalLinkDetails
 from common.tools.object_factory.OpticalLink import correct_slot
 from context.client.ContextClient import ContextClient
+from opticalcontroller.variables import  *
 
 
 def common_slots(a, b):