diff --git a/cmake/boardcore.cmake b/cmake/boardcore.cmake
index b2d1d3cc79878660e6ff146867a1850ac6ce5dcc..c5586af5ffa96b82ec18ff12ff699405ef6a1857 100644
--- a/cmake/boardcore.cmake
+++ b/cmake/boardcore.cmake
@@ -108,8 +108,8 @@ foreach(OPT_BOARD ${BOARDS})
         ${SBS_BASE}/src/shared/sensors/SensorSampler.cpp
         ${SBS_BASE}/src/shared/sensors/UBXGPS/UBXGPSSerial.cpp
         ${SBS_BASE}/src/shared/sensors/UBXGPS/UBXGPSSpi.cpp
-        ${SBS_BASE}/src/shared/sensors/VN100/VN100.cpp
-        ${SBS_BASE}/src/shared/sensors/VN300/VN300.cpp
+        ${SBS_BASE}/src/shared/sensors/Vectornav/VN100/VN100.cpp
+        ${SBS_BASE}/src/shared/sensors/Vectornav/VN300/VN300.cpp
         ${SBS_BASE}/src/shared/sensors/LIS2MDL/LIS2MDL.cpp
         ${SBS_BASE}/src/shared/sensors/LPS28DFW/LPS28DFW.cpp
         ${SBS_BASE}/src/shared/sensors/LPS22DF/LPS22DF.cpp
diff --git a/src/shared/sensors/Vectornav/VN300/VN300Data.h b/src/shared/sensors/Vectornav/VN300/VN300Data.h
index 5326cde528a24d867795556ea7bbf7eb2bc7bb3e..425d98ff190985928720be0e6eda3a879442298f 100644
--- a/src/shared/sensors/Vectornav/VN300/VN300Data.h
+++ b/src/shared/sensors/Vectornav/VN300/VN300Data.h
@@ -23,7 +23,8 @@
 #pragma once
 
 #include <sensors/SensorData.h>
-#include <sensors/VN300/VN300Defs.h>
+
+#include "VN300Defs.h"
 
 namespace Boardcore
 {
diff --git a/src/tests/sensors/test-vn100.cpp b/src/tests/sensors/test-vn100.cpp
index 5f5fd14ada39d8be9b93487304a685e9819db712..9ce5e833db5319c4031f2f645cd926dd65429e28 100644
--- a/src/tests/sensors/test-vn100.cpp
+++ b/src/tests/sensors/test-vn100.cpp
@@ -22,7 +22,7 @@
 
 #include <drivers/timer/TimestampTimer.h>
 #include <inttypes.h>
-#include <sensors/VN100/VN100.h>
+#include <sensors/Vectornav/VN100/VN100.h>
 
 using namespace miosix;
 using namespace Boardcore;
diff --git a/src/tests/sensors/test-vn300.cpp b/src/tests/sensors/test-vn300.cpp
index b9a072e4c948d241f8e0133dfe75217e680aae46..dd1e37db3a42ea325319b29339ba6c8e3f3071be 100644
--- a/src/tests/sensors/test-vn300.cpp
+++ b/src/tests/sensors/test-vn300.cpp
@@ -22,7 +22,7 @@
 
 #include <drivers/timer/TimestampTimer.h>
 #include <inttypes.h>
-#include <sensors/VN300/VN300.h>
+#include <sensors/Vectornav/VN300/VN300.h>
 #include <utils/Stats/Stats.h>
 
 #include <iostream>