diff --git a/client/python/client.py b/client/python/client.py
index 578ac190f6830770920d0fc3606dcac9ef5f0055..22a9500ca713a90d2aa667bcce899c0b30431327 100644
--- a/client/python/client.py
+++ b/client/python/client.py
@@ -1,13 +1,17 @@
-import grpc
-from netcode.netcode_pb2_grpc import NotifierComStub
-from netcode.netcode_pb2 import *
+import sys
+sys.path.insert(0, '../..')
+sys.path.insert(0, '../../shared/netcode')
 
-channel = grpc.insecure_channel('localhost:8080')
-stub = NotifierComStub(channel)
+import grpc
+from shared.netcode.netcode_pb2 import *
+from shared.netcode.netcode_pb2_grpc import NotifierComStub
 
-def sendMessage(msg):
-    request = SendMessageRequest(msg)
+def sendMessage(stub, msg):
+    request = SendMessageRequest(message=msg)
     response = stub.SendMessage(request)
 
+
 if __name__ == "__main__":
-    sendMessage("test")
\ No newline at end of file
+    with grpc.insecure_channel('localhost:8080') as channel:
+        stub = NotifierComStub(channel)
+        sendMessage(stub, "test")
diff --git a/server/server.py b/server/server.py
index 25fb0e2bc4a53325afe9b358d15907d0b0a42be3..28dba7704da115686af71c2c1868a5602f131166 100644
--- a/server/server.py
+++ b/server/server.py
@@ -1,18 +1,22 @@
-import grpc
+import sys
+sys.path.insert(0, '..')
+sys.path.insert(0, '../shared/netcode')
+
 from concurrent import futures
+from shared.netcode.netcode_pb2 import *
+from shared.netcode.netcode_pb2_grpc import *
 
-from netcode.netcode_pb2_grpc import *
-from netcode.netcode_pb2 import *
 
 class NotifierService(NotifierComServicer):
     def SendMessage(self, request, context):
         print(request.message)
         return Nothing()
 
+
 if __name__ == "__main__":
     server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
     add_NotifierComServicer_to_server(
-        NotifierService, server)
+        NotifierService(), server)
     server.add_insecure_port('[::]:8080')
     server.start()
     server.wait_for_termination()