diff --git a/meson.build b/meson.build
index 443d45e1..145e4f18 100644
--- a/meson.build
+++ b/meson.build
@@ -19,34 +19,36 @@ def = {'VCOM_ENABLED' : ''}
 ## OpenRTX sources
 ##
 
-openrtx_src = ['openrtx/src/state.c',
+openrtx_src = ['openrtx/src/core/state.c',
+               'openrtx/src/core/threads.c',
+               'openrtx/src/core/battery.c',
+               'openrtx/src/core/graphics.c',
+               'openrtx/src/core/input.c',
+               'openrtx/src/core/calibUtils.c',
+               'openrtx/src/core/queue.c',
+               'openrtx/src/core/chan.c',
+               'openrtx/src/core/gps.c',
+               'openrtx/src/core/dsp.cpp',
+               'openrtx/src/core/cps.c',
+               'openrtx/src/core/memory_profiling.cpp',
                'openrtx/src/ui/ui.c',
                'openrtx/src/ui/ui_main.c',
                'openrtx/src/ui/ui_mode.c',
                'openrtx/src/ui/ui_menu.c',
-               'openrtx/src/threads.c',
-               'openrtx/src/battery.c',
-               'openrtx/src/graphics.c',
-               'openrtx/src/input.c',
-               'openrtx/src/calibUtils.c',
-               'openrtx/src/queue.c',
-               'openrtx/src/chan.c',
-               'openrtx/src/cps.c',
                'openrtx/src/rtx/rtx.cpp',
                'openrtx/src/rtx/OpMode_FM.cpp',
                'openrtx/src/rtx/OpMode_M17.cpp',
-               'openrtx/src/gps.c',
-               'openrtx/src/dsp.cpp',
-               'openrtx/src/memory_profiling.cpp',
                'openrtx/src/protocols/M17/M17Callsign.cpp',
                'openrtx/src/protocols/M17/M17Modulator.cpp',
                'openrtx/src/protocols/M17/M17Transmitter.cpp',
                'openrtx/src/protocols/M17/M17LinkSetupFrame.cpp']
 
 openrtx_inc = ['openrtx/include',
-               'openrtx/include/calibration',
                'openrtx/include/rtx',
+               'openrtx/include/core',
+               'openrtx/include/calibration',
                'openrtx/include/protocols',
+               'openrtx/include/fonts/adafruit',
                'platform/drivers/ADC',
                'platform/drivers/NVM',
                'platform/drivers/GPS',
@@ -54,8 +56,7 @@ openrtx_inc = ['openrtx/include',
                'platform/drivers/tones',
                'platform/drivers/baseband',
                'platform/drivers/backlight',
-               'platform/drivers/chSelector',
-               'openrtx/include/fonts/adafruit']
+               'platform/drivers/chSelector']
 
 main_src = []
 
diff --git a/openrtx/include/battery.h b/openrtx/include/core/battery.h
similarity index 100%
rename from openrtx/include/battery.h
rename to openrtx/include/core/battery.h
diff --git a/openrtx/include/chan.h b/openrtx/include/core/chan.h
similarity index 100%
rename from openrtx/include/chan.h
rename to openrtx/include/core/chan.h
diff --git a/openrtx/include/cps.h b/openrtx/include/core/cps.h
similarity index 100%
rename from openrtx/include/cps.h
rename to openrtx/include/core/cps.h
diff --git a/openrtx/include/datatypes.h b/openrtx/include/core/datatypes.h
similarity index 100%
rename from openrtx/include/datatypes.h
rename to openrtx/include/core/datatypes.h
diff --git a/openrtx/include/dsp.h b/openrtx/include/core/dsp.h
similarity index 100%
rename from openrtx/include/dsp.h
rename to openrtx/include/core/dsp.h
diff --git a/openrtx/include/event.h b/openrtx/include/core/event.h
similarity index 100%
rename from openrtx/include/event.h
rename to openrtx/include/core/event.h
diff --git a/openrtx/include/gps.h b/openrtx/include/core/gps.h
similarity index 100%
rename from openrtx/include/gps.h
rename to openrtx/include/core/gps.h
diff --git a/openrtx/include/input.h b/openrtx/include/core/input.h
similarity index 100%
rename from openrtx/include/input.h
rename to openrtx/include/core/input.h
diff --git a/openrtx/include/memory_profiling.h b/openrtx/include/core/memory_profiling.h
similarity index 100%
rename from openrtx/include/memory_profiling.h
rename to openrtx/include/core/memory_profiling.h
diff --git a/openrtx/include/queue.h b/openrtx/include/core/queue.h
similarity index 100%
rename from openrtx/include/queue.h
rename to openrtx/include/core/queue.h
diff --git a/openrtx/include/settings.h b/openrtx/include/core/settings.h
similarity index 100%
rename from openrtx/include/settings.h
rename to openrtx/include/core/settings.h
diff --git a/openrtx/include/state.h b/openrtx/include/core/state.h
similarity index 100%
rename from openrtx/include/state.h
rename to openrtx/include/core/state.h
diff --git a/openrtx/include/threads.h b/openrtx/include/core/threads.h
similarity index 100%
rename from openrtx/include/threads.h
rename to openrtx/include/core/threads.h
diff --git a/openrtx/include/ui.h b/openrtx/include/core/ui.h
similarity index 100%
rename from openrtx/include/ui.h
rename to openrtx/include/core/ui.h
diff --git a/openrtx/src/battery.c b/openrtx/src/core/battery.c
similarity index 100%
rename from openrtx/src/battery.c
rename to openrtx/src/core/battery.c
diff --git a/openrtx/src/calibUtils.c b/openrtx/src/core/calibUtils.c
similarity index 100%
rename from openrtx/src/calibUtils.c
rename to openrtx/src/core/calibUtils.c
diff --git a/openrtx/src/chan.c b/openrtx/src/core/chan.c
similarity index 100%
rename from openrtx/src/chan.c
rename to openrtx/src/core/chan.c
diff --git a/openrtx/src/cps.c b/openrtx/src/core/cps.c
similarity index 100%
rename from openrtx/src/cps.c
rename to openrtx/src/core/cps.c
diff --git a/openrtx/src/dsp.cpp b/openrtx/src/core/dsp.cpp
similarity index 100%
rename from openrtx/src/dsp.cpp
rename to openrtx/src/core/dsp.cpp
diff --git a/openrtx/src/gps.c b/openrtx/src/core/gps.c
similarity index 100%
rename from openrtx/src/gps.c
rename to openrtx/src/core/gps.c
diff --git a/openrtx/src/graphics.c b/openrtx/src/core/graphics.c
similarity index 100%
rename from openrtx/src/graphics.c
rename to openrtx/src/core/graphics.c
diff --git a/openrtx/src/input.c b/openrtx/src/core/input.c
similarity index 100%
rename from openrtx/src/input.c
rename to openrtx/src/core/input.c
diff --git a/openrtx/src/memory_profiling.cpp b/openrtx/src/core/memory_profiling.cpp
similarity index 100%
rename from openrtx/src/memory_profiling.cpp
rename to openrtx/src/core/memory_profiling.cpp
diff --git a/openrtx/src/queue.c b/openrtx/src/core/queue.c
similarity index 100%
rename from openrtx/src/queue.c
rename to openrtx/src/core/queue.c
diff --git a/openrtx/src/state.c b/openrtx/src/core/state.c
similarity index 100%
rename from openrtx/src/state.c
rename to openrtx/src/core/state.c
diff --git a/openrtx/src/threads.c b/openrtx/src/core/threads.c
similarity index 100%
rename from openrtx/src/threads.c
rename to openrtx/src/core/threads.c