diff --git a/.gitignore b/firmware/.gitignore
similarity index 100%
rename from .gitignore
rename to firmware/.gitignore
diff --git a/CMakeLists.txt b/firmware/CMakeLists.txt
similarity index 85%
rename from CMakeLists.txt
rename to firmware/CMakeLists.txt
index db39035..142d82d 100644
--- a/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
@@ -5,3 +5,5 @@ cmake_minimum_required(VERSION 3.5)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(airmon)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
diff --git a/components/esp32-ds18b20/.travis.yml b/firmware/components/esp32-ds18b20/.travis.yml
similarity index 100%
rename from components/esp32-ds18b20/.travis.yml
rename to firmware/components/esp32-ds18b20/.travis.yml
diff --git a/components/esp32-ds18b20/CMakeLists.txt b/firmware/components/esp32-ds18b20/CMakeLists.txt
similarity index 100%
rename from components/esp32-ds18b20/CMakeLists.txt
rename to firmware/components/esp32-ds18b20/CMakeLists.txt
diff --git a/components/esp32-ds18b20/LICENSE b/firmware/components/esp32-ds18b20/LICENSE
similarity index 100%
rename from components/esp32-ds18b20/LICENSE
rename to firmware/components/esp32-ds18b20/LICENSE
diff --git a/components/esp32-ds18b20/README.md b/firmware/components/esp32-ds18b20/README.md
similarity index 100%
rename from components/esp32-ds18b20/README.md
rename to firmware/components/esp32-ds18b20/README.md
diff --git a/components/esp32-ds18b20/component.mk b/firmware/components/esp32-ds18b20/component.mk
similarity index 100%
rename from components/esp32-ds18b20/component.mk
rename to firmware/components/esp32-ds18b20/component.mk
diff --git a/components/esp32-ds18b20/doc/.gitignore b/firmware/components/esp32-ds18b20/doc/.gitignore
similarity index 100%
rename from components/esp32-ds18b20/doc/.gitignore
rename to firmware/components/esp32-ds18b20/doc/.gitignore
diff --git a/components/esp32-ds18b20/doc/Doxyfile b/firmware/components/esp32-ds18b20/doc/Doxyfile
similarity index 100%
rename from components/esp32-ds18b20/doc/Doxyfile
rename to firmware/components/esp32-ds18b20/doc/Doxyfile
diff --git a/components/esp32-ds18b20/ds18b20.c b/firmware/components/esp32-ds18b20/ds18b20.c
similarity index 100%
rename from components/esp32-ds18b20/ds18b20.c
rename to firmware/components/esp32-ds18b20/ds18b20.c
diff --git a/components/esp32-ds18b20/include/ds18b20.h b/firmware/components/esp32-ds18b20/include/ds18b20.h
similarity index 100%
rename from components/esp32-ds18b20/include/ds18b20.h
rename to firmware/components/esp32-ds18b20/include/ds18b20.h
diff --git a/components/esp32-owb/.travis.yml b/firmware/components/esp32-owb/.travis.yml
similarity index 100%
rename from components/esp32-owb/.travis.yml
rename to firmware/components/esp32-owb/.travis.yml
diff --git a/components/esp32-owb/CMakeLists.txt b/firmware/components/esp32-owb/CMakeLists.txt
similarity index 100%
rename from components/esp32-owb/CMakeLists.txt
rename to firmware/components/esp32-owb/CMakeLists.txt
diff --git a/components/esp32-owb/LICENSE b/firmware/components/esp32-owb/LICENSE
similarity index 100%
rename from components/esp32-owb/LICENSE
rename to firmware/components/esp32-owb/LICENSE
diff --git a/components/esp32-owb/README.md b/firmware/components/esp32-owb/README.md
similarity index 100%
rename from components/esp32-owb/README.md
rename to firmware/components/esp32-owb/README.md
diff --git a/components/esp32-owb/component.mk b/firmware/components/esp32-owb/component.mk
similarity index 100%
rename from components/esp32-owb/component.mk
rename to firmware/components/esp32-owb/component.mk
diff --git a/components/esp32-owb/doc/.gitignore b/firmware/components/esp32-owb/doc/.gitignore
similarity index 100%
rename from components/esp32-owb/doc/.gitignore
rename to firmware/components/esp32-owb/doc/.gitignore
diff --git a/components/esp32-owb/doc/Doxyfile b/firmware/components/esp32-owb/doc/Doxyfile
similarity index 100%
rename from components/esp32-owb/doc/Doxyfile
rename to firmware/components/esp32-owb/doc/Doxyfile
diff --git a/components/esp32-owb/include/owb.h b/firmware/components/esp32-owb/include/owb.h
similarity index 100%
rename from components/esp32-owb/include/owb.h
rename to firmware/components/esp32-owb/include/owb.h
diff --git a/components/esp32-owb/include/owb_gpio.h b/firmware/components/esp32-owb/include/owb_gpio.h
similarity index 100%
rename from components/esp32-owb/include/owb_gpio.h
rename to firmware/components/esp32-owb/include/owb_gpio.h
diff --git a/components/esp32-owb/include/owb_rmt.h b/firmware/components/esp32-owb/include/owb_rmt.h
similarity index 100%
rename from components/esp32-owb/include/owb_rmt.h
rename to firmware/components/esp32-owb/include/owb_rmt.h
diff --git a/components/esp32-owb/library.json b/firmware/components/esp32-owb/library.json
similarity index 100%
rename from components/esp32-owb/library.json
rename to firmware/components/esp32-owb/library.json
diff --git a/components/esp32-owb/owb.c b/firmware/components/esp32-owb/owb.c
similarity index 100%
rename from components/esp32-owb/owb.c
rename to firmware/components/esp32-owb/owb.c
diff --git a/components/esp32-owb/owb_gpio.c b/firmware/components/esp32-owb/owb_gpio.c
similarity index 100%
rename from components/esp32-owb/owb_gpio.c
rename to firmware/components/esp32-owb/owb_gpio.c
diff --git a/components/esp32-owb/owb_rmt.c b/firmware/components/esp32-owb/owb_rmt.c
similarity index 100%
rename from components/esp32-owb/owb_rmt.c
rename to firmware/components/esp32-owb/owb_rmt.c
diff --git a/main/CMakeLists.txt b/firmware/main/CMakeLists.txt
similarity index 100%
rename from main/CMakeLists.txt
rename to firmware/main/CMakeLists.txt
diff --git a/main/Kconfig.projbuild b/firmware/main/Kconfig.projbuild
similarity index 100%
rename from main/Kconfig.projbuild
rename to firmware/main/Kconfig.projbuild
diff --git a/main/app_main.c b/firmware/main/app_main.c
similarity index 100%
rename from main/app_main.c
rename to firmware/main/app_main.c
diff --git a/main/component.mk b/firmware/main/component.mk
similarity index 100%
rename from main/component.mk
rename to firmware/main/component.mk
diff --git a/sdkconfig.defaults b/firmware/sdkconfig.defaults
similarity index 100%
rename from sdkconfig.defaults
rename to firmware/sdkconfig.defaults