diff --git a/examples/simple.py b/examples/api/simple.py
similarity index 78%
rename from examples/simple.py
rename to examples/api/simple.py
index 5eb023a..1274a86 100644
--- a/examples/simple.py
+++ b/examples/api/simple.py
@@ -6,8 +6,13 @@
 from Adafruit_IO import Client
 
 # Set to your Adafruit IO key.
-ADAFRUIT_IO_USERNAME = 'YOUR ADAFRUIT IO USERNAME'
-ADAFRUIT_IO_KEY = 'YOUR ADAFRUIT IO KEY'
+# Remember, your key is a secret,
+# so make sure not to publish it when you publish this code!
+ADAFRUIT_IO_KEY = 'YOUR_AIO_KEY'
+
+# Set to your Adafruit IO username.
+# (go to https://accounts.adafruit.com to find your username)
+ADAFRUIT_IO_USERNAME = 'YOUR_AIO_USERNAME'
 
 # Create an instance of the REST client.
 aio = Client(ADAFRUIT_IO_USERNAME, ADAFRUIT_IO_KEY)
diff --git a/examples/aio_basics/adafruitio_06_digital_in.py b/examples/basics/digital_in.py
similarity index 100%
rename from examples/aio_basics/adafruitio_06_digital_in.py
rename to examples/basics/digital_in.py
diff --git a/examples/aio_basics/adafruitio_07_digital_out.py b/examples/basics/digital_out.py
similarity index 100%
rename from examples/aio_basics/adafruitio_07_digital_out.py
rename to examples/basics/digital_out.py
diff --git a/examples/aio_basics/adafruitio_04_location.py b/examples/basics/location.py
similarity index 100%
rename from examples/aio_basics/adafruitio_04_location.py
rename to examples/basics/location.py
diff --git a/examples/aio_basics/adafruitio_00_publish.py b/examples/basics/publish.py
similarity index 100%
rename from examples/aio_basics/adafruitio_00_publish.py
rename to examples/basics/publish.py
diff --git a/examples/aio_basics/adafruitio_01_subscribe.py b/examples/basics/subscribe.py
similarity index 100%
rename from examples/aio_basics/adafruitio_01_subscribe.py
rename to examples/basics/subscribe.py
diff --git a/examples/aio_basics/adafruitio_05_type_conversion.py b/examples/basics/type_conversion.py
similarity index 100%
rename from examples/aio_basics/adafruitio_05_type_conversion.py
rename to examples/basics/type_conversion.py