diff --git a/USB/STM32_USB_Device_Library/Class/MSC_CDC/usbd_msc_cdc.c b/USB/STM32_USB_Device_Library/Class/MSC_CDC/usbd_msc_cdc.c
index ce4348a..c655db3 100644
--- a/USB/STM32_USB_Device_Library/Class/MSC_CDC/usbd_msc_cdc.c
+++ b/USB/STM32_USB_Device_Library/Class/MSC_CDC/usbd_msc_cdc.c
@@ -5,7 +5,7 @@
 #include "platform.h"
 #include "framework/system_settings.h"
 #include "usbd_desc.h"
-#include "task_main.h"
+#include "tasks/task_main.h"
 #include "usbd_msc.h"
 #include "usbd_cdc.h"
 #include "usbd_msc_cdc.h"
diff --git a/gex.mk b/gex.mk
index 1cc923b..796b99b 100644
--- a/gex.mk
+++ b/gex.mk
@@ -11,7 +11,8 @@ GEX_SRC_DIR = \
     User/units/pin \
     User/TinyFrame \
     User/CWPack \
-    User/vfs
+    User/vfs \
+    User/tasks
 
 GEX_SOURCES = \
     User/USB/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c \
@@ -37,6 +38,7 @@ GEX_INCLUDES = \
     -IUser/units/pin \
     -IUser/framework \
     -IUser/platform \
+    -IUser/tasks \
     -IUser/USB/STM32_USB_Device_Library/Core/Inc \
     -IUser/USB/STM32_USB_Device_Library/Class/AUDIO/Inc \
     -IUser/USB/STM32_USB_Device_Library/Class/CDC/Inc \
diff --git a/task_main.c b/tasks/task_main.c
similarity index 100%
rename from task_main.c
rename to tasks/task_main.c
diff --git a/task_main.h b/tasks/task_main.h
similarity index 100%
rename from task_main.h
rename to tasks/task_main.h
diff --git a/task_sched.c b/tasks/task_sched.c
similarity index 100%
rename from task_sched.c
rename to tasks/task_sched.c
diff --git a/task_sched.h b/tasks/task_sched.h
similarity index 100%
rename from task_sched.h
rename to tasks/task_sched.h