diff --git a/resources/lib/CallListenerClients/FritzboxClient.py b/CallListenerClients/FritzboxClient.py
similarity index 100%
rename from resources/lib/CallListenerClients/FritzboxClient.py
rename to CallListenerClients/FritzboxClient.py
diff --git a/resources/lib/CallListenerClients/NcidClient.py b/CallListenerClients/NcidClient.py
similarity index 100%
rename from resources/lib/CallListenerClients/NcidClient.py
rename to CallListenerClients/NcidClient.py
diff --git a/resources/lib/CallListenerClients/__init__.py b/CallListenerClients/__init__.py
similarity index 100%
rename from resources/lib/CallListenerClients/__init__.py
rename to CallListenerClients/__init__.py
diff --git a/resources/lib/CommonUtils.py b/CommonUtils.py
similarity index 100%
rename from resources/lib/CommonUtils.py
rename to CommonUtils.py
diff --git a/service.py b/service.py
index 9dbac24..2ef0910 100644
--- a/service.py
+++ b/service.py
@@ -7,7 +7,6 @@
 
 from CallListenerClients.FritzboxClient import FritzboxClient
 from CallListenerClients.NcidClient import NcidClient
-from Yac.YacServer import YacServer
 
 runningOutsideXbmc = False
 try:
@@ -45,11 +44,12 @@ def handleIncomingCall(caller):
     if caller.caller == "Unknown":
         caller.caller = xbmcaddon.getLocalizedString(30602)
 
-    xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (xbmcAddon.getLocalizedString(30601) % caller.caller,
-                                                            caller.number,
-                                                            int(notificationTimeout),
-                                                            notificationIcon
-                                                            ))
+    callerstring = xbmcAddon.getLocalizedString(30601) % caller.caller 
+    xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % ('"'+callerstring+'"',
+        caller.number,
+        int(notificationTimeout),
+        notificationIcon
+    ))
 
     activePlayers = json.loads(xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "Player.GetActivePlayers", "id": 1}'))