diff --git a/SkywardHub.pro b/SkywardHub.pro
index 38fe58297b12d224dace02eddd1d2647f7cc3ee9..fd9fdeb3e61d244659fbb003b8c868c90eac9276 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -17,11 +17,11 @@ SOURCES += \
     Components/ToggleButton/togglebutton.cpp \
     Components/ErrorDisplayer/error.cpp \
     Components/ErrorDisplayer/errordisplayer.cpp \
-    Core/Messages/messagefield.cpp \
-    Core/Messages/topic.cpp \
+    Core/Message/messagefield.cpp \
+    Core/Message/modulemessage.cpp \
+    Core/Message/topic.cpp \
     Core/module.cpp \
     Core/moduleeventshandler.cpp \
-    Core/modulemessage.cpp \
     Core/modulemessagesbroker.cpp \
     Core/modulesmanager.cpp \
     Core/skywardhubcore.cpp \
@@ -75,11 +75,14 @@ HEADERS += \
     Components/ToggleButton/togglebutton.h \
     Components/ErrorDisplayer/error.h \
     Components/ErrorDisplayer/errordisplayer.h \
+    Core/Message/messagefield.h \
+    Core/Message/modulemessage.h \
+    Core/Message/topic.h \
     Core/Messages/messagefield.h \
+    Core/Messages/modulemessage.h \
     Core/Messages/topic.h \
     Core/module.h \
     Core/moduleeventshandler.h \
-    Core/modulemessage.h \
     Core/modulemessagesbroker.h \
     Core/modulesmanager.h \
     Core/skywardhubcore.h \