diff --git a/lib/readme.txt b/firmware/lib/readme.txt
similarity index 100%
rename from lib/readme.txt
rename to firmware/lib/readme.txt
diff --git a/platformio.ini b/firmware/platformio.ini
similarity index 100%
rename from platformio.ini
rename to firmware/platformio.ini
diff --git a/src/src.ino b/firmware/src/src.ino
similarity index 100%
rename from src/src.ino
rename to firmware/src/src.ino
diff --git a/test/test_main.cpp b/firmware/test/test_main.cpp
similarity index 100%
rename from test/test_main.cpp
rename to firmware/test/test_main.cpp
diff --git a/si7021_eval/readme.md b/sensor/readme.md
similarity index 100%
rename from si7021_eval/readme.md
rename to sensor/readme.md
diff --git a/si7021_eval/si7021/.gitignore b/sensor/si7021/.gitignore
similarity index 100%
rename from si7021_eval/si7021/.gitignore
rename to sensor/si7021/.gitignore
diff --git a/si7021_eval/si7021/.travis.yml b/sensor/si7021/.travis.yml
similarity index 100%
rename from si7021_eval/si7021/.travis.yml
rename to sensor/si7021/.travis.yml
diff --git a/si7021_eval/si7021/lib/readme.txt b/sensor/si7021/lib/readme.txt
similarity index 100%
rename from si7021_eval/si7021/lib/readme.txt
rename to sensor/si7021/lib/readme.txt
diff --git a/si7021_eval/si7021/platformio.ini b/sensor/si7021/platformio.ini
similarity index 100%
rename from si7021_eval/si7021/platformio.ini
rename to sensor/si7021/platformio.ini
diff --git a/si7021_eval/si7021/src/src.ino b/sensor/si7021/src/src.ino
similarity index 100%
rename from si7021_eval/si7021/src/src.ino
rename to sensor/si7021/src/src.ino