diff --git a/src/hasp_oobe.cpp b/src/hasp_oobe.cpp
index 0b14ecb9..e1424ff1 100644
--- a/src/hasp_oobe.cpp
+++ b/src/hasp_oobe.cpp
@@ -13,7 +13,7 @@
     #include "hasp_gui.h"
     #include "hasp_config.h"
 
-    #include "net/hasp_wifi.h"
+    #include "sys/net/hasp_wifi.h"
     #include "hasp/hasp_dispatch.h"
     #include "hasp/hasp_object.h"
 
diff --git a/src/hasp_debug.cpp b/src/log/hasp_debug.cpp
similarity index 99%
rename from src/hasp_debug.cpp
rename to src/log/hasp_debug.cpp
index 9b556153..1aece68b 100644
--- a/src/hasp_debug.cpp
+++ b/src/log/hasp_debug.cpp
@@ -29,7 +29,7 @@
 
 #include "hasp_conf.h"
 
-#include "hasp_hal.h"
+#include "hal/hasp_hal.h"
 #include "hasp_debug.h"
 #include "hasp_config.h"