diff --git a/code/src/button.ino b/code/espurna/button.ino
similarity index 100%
rename from code/src/button.ino
rename to code/espurna/button.ino
diff --git a/code/src/config/all.h b/code/espurna/config/all.h
similarity index 100%
rename from code/src/config/all.h
rename to code/espurna/config/all.h
diff --git a/code/src/config/debug.h b/code/espurna/config/debug.h
similarity index 100%
rename from code/src/config/debug.h
rename to code/espurna/config/debug.h
diff --git a/code/src/config/general.h b/code/espurna/config/general.h
similarity index 100%
rename from code/src/config/general.h
rename to code/espurna/config/general.h
diff --git a/code/src/config/hardware.h b/code/espurna/config/hardware.h
similarity index 100%
rename from code/src/config/hardware.h
rename to code/espurna/config/hardware.h
diff --git a/code/src/config/sensors.h b/code/espurna/config/sensors.h
similarity index 100%
rename from code/src/config/sensors.h
rename to code/espurna/config/sensors.h
diff --git a/code/src/config/version.h b/code/espurna/config/version.h
similarity index 100%
rename from code/src/config/version.h
rename to code/espurna/config/version.h
diff --git a/code/src/dht.ino b/code/espurna/dht.ino
similarity index 100%
rename from code/src/dht.ino
rename to code/espurna/dht.ino
diff --git a/code/src/ds18b20.ino b/code/espurna/ds18b20.ino
similarity index 100%
rename from code/src/ds18b20.ino
rename to code/espurna/ds18b20.ino
diff --git a/code/src/emon.ino b/code/espurna/emon.ino
similarity index 100%
rename from code/src/emon.ino
rename to code/espurna/emon.ino
diff --git a/code/src/main.ino b/code/espurna/espurna.ino
similarity index 100%
rename from code/src/main.ino
rename to code/espurna/espurna.ino
diff --git a/code/src/fauxmo.ino b/code/espurna/fauxmo.ino
similarity index 100%
rename from code/src/fauxmo.ino
rename to code/espurna/fauxmo.ino
diff --git a/code/src/led.ino b/code/espurna/led.ino
similarity index 100%
rename from code/src/led.ino
rename to code/espurna/led.ino
diff --git a/code/src/mqtt.ino b/code/espurna/mqtt.ino
similarity index 100%
rename from code/src/mqtt.ino
rename to code/espurna/mqtt.ino
diff --git a/code/src/nofuss.ino b/code/espurna/nofuss.ino
similarity index 100%
rename from code/src/nofuss.ino
rename to code/espurna/nofuss.ino
diff --git a/code/src/ntp.ino b/code/espurna/ntp.ino
similarity index 100%
rename from code/src/ntp.ino
rename to code/espurna/ntp.ino
diff --git a/code/src/ota.ino b/code/espurna/ota.ino
similarity index 100%
rename from code/src/ota.ino
rename to code/espurna/ota.ino
diff --git a/code/src/pow.ino b/code/espurna/pow.ino
similarity index 100%
rename from code/src/pow.ino
rename to code/espurna/pow.ino
diff --git a/code/src/relay.ino b/code/espurna/relay.ino
similarity index 100%
rename from code/src/relay.ino
rename to code/espurna/relay.ino
diff --git a/code/src/rf.ino b/code/espurna/rf.ino
similarity index 100%
rename from code/src/rf.ino
rename to code/espurna/rf.ino
diff --git a/code/src/settings.ino b/code/espurna/settings.ino
similarity index 100%
rename from code/src/settings.ino
rename to code/espurna/settings.ino
diff --git a/code/src/web.ino b/code/espurna/web.ino
similarity index 100%
rename from code/src/web.ino
rename to code/espurna/web.ino
diff --git a/code/src/wifi.ino b/code/espurna/wifi.ino
similarity index 100%
rename from code/src/wifi.ino
rename to code/espurna/wifi.ino
diff --git a/code/platformio.custom.ini b/code/platformio.custom.ini
index d5e637fe..2b7d8996 100644
--- a/code/platformio.custom.ini
+++ b/code/platformio.custom.ini
@@ -8,6 +8,7 @@
 
 [platformio]
 env_default = node-debug
+src_dir = espurna
 
 [common]
 platform = espressif8266_stage
diff --git a/code/platformio.ini b/code/platformio.ini
index 27a8e3b0..7bde2bd5 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -1,5 +1,6 @@
 [platformio]
 env_default = node-debug
+src_dir = espurna
 
 [common]
 lib_deps =