diff --git a/Firmware/sdk/CMakeLists.txt b/Firmware/sdk/CMakeLists.txt
index 554499e..e24df50 100644
--- a/Firmware/sdk/CMakeLists.txt
+++ b/Firmware/sdk/CMakeLists.txt
@@ -25,22 +25,8 @@ endif ()
 
 set(CARDBOY_SDK_BACKEND_LIBRARY "${_cardboy_backend_default}" CACHE STRING "Backend implementation library for Cardboy SDK" FORCE)
 
-add_library(cardboy_sdk STATIC
-        src/app_system.cpp
-)
 
-target_include_directories(cardboy_sdk
-        PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
-target_compile_features(cardboy_sdk PUBLIC cxx_std_20)
-
-target_link_libraries(cardboy_sdk
-        PUBLIC
-        cardboy_backend_interface
-        ${CARDBOY_SDK_BACKEND_LIBRARY}
-)
+add_subdirectory(core)
 
 add_subdirectory(apps)
 
diff --git a/Firmware/sdk/core/CMakeLists.txt b/Firmware/sdk/core/CMakeLists.txt
new file mode 100644
index 0000000..68aed36
--- /dev/null
+++ b/Firmware/sdk/core/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.16)
+
+add_library(cardboy_sdk STATIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/app_system.cpp
+)
+
+set_target_properties(cardboy_sdk PROPERTIES
+        EXPORT_NAME sdk
+)
+
+target_include_directories(cardboy_sdk
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+target_compile_features(cardboy_sdk PUBLIC cxx_std_20)
+
+target_link_libraries(cardboy_sdk
+        PUBLIC
+        cardboy_backend_interface
+        ${CARDBOY_SDK_BACKEND_LIBRARY}
+)
diff --git a/Firmware/sdk/include/cardboy/gfx/Fonts.hpp b/Firmware/sdk/core/include/cardboy/gfx/Fonts.hpp
similarity index 100%
rename from Firmware/sdk/include/cardboy/gfx/Fonts.hpp
rename to Firmware/sdk/core/include/cardboy/gfx/Fonts.hpp
diff --git a/Firmware/sdk/include/cardboy/gfx/font16x8.hpp b/Firmware/sdk/core/include/cardboy/gfx/font16x8.hpp
similarity index 100%
rename from Firmware/sdk/include/cardboy/gfx/font16x8.hpp
rename to Firmware/sdk/core/include/cardboy/gfx/font16x8.hpp
diff --git a/Firmware/sdk/include/cardboy/sdk/app_framework.hpp b/Firmware/sdk/core/include/cardboy/sdk/app_framework.hpp
similarity index 100%
rename from Firmware/sdk/include/cardboy/sdk/app_framework.hpp
rename to Firmware/sdk/core/include/cardboy/sdk/app_framework.hpp
diff --git a/Firmware/sdk/include/cardboy/sdk/app_system.hpp b/Firmware/sdk/core/include/cardboy/sdk/app_system.hpp
similarity index 100%
rename from Firmware/sdk/include/cardboy/sdk/app_system.hpp
rename to Firmware/sdk/core/include/cardboy/sdk/app_system.hpp
diff --git a/Firmware/sdk/src/app_system.cpp b/Firmware/sdk/core/src/app_system.cpp
similarity index 100%
rename from Firmware/sdk/src/app_system.cpp
rename to Firmware/sdk/core/src/app_system.cpp