diff --git a/input-create b/input-create
index 9e9fb4c..770edd0 100755
--- a/input-create
+++ b/input-create
@@ -1,9 +1,12 @@
 #!/usr/bin/env python
-import linux_uinput, ctypes, fcntl, os, sys
-from cinput import *
-from mapper import KeyMapper, parse_conf, pretty_conf_print, \
+import ctypes, fcntl, os, sys
+
+import uinputmapper
+import uinputmapper.linux_uinput
+from uinputmappercinput import *
+from uinputmappermapper import KeyMapper, parse_conf, pretty_conf_print, \
     get_exported_device_count
-from linux_input import timeval, input_event
+from uinputmapper.linux_input import timeval, input_event
 
 try:
     import cPickle as pickle
diff --git a/input-read b/input-read
index b200f3e..0f9cb12 100755
--- a/input-read
+++ b/input-read
@@ -1,9 +1,11 @@
 #!/usr/bin/env python
-import linux_uinput, ctypes, fcntl, os, sys
+import ctypes, fcntl, os, sys
 import select
 
-from cinput import *
-from mapper import KeyMapper, parse_conf, pretty_conf_print
+import uinputmapper
+import uinputmapper.linux_uinput
+from uinputmapper.cinput import *
+from uinputmapper.mapper import KeyMapper, parse_conf, pretty_conf_print
 
 try:
     import cPickle as pickle