diff --git a/src/communication/mqtt_report/include/mqtt_report/vehicle_context.h b/src/communication/mqtt_report/include/mqtt_report/core/vehicle_context.h
similarity index 100%
rename from src/communication/mqtt_report/include/mqtt_report/vehicle_context.h
rename to src/communication/mqtt_report/include/mqtt_report/core/vehicle_context.h
diff --git a/src/communication/mqtt_report/src/mqtt_report_node.cpp b/src/communication/mqtt_report/src/node/mqtt_vehicle_node.cpp
similarity index 100%
rename from src/communication/mqtt_report/src/mqtt_report_node.cpp
rename to src/communication/mqtt_report/src/node/mqtt_vehicle_node.cpp