diff --git a/ur_driver/src/ur_driver/ur_IO.py b/ur_driver/src/ur_driver/io_interface.py
old mode 100755
new mode 100644
similarity index 98%
rename from ur_driver/src/ur_driver/ur_IO.py
rename to ur_driver/src/ur_driver/io_interface.py
index 9df952d71a037dd8f4148443b22f8deef8012dcd..a7fa6d7ba65bdb9ac2509fdf4937a9076afbf0de
--- a/ur_driver/src/ur_driver/ur_IO.py
+++ b/ur_driver/src/ur_driver/io_interface.py
@@ -2,8 +2,8 @@
 
 import sys
 import rospy
-from ur_driver.srv import *
-from ur_driver.msg import *
+from ur_msgs.srv import *
+from ur_msgs.msg import *
 
 FUN_SET_DIGITAL_OUT = 1
 FUN_SET_FLAG = 2
diff --git a/ur_driver/src/ur_driver/onandoff.py b/ur_driver/src/ur_driver/onandoff.py
deleted file mode 100755
index fdfa2c84394e3995c68745dc8bee6d68567e3428..0000000000000000000000000000000000000000
--- a/ur_driver/src/ur_driver/onandoff.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-import ur_IO
-import time
-
-if __name__ == "__main__":
-    print "toggling things"
-    ur_IO.get_states()
-    print "listener has been activated"
-    while(True):
-        ur_IO.set_tool_voltage(12)
-        ur_IO.set_digital_out(0, True)
-        ur_IO.set_analog_out(0, 0.75)
-        ur_IO.set_flag(0, True)
-        print(ur_IO.Flag_States[0])
-        print(ur_IO.Analog_Out_States[0])
-        print(ur_IO.Digital_Out_States[0])
-        time.sleep(1)
-        ur_IO.set_tool_voltage(24)
-        ur_IO.set_digital_out(0, False)
-        ur_IO.set_analog_out(0, 0.25)
-        ur_IO.set_flag(0, False)
-        print(ur_IO.Flag_States[0])
-        print(ur_IO.Analog_Out_States[0])
-        print(ur_IO.Digital_Out_States[0])
-        time.sleep(1)
-
-
diff --git a/ur_driver/test_io.py b/ur_driver/test_io.py
new file mode 100755
index 0000000000000000000000000000000000000000..1d62d1703f8026e7d31ae11c20cda9352a45c358
--- /dev/null
+++ b/ur_driver/test_io.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+import time
+from ur_driver.io_interface import *
+
+if __name__ == "__main__":
+    print "toggling things"
+    get_states()
+    print "listener has been activated"
+    while(True):
+        set_tool_voltage(12)
+        set_digital_out(0, True)
+        set_analog_out(0, 0.75)
+        set_flag(0, True)
+        print(Flag_States[0])
+        print(Analog_Out_States[0])
+        print(Digital_Out_States[0])
+        time.sleep(1)
+        set_tool_voltage(24)
+        set_digital_out(0, False)
+        set_analog_out(0, 0.25)
+        set_flag(0, False)
+        print(Flag_States[0])
+        print(Analog_Out_States[0])
+        print(Digital_Out_States[0])
+        time.sleep(1)
+
+