diff --git a/.gitmodules b/.gitmodules
index 9e20115..af5f9df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "source/rc-switch"]
-	path = source/rc-switch
+[submodule "source/RCSwitch/rc-switch"]
+	path = source/RCSwitch/rc-switch
 	url = git@github.com:sui77/rc-switch.git
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 8a3b261..482771d 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,37 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
 
-find_package(Qt5Widgets)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-
-add_definitions(-DRPI)
-
-add_library(rc-switch 
-	rc-switch/RCSwitch.cpp
-	rc-switch/RCSwitch.h
-)
-
-add_executable(qSniff
-    qsniff.cpp
-    mainwindow.cpp
-    mainwindow.h
-    mainwindow.ui
-	sniffthread.cpp
-	sniffthread.h
-	sniffer.cpp
-	sniffer.h
-)
-
-target_link_libraries(qSniff rc-switch wiringPi Qt5::Widgets)
-
-add_executable(Sniff
-	sniff.cpp
-	sniffer.cpp
-	sniffer.h
-)
-
-target_link_libraries(Sniff rc-switch wiringPi)
+add_subdirectory(RCSwitch)
+add_subdirectory(sniffer)
+add_subdirectory(qsniff)
+add_subdirectory(sniff)
 
diff --git a/source/RCSwitch/CMakeLists.txt b/source/RCSwitch/CMakeLists.txt
new file mode 100644
index 0000000..09322a5
--- /dev/null
+++ b/source/RCSwitch/CMakeLists.txt
@@ -0,0 +1,21 @@
+project(rc-switch)
+cmake_minimum_required(VERSION 3.6)
+
+add_library(${PROJECT_NAME}
+	rc-switch/RCSwitch.cpp
+	rc-switch/RCSwitch.h
+)
+
+target_link_libraries(${PROJECT_NAME}
+	wiringPi
+)
+
+target_include_directories(${PROJECT_NAME}
+	PUBLIC rc-switch
+)
+
+target_compile_definitions(${PROJECT_NAME}
+	PUBLIC RPI
+)
+
+
diff --git a/source/rc-switch b/source/RCSwitch/rc-switch
similarity index 100%
rename from source/rc-switch
rename to source/RCSwitch/rc-switch
diff --git a/source/qsniff/CMakeLists.txt b/source/qsniff/CMakeLists.txt
new file mode 100644
index 0000000..dfeb3ab
--- /dev/null
+++ b/source/qsniff/CMakeLists.txt
@@ -0,0 +1,24 @@
+project(qSniff)
+cmake_minimum_required(VERSION 3.6)
+
+find_package(Qt5Widgets)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+
+add_executable(${PROJECT_NAME}
+    qsniff.cpp
+    mainwindow.cpp
+    mainwindow.h
+    mainwindow.ui
+	sniffthread.cpp
+	sniffthread.h
+)
+
+target_link_libraries(${PROJECT_NAME} 
+	sniffer 
+	Qt5::Widgets
+)
+
diff --git a/source/mainwindow.cpp b/source/qsniff/mainwindow.cpp
similarity index 100%
rename from source/mainwindow.cpp
rename to source/qsniff/mainwindow.cpp
diff --git a/source/mainwindow.h b/source/qsniff/mainwindow.h
similarity index 100%
rename from source/mainwindow.h
rename to source/qsniff/mainwindow.h
diff --git a/source/mainwindow.ui b/source/qsniff/mainwindow.ui
similarity index 100%
rename from source/mainwindow.ui
rename to source/qsniff/mainwindow.ui
diff --git a/source/qsniff.cpp b/source/qsniff/qsniff.cpp
similarity index 100%
rename from source/qsniff.cpp
rename to source/qsniff/qsniff.cpp
diff --git a/source/sniffthread.cpp b/source/qsniff/sniffthread.cpp
similarity index 100%
rename from source/sniffthread.cpp
rename to source/qsniff/sniffthread.cpp
diff --git a/source/sniffthread.h b/source/qsniff/sniffthread.h
similarity index 100%
rename from source/sniffthread.h
rename to source/qsniff/sniffthread.h
diff --git a/source/sniff/CMakeLists.txt b/source/sniff/CMakeLists.txt
new file mode 100644
index 0000000..f0f24f7
--- /dev/null
+++ b/source/sniff/CMakeLists.txt
@@ -0,0 +1,15 @@
+project(Sniff)
+cmake_minimum_required(VERSION 3.6)
+
+set(CMAKE_CXX_STANDARD 11)
+
+add_executable(${PROJECT_NAME}
+	sniff.cpp
+)
+
+target_link_libraries(${PROJECT_NAME} 
+	sniffer 
+	rc-switch 
+	wiringPi
+)
+
diff --git a/source/sniff.cpp b/source/sniff/sniff.cpp
similarity index 100%
rename from source/sniff.cpp
rename to source/sniff/sniff.cpp
diff --git a/source/sniffer/CMakeLists.txt b/source/sniffer/CMakeLists.txt
new file mode 100644
index 0000000..6324262
--- /dev/null
+++ b/source/sniffer/CMakeLists.txt
@@ -0,0 +1,18 @@
+project(sniffer)
+cmake_minimum_required(VERSION 3.6)
+
+set(CMAKE_CXX_STANDARD 11)
+
+add_library(${PROJECT_NAME}
+	sniffer.cpp
+	sniffer.h
+)
+
+target_link_libraries(${PROJECT_NAME}
+	rc-switch
+)
+
+target_include_directories(${PROJECT_NAME}
+	PUBLIC .
+)
+
diff --git a/source/sniffer.cpp b/source/sniffer/sniffer.cpp
similarity index 100%
rename from source/sniffer.cpp
rename to source/sniffer/sniffer.cpp
diff --git a/source/sniffer.h b/source/sniffer/sniffer.h
similarity index 82%
rename from source/sniffer.h
rename to source/sniffer/sniffer.h
index 8b2747a..16e9dc0 100644
--- a/source/sniffer.h
+++ b/source/sniffer/sniffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rc-switch/RCSwitch.h"
+#include "RCSwitch.h"
 
 class Sniffer
 {