diff --git a/.gitmodules b/.gitmodules
index af5f9df..9e20115 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "source/RCSwitch/rc-switch"]
-	path = source/RCSwitch/rc-switch
+[submodule "source/rc-switch"]
+	path = source/rc-switch
 	url = git@github.com:sui77/rc-switch.git
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 266508b..8a3b261 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,9 +1,37 @@
 cmake_minimum_required(VERSION 3.6)
 
-add_subdirectory(RCSwitch)
-add_subdirectory(sniffer)
-add_subdirectory(qsniff)
-add_subdirectory(sniff)
-add_subdirectory(sender)
-add_subdirectory(send)
+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)
 
diff --git a/source/RCSwitch/CMakeLists.txt b/source/RCSwitch/CMakeLists.txt
deleted file mode 100644
index 09322a5..0000000
--- a/source/RCSwitch/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-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/qsniff/mainwindow.cpp b/source/mainwindow.cpp
similarity index 100%
rename from source/qsniff/mainwindow.cpp
rename to source/mainwindow.cpp
diff --git a/source/qsniff/mainwindow.h b/source/mainwindow.h
similarity index 100%
rename from source/qsniff/mainwindow.h
rename to source/mainwindow.h
diff --git a/source/qsniff/mainwindow.ui b/source/mainwindow.ui
similarity index 100%
rename from source/qsniff/mainwindow.ui
rename to source/mainwindow.ui
diff --git a/source/qsniff/qsniff.cpp b/source/qsniff.cpp
similarity index 100%
rename from source/qsniff/qsniff.cpp
rename to source/qsniff.cpp
diff --git a/source/qsniff/CMakeLists.txt b/source/qsniff/CMakeLists.txt
deleted file mode 100644
index dfeb3ab..0000000
--- a/source/qsniff/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-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/RCSwitch/rc-switch b/source/rc-switch
similarity index 100%
rename from source/RCSwitch/rc-switch
rename to source/rc-switch
diff --git a/source/send/CMakeLists.txt b/source/send/CMakeLists.txt
deleted file mode 100644
index b512c24..0000000
--- a/source/send/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-project(Send)
-cmake_minimum_required(VERSION 3.6)
-
-set(CMAKE_CXX_STANDARD 11)
-
-add_executable(${PROJECT_NAME}
-	send.cpp
-)
-
-target_link_libraries(${PROJECT_NAME} 
-	sender
-)
-
diff --git a/source/send/send.cpp b/source/send/send.cpp
deleted file mode 100644
index 842dde6..0000000
--- a/source/send/send.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "sender.h"
-#include <iostream>
-
-int main(int argc, char **argv)
-{
-	std::cout << "Send" << std::endl;
-
-	Sender sender(27);
-
-	unsigned int data = 1;
-
-
-	while (true)
-	{
-
-		std::cout << "Sending: " << data << std::endl;
-
-		sender.send(data++);
-
-		delay(1000);
-	}
-    
-	return 0;
-}
diff --git a/source/sender/CMakeLists.txt b/source/sender/CMakeLists.txt
deleted file mode 100644
index ea2a65c..0000000
--- a/source/sender/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-project(sender)
-cmake_minimum_required(VERSION 3.6)
-
-set(CMAKE_CXX_STANDARD 11)
-
-add_library(${PROJECT_NAME}
-	sender.cpp
-	sender.h
-)
-
-target_link_libraries(${PROJECT_NAME}
-	rc-switch
-)
-
-target_include_directories(${PROJECT_NAME}
-	PUBLIC .
-)
-
diff --git a/source/sender/sender.cpp b/source/sender/sender.cpp
deleted file mode 100644
index b4b3a54..0000000
--- a/source/sender/sender.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "sender.h"
-
-Sender::Sender(unsigned int pin)
-{
-	wiringPiSetup();
-	
-	m_switch.enableTransmit(pin);
-}
-
-void Sender::send(unsigned int data)
-{
-	m_switch.send(data, 32);
-}
-
diff --git a/source/sender/sender.h b/source/sender/sender.h
deleted file mode 100644
index eaab164..0000000
--- a/source/sender/sender.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "RCSwitch.h"
-
-class Sender
-{
-	private:
-		RCSwitch m_switch;
-
-	public:
-		Sender() = delete;
-		Sender(unsigned int pin);
-
-		void send(unsigned int data);
-};
diff --git a/source/sniff/sniff.cpp b/source/sniff.cpp
similarity index 100%
rename from source/sniff/sniff.cpp
rename to source/sniff.cpp
diff --git a/source/sniff/CMakeLists.txt b/source/sniff/CMakeLists.txt
deleted file mode 100644
index 31e9fa4..0000000
--- a/source/sniff/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 
-)
-
diff --git a/source/sniffer/sniffer.cpp b/source/sniffer.cpp
similarity index 100%
rename from source/sniffer/sniffer.cpp
rename to source/sniffer.cpp
diff --git a/source/sniffer/sniffer.h b/source/sniffer.h
similarity index 82%
rename from source/sniffer/sniffer.h
rename to source/sniffer.h
index 16e9dc0..8b2747a 100644
--- a/source/sniffer/sniffer.h
+++ b/source/sniffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RCSwitch.h"
+#include "rc-switch/RCSwitch.h"
 
 class Sniffer
 {
diff --git a/source/sniffer/CMakeLists.txt b/source/sniffer/CMakeLists.txt
deleted file mode 100644
index 6324262..0000000
--- a/source/sniffer/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-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/qsniff/sniffthread.cpp b/source/sniffthread.cpp
similarity index 100%
rename from source/qsniff/sniffthread.cpp
rename to source/sniffthread.cpp
diff --git a/source/qsniff/sniffthread.h b/source/sniffthread.h
similarity index 100%
rename from source/qsniff/sniffthread.h
rename to source/sniffthread.h