diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8abf717..244bbfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,19 +84,19 @@ endif (DEFINED WIN32)
 
 SET (cubicsdr_sources
     src/CubicSDR.cpp
-	src/SDRThread.cpp
-	src/PrimaryGLContext.cpp
 	src/AppFrame.cpp
-	src/SDRThreadQueue.cpp
-	src/SDRThreadTask.cpp
-	src/DemodulatorThread.cpp
-	src/DemodulatorThreadQueue.cpp
-	src/DemodulatorThreadTask.cpp
-	src/AudioThread.cpp
-	src/AudioThreadQueue.cpp
-	src/AudioThreadTask.cpp
-	src/Gradient.cpp
-	src/Timer.cpp
+	src/sdr/SDRThread.cpp
+	src/sdr/SDRThreadQueue.cpp
+	src/sdr/SDRThreadTask.cpp
+	src/demod/DemodulatorThread.cpp
+	src/demod/DemodulatorThreadQueue.cpp
+	src/demod/DemodulatorThreadTask.cpp
+	src/audio/AudioThread.cpp
+	src/audio/AudioThreadQueue.cpp
+	src/audio/AudioThreadTask.cpp
+	src/util/Gradient.cpp
+	src/util/Timer.cpp
+	src/visual/PrimaryGLContext.cpp
 	src/visual/ScopeCanvas.cpp
 	src/visual/ScopeContext.cpp
 	src/visual/SpectrumCanvas.cpp
@@ -106,21 +106,21 @@ SET (cubicsdr_sources
 )
 
 SET (cubicsdr_headers
-    src/CubicSDR.h
-	src/SDRThread.h
-	src/PrimaryGLContext.h
-	src/AppFrame.h
 	src/CubicSDRDefs.h
-	src/SDRThreadQueue.h
-	src/SDRThreadTask.h
-	src/DemodulatorThread.h
-	src/DemodulatorThreadQueue.h
-	src/DemodulatorThreadTask.h
-	src/AudioThread.h
-	src/AudioThreadQueue.h
-	src/AudioThreadTask.h
-	src/Gradient.h
-	src/Timer.h
+    src/CubicSDR.h
+	src/AppFrame.h
+	src/sdr/SDRThread.h
+	src/sdr/SDRThreadQueue.h
+	src/sdr/SDRThreadTask.h
+	src/demod/DemodulatorThread.h
+	src/demod/DemodulatorThreadQueue.h
+	src/demod/DemodulatorThreadTask.h
+	src/audio/AudioThread.h
+	src/audio/AudioThreadQueue.h
+	src/audio/AudioThreadTask.h
+	src/util/Gradient.h
+	src/util/Timer.h
+	src/visual/PrimaryGLContext.h
 	src/visual/ScopeCanvas.h
 	src/visual/ScopeContext.h
 	src/visual/SpectrumCanvas.h
@@ -129,7 +129,11 @@ SET (cubicsdr_headers
 	src/visual/WaterfallContext.h
 )
 
-include_directories ( ${PROJECT_SOURCE_DIR}/src/visual 
+include_directories ( ${PROJECT_SOURCE_DIR}/src/sdr 
+					  ${PROJECT_SOURCE_DIR}/src/demod
+					  ${PROJECT_SOURCE_DIR}/src/audio
+					  ${PROJECT_SOURCE_DIR}/src/util
+					  ${PROJECT_SOURCE_DIR}/src/visual 
 					  ${PROJECT_SOURCE_DIR}/src )
 
 #configure_files(${PROJECT_SOURCE_DIR}/shaders ${PROJECT_BINARY_DIR}/shaders COPYONLY)
diff --git a/src/AudioThread.cpp b/src/audio/AudioThread.cpp
similarity index 100%
rename from src/AudioThread.cpp
rename to src/audio/AudioThread.cpp
diff --git a/src/AudioThread.h b/src/audio/AudioThread.h
similarity index 100%
rename from src/AudioThread.h
rename to src/audio/AudioThread.h
diff --git a/src/AudioThreadQueue.cpp b/src/audio/AudioThreadQueue.cpp
similarity index 100%
rename from src/AudioThreadQueue.cpp
rename to src/audio/AudioThreadQueue.cpp
diff --git a/src/AudioThreadQueue.h b/src/audio/AudioThreadQueue.h
similarity index 100%
rename from src/AudioThreadQueue.h
rename to src/audio/AudioThreadQueue.h
diff --git a/src/AudioThreadTask.cpp b/src/audio/AudioThreadTask.cpp
similarity index 100%
rename from src/AudioThreadTask.cpp
rename to src/audio/AudioThreadTask.cpp
diff --git a/src/AudioThreadTask.h b/src/audio/AudioThreadTask.h
similarity index 100%
rename from src/AudioThreadTask.h
rename to src/audio/AudioThreadTask.h
diff --git a/src/DemodulatorThread.cpp b/src/demod/DemodulatorThread.cpp
similarity index 100%
rename from src/DemodulatorThread.cpp
rename to src/demod/DemodulatorThread.cpp
diff --git a/src/DemodulatorThread.h b/src/demod/DemodulatorThread.h
similarity index 100%
rename from src/DemodulatorThread.h
rename to src/demod/DemodulatorThread.h
diff --git a/src/DemodulatorThreadQueue.cpp b/src/demod/DemodulatorThreadQueue.cpp
similarity index 100%
rename from src/DemodulatorThreadQueue.cpp
rename to src/demod/DemodulatorThreadQueue.cpp
diff --git a/src/DemodulatorThreadQueue.h b/src/demod/DemodulatorThreadQueue.h
similarity index 100%
rename from src/DemodulatorThreadQueue.h
rename to src/demod/DemodulatorThreadQueue.h
diff --git a/src/DemodulatorThreadTask.cpp b/src/demod/DemodulatorThreadTask.cpp
similarity index 100%
rename from src/DemodulatorThreadTask.cpp
rename to src/demod/DemodulatorThreadTask.cpp
diff --git a/src/DemodulatorThreadTask.h b/src/demod/DemodulatorThreadTask.h
similarity index 100%
rename from src/DemodulatorThreadTask.h
rename to src/demod/DemodulatorThreadTask.h
diff --git a/src/SDRThread.cpp b/src/sdr/SDRThread.cpp
similarity index 100%
rename from src/SDRThread.cpp
rename to src/sdr/SDRThread.cpp
diff --git a/src/SDRThread.h b/src/sdr/SDRThread.h
similarity index 100%
rename from src/SDRThread.h
rename to src/sdr/SDRThread.h
diff --git a/src/SDRThreadQueue.cpp b/src/sdr/SDRThreadQueue.cpp
similarity index 100%
rename from src/SDRThreadQueue.cpp
rename to src/sdr/SDRThreadQueue.cpp
diff --git a/src/SDRThreadQueue.h b/src/sdr/SDRThreadQueue.h
similarity index 100%
rename from src/SDRThreadQueue.h
rename to src/sdr/SDRThreadQueue.h
diff --git a/src/SDRThreadTask.cpp b/src/sdr/SDRThreadTask.cpp
similarity index 100%
rename from src/SDRThreadTask.cpp
rename to src/sdr/SDRThreadTask.cpp
diff --git a/src/SDRThreadTask.h b/src/sdr/SDRThreadTask.h
similarity index 100%
rename from src/SDRThreadTask.h
rename to src/sdr/SDRThreadTask.h
diff --git a/src/Gradient.cpp b/src/util/Gradient.cpp
similarity index 100%
rename from src/Gradient.cpp
rename to src/util/Gradient.cpp
diff --git a/src/Gradient.h b/src/util/Gradient.h
similarity index 100%
rename from src/Gradient.h
rename to src/util/Gradient.h
diff --git a/src/Timer.cpp b/src/util/Timer.cpp
similarity index 100%
rename from src/Timer.cpp
rename to src/util/Timer.cpp
diff --git a/src/Timer.h b/src/util/Timer.h
similarity index 100%
rename from src/Timer.h
rename to src/util/Timer.h
diff --git a/src/PrimaryGLContext.cpp b/src/visual/PrimaryGLContext.cpp
similarity index 100%
rename from src/PrimaryGLContext.cpp
rename to src/visual/PrimaryGLContext.cpp
diff --git a/src/PrimaryGLContext.h b/src/visual/PrimaryGLContext.h
similarity index 100%
rename from src/PrimaryGLContext.h
rename to src/visual/PrimaryGLContext.h