diff --git a/README.md b/README.md
index 946571f..34806a6 100644
--- a/README.md
+++ b/README.md
@@ -100,9 +100,10 @@ arduino/
 │  ├─ cores/                        Wiring core files
 │  ├─ libraries/                    Supported built-in platform libraries
 ├─ libretuya/
-│  ├─ api/                      LibreTuya API (interfaces + LT class) for Arduino frameworks
+│  ├─ api/                      Library interfaces
 │  ├─ common/                   Units common to all platforms
 │  ├─ compat/                   Fixes for compatibility with ESP32 framework
+│  ├─ core/                     LibreTuya API for Arduino cores
 │  ├─ libraries/                Built-in platform-independent libraries
 boards/
 ├─ <board name>/                Board-specific code
diff --git a/arduino/libretuya/api/Preferences.h b/arduino/libretuya/api/Preferences.h
index c353e18..0a7404a 100644
--- a/arduino/libretuya/api/Preferences.h
+++ b/arduino/libretuya/api/Preferences.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "api/String.h"
+#include <api/String.h>
 
 typedef enum {
 	PT_I8,
diff --git a/arduino/libretuya/api/WiFi.h b/arduino/libretuya/api/WiFi.h
index e4c499b..a350175 100644
--- a/arduino/libretuya/api/WiFi.h
+++ b/arduino/libretuya/api/WiFi.h
@@ -30,7 +30,6 @@
 #include "WiFiType.h"
 
 // TODO wifi events
-// TODO WiFiMulti library
 
 class IWiFiClass {
   public:
diff --git a/arduino/libretuya/api/LibreTuyaAPI.cpp b/arduino/libretuya/core/LibreTuyaAPI.cpp
similarity index 100%
rename from arduino/libretuya/api/LibreTuyaAPI.cpp
rename to arduino/libretuya/core/LibreTuyaAPI.cpp
diff --git a/arduino/libretuya/api/LibreTuyaAPI.h b/arduino/libretuya/core/LibreTuyaAPI.h
similarity index 100%
rename from arduino/libretuya/api/LibreTuyaAPI.h
rename to arduino/libretuya/core/LibreTuyaAPI.h
diff --git a/arduino/libretuya/api/LibreTuyaConfig.h b/arduino/libretuya/core/LibreTuyaConfig.h
similarity index 100%
rename from arduino/libretuya/api/LibreTuyaConfig.h
rename to arduino/libretuya/core/LibreTuyaConfig.h
diff --git a/arduino/libretuya/api/lt_logger.c b/arduino/libretuya/core/lt_logger.c
similarity index 100%
rename from arduino/libretuya/api/lt_logger.c
rename to arduino/libretuya/core/lt_logger.c
diff --git a/arduino/libretuya/api/lt_logger.h b/arduino/libretuya/core/lt_logger.h
similarity index 100%
rename from arduino/libretuya/api/lt_logger.h
rename to arduino/libretuya/core/lt_logger.h
diff --git a/arduino/realtek-ambz/cores/arduino/Arduino.h b/arduino/realtek-ambz/cores/arduino/Arduino.h
index 07ff75b..c50c8e5 100644
--- a/arduino/realtek-ambz/cores/arduino/Arduino.h
+++ b/arduino/realtek-ambz/cores/arduino/Arduino.h
@@ -8,7 +8,7 @@
 
 #define PinMode PinModeArduino // this conflicts with SDK enum
 #include <api/ArduinoAPI.h>
-#include <api/LibreTuyaAPI.h>
+#include <core/LibreTuyaAPI.h>
 #undef PinMode
 
 #ifdef __cplusplus
diff --git a/builder/arduino-common.py b/builder/arduino-common.py
index 3085b25..bc63371 100644
--- a/builder/arduino-common.py
+++ b/builder/arduino-common.py
@@ -8,9 +8,9 @@ env = DefaultEnvironment()
 platform = env.PioPlatform()
 
 API_DIR = platform.get_package_dir("framework-arduino-api")
-LT_API_DIR = join(platform.get_dir(), "arduino", "libretuya")
+LT_ARDUINO_DIR = join(platform.get_dir(), "arduino", "libretuya")
 assert isdir(API_DIR)
-assert isdir(LT_API_DIR)
+assert isdir(LT_ARDUINO_DIR)
 
 # Sources - ArduinoCore-API
 env.AddLibrary(
@@ -33,15 +33,17 @@ env.AddLibrary(
 # Sources - LibreTuya API
 env.AddLibrary(
     name="libretuya_api",
-    base_dir=LT_API_DIR,
+    base_dir=LT_ARDUINO_DIR,
     srcs=[
         "+<api/*.c*>",
         "+<common/*.c*>",
+        "+<core/*.c*>",
         "+<libraries/**/*.c*>",
     ],
     includes=[
         "!<.>",
         "!<compat>",
+        "!<core>",
         "!<libraries/*>",
     ],
 )