diff --git a/README.md b/README.md
index c81f84c..b3be510 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ sh examples/install.sh py3gattlib # For Python 3.x
 4. `sudo python3 setup.py install` (Installs **gattlib.cpython-34m.so** and support files to **/usr/local/lib/python3.4/dist-packages/gattlib*.egg**)
 
 ### 3. Install Nuimo Python SDK
-1. `cp nuimo/nuimo.py <your project directory> # The Nuimo SDK is a single file`
+1. `cp nuimo.py <your project directory> # The Nuimo SDK is a single file`
 
 ## Usage
 The **Nuimo** SDK is a single Python source file.  It has been tested with Python 2.7 and Python 3.4.
@@ -81,7 +81,7 @@ The **Nuimo** SDK is a single Python source file.  It has been tested with Pytho
 #### Testing
 To test, run the following command (note that it must be run as root because on Linux, Bluetooth discovery is a restricted operation).
 ```
-sudo PYTHONPATH=./nuimo python examples/test.py
+sudo PYTHONPATH=. python examples/test.py
 ```
 #### Usage
 ```python
diff --git a/examples/install.sh b/examples/install.sh
index 22b85ec..f6cfc76 100755
--- a/examples/install.sh
+++ b/examples/install.sh
@@ -61,15 +61,15 @@ case "$cmd" in
 	echo "Installing Nuimo SDK"
 	set -x
 	[ ! -d nuimo-linux-python ] && git clone https://github.com/getsenic/nuimo-linux-python
-	echo "Copy $(pwd)/nuimo-linux-python/nuimo/nuimo.py to your project directory"
+	echo "Copy $(pwd)/nuimo-linux-python/nuimo.py to your project directory"
 	;;
 
     test)
 	echo "Testing Nuimo SDK"
 	sdk="nuimo-linux-python"
 	set -x
-	[ -f $sdk/examples/test.py ] && { sudo PYTHONPATH=$sdk/nuimo python $sdk/examples/test.py; exit 0; }
-	[ -f examples/test.py ] && { sudo PYTHONPATH=./nuimo python examples/test.py; exit 0; }
+	[ -f $sdk/examples/test.py ] && { sudo PYTHONPATH=$sdk python $sdk/examples/test.py; exit 0; }
+	[ -f examples/test.py ] && { sudo PYTHONPATH=. python examples/test.py; exit 0; }
         set +x
 	echo "Please install the Nuimo SDK: sh $0 nuimosdk "
 	;;
diff --git a/nuimo/nuimo.py b/nuimo.py
similarity index 100%
rename from nuimo/nuimo.py
rename to nuimo.py
diff --git a/nuimo/.gitignore b/nuimo/.gitignore
deleted file mode 100644
index 579833e..0000000
--- a/nuimo/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build/
-
-dist/
-
-*.egg-info/
diff --git a/nuimo/setup.py b/setup.py
similarity index 100%
rename from nuimo/setup.py
rename to setup.py