diff --git a/.gitignore b/.gitignore
index f19c848..6d15ebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ __pycache__/
 dependencies/
 *.log
 *.wav
+*.raw
diff --git a/stream.sdp b/data/stream.sdp
similarity index 100%
rename from stream.sdp
rename to data/stream.sdp
diff --git a/example.py b/example.py
deleted file mode 100755
index ae44655..0000000
--- a/example.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /usr/bin/env python3
-
-#
-#   Example script for interfacing with SDRPlay radio.
-#
-# Modified from: https://github.com/pothosware/SoapySDR/wiki/PythonSupport
-#
-
-import SoapySDR
-from SoapySDR import * #SOAPY_SDR_ constants
-import numpy #use numpy for buffers
-import sys
-import struct
-
-#enumerate devices
-devices = [dict(device) for device in SoapySDR.Device.enumerate()]
-
-if len(devices) == 0:
-    print('No SDR devices available.')
-    sys.exit(1)
-
-#create device instance
-sdr = SoapySDR.Device(devices[0])
-
-#apply settings
-sdr.setSampleRate(SOAPY_SDR_RX, 0, 1e6)
-sdr.setFrequency(SOAPY_SDR_RX, 0, 912.3e6)
-
-#setup a stream (complex floats)
-rxStream = sdr.setupStream(SOAPY_SDR_RX, SOAPY_SDR_CF32)
-sdr.activateStream(rxStream) #start streaming
-
-#create a re-usable buffer for rx samples
-samples = 1000
-buff = numpy.array([0]*samples*2, numpy.float32)
-
-#receive some samples
-for i in range(10):
-    sr = sdr.readStream(rxStream, [buff], samples)
-
-    sys.stdout.buffer.write(struct.pack('=%df' % len(buff), *buff))
-
-#shutdown the stream
-sdr.deactivateStream(rxStream) #stop streaming
-sdr.closeStream(rxStream)
\ No newline at end of file
diff --git a/Makefile b/examples/Makefile
similarity index 100%
rename from Makefile
rename to examples/Makefile
diff --git a/example.cpp b/examples/example.cpp
similarity index 100%
rename from example.cpp
rename to examples/example.cpp
diff --git a/examples/example.py b/examples/example.py
new file mode 100755
index 0000000..5226fe0
--- /dev/null
+++ b/examples/example.py
@@ -0,0 +1,52 @@
+#! /usr/bin/env python3
+
+#
+#   Example script for interfacing with SDRPlay radio.
+#
+# Modified from: https://github.com/pothosware/SoapySDR/wiki/PythonSupport
+#
+
+import SoapySDR
+from SoapySDR import *  # SOAPY_SDR_ constants
+import numpy as np
+import sys
+import struct
+
+# enumerate devices
+devices = [dict(device) for device in SoapySDR.Device.enumerate()]
+
+for device in devices:
+    print(device)
+
+if len(devices) == 0:
+    print("No SDR devices available.")
+    sys.exit(1)
+
+# create device instance
+sdr = SoapySDR.Device(devices[0])
+
+# apply settings
+sdr.setSampleRate(SOAPY_SDR_RX, 0, 1e6)
+sdr.setFrequency(SOAPY_SDR_RX, 0, 912.3e6)
+
+# setup a stream (complex floats)
+rxStream = sdr.setupStream(SOAPY_SDR_RX, SOAPY_SDR_CF32)
+sdr.activateStream(rxStream)  # start streaming
+
+# create a re-usable buffer for rx samples
+samples = 1000
+buff = np.array([0] * samples * 2, np.float32)
+
+# receive some samples
+for i in range(10):
+    sr = sdr.readStream(rxStream, [buff], samples)
+
+    print(
+        f"Samples: {sr.ret}, flags: {sr.flags}, timestamp {sr.timeNs}", file=sys.stderr
+    )
+
+    sys.stdout.buffer.write(struct.pack("=%df" % len(buff), *buff))
+
+# shutdown the stream
+sdr.deactivateStream(rxStream)  # stop streaming
+sdr.closeStream(rxStream)
diff --git a/nooelec_buffer.iq b/nooelec_buffer.iq
deleted file mode 100644
index ea88684..0000000
Binary files a/nooelec_buffer.iq and /dev/null differ
diff --git a/out.wav b/out.wav
deleted file mode 100644
index 701fccf..0000000
Binary files a/out.wav and /dev/null differ
diff --git a/sdrplay_int16.iq b/sdrplay_int16.iq
deleted file mode 100644
index 9d9425a..0000000
Binary files a/sdrplay_int16.iq and /dev/null differ