diff --git a/DEPS b/DEPS
index a26bb626c1..8898937ab5 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "d1dfcdfd82c3847e25c9640088ca321e3625ced3",
+        "commit": "6bf0581bd6c2b9794a52abffa35e782ee82bfcd0",
         "dir": "third_party/tgfx"
       },
       {
diff --git a/include/pag/gpu.h b/include/pag/gpu.h
index bd7886db09..fd457ed8ae 100644
--- a/include/pag/gpu.h
+++ b/include/pag/gpu.h
@@ -64,9 +64,9 @@ enum class Backend {
 enum class ImageOrigin {
   /**
    * The default origin of the native coordinate system in the GPU backend. For example, the
-   * SurfaceOrigin::TopLeft is actually the bottom-left origin in the OpenGL coordinate system for
-   * textures. Textures newly created by the backend API for off-screen rendering usually have a
-   * SurfaceOrigin::TopLeft origin.
+   * ImageOrigin::TopLeft is actually the bottom-left origin in the OpenGL coordinate system for
+   * textures. Textures newly created by the backend API for off-screen rendering usually have an
+   * ImageOrigin::TopLeft origin.
    */
   TopLeft,
 
diff --git a/qt/src/PAGView.cpp b/qt/src/PAGView.cpp
index daae0fbcfe..e8a800700f 100644
--- a/qt/src/PAGView.cpp
+++ b/qt/src/PAGView.cpp
@@ -23,7 +23,7 @@
 #include <QThread>
 #include "pag/file.h"
 #include "platform/qt/GPUDrawable.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 class RenderThread : public QThread {
diff --git a/src/base/ByteData.cpp b/src/base/ByteData.cpp
index 231a2ccbff..257ef0f4b6 100644
--- a/src/base/ByteData.cpp
+++ b/src/base/ByteData.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "pag/file.h"
-#include "tgfx/utils/Stream.h"
+#include "tgfx/core/Stream.h"
 
 namespace pag {
 std::unique_ptr<ByteData> ByteData::FromPath(const std::string& filePath) {
diff --git a/src/c/ext/egl/pag_egl_globals.cpp b/src/c/ext/egl/pag_egl_globals.cpp
index b322b5b1bc..3d02864c61 100644
--- a/src/c/ext/egl/pag_egl_globals.cpp
+++ b/src/c/ext/egl/pag_egl_globals.cpp
@@ -18,7 +18,7 @@
 
 #include "pag/c/ext/egl/pag_egl_globals.h"
 #include <mutex>
-#include "tgfx/opengl/egl/EGLGlobals.h"
+#include "tgfx/gpu/opengl/egl/EGLGlobals.h"
 
 static std::mutex eglGlobalsLocker = {};
 
diff --git a/src/c/ext/pag_surface_ext.cpp b/src/c/ext/pag_surface_ext.cpp
index ed13ee60ec..66ec9028ba 100644
--- a/src/c/ext/pag_surface_ext.cpp
+++ b/src/c/ext/pag_surface_ext.cpp
@@ -20,7 +20,7 @@
 #include "c/pag_types_priv.h"
 #include "pag/pag.h"
 #include "rendering/drawables/DoubleBufferedDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 pag_surface* pag_surface_make_offscreen_double_buffered(int width, int height, bool tryHardware,
                                                         void* sharedContext) {
diff --git a/src/codec/mp4/MP4BoxHelper.cpp b/src/codec/mp4/MP4BoxHelper.cpp
index 4c44b3759b..0a594b2271 100644
--- a/src/codec/mp4/MP4BoxHelper.cpp
+++ b/src/codec/mp4/MP4BoxHelper.cpp
@@ -20,7 +20,7 @@
 #include "MP4Generator.h"
 #include "base/utils/Log.h"
 #include "codec/utils/EncodeStream.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 static const int SEQUENCE_NUMBER = 1;
diff --git a/src/codec/mp4/MP4Generator.cpp b/src/codec/mp4/MP4Generator.cpp
index d7808c4614..59065b8e8e 100644
--- a/src/codec/mp4/MP4Generator.cpp
+++ b/src/codec/mp4/MP4Generator.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "MP4Generator.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 #define PushInWriteFun(funName)                                                         \
   writeFun.emplace_back([this](auto&& PH1, auto&& PH2) -> int {                         \
diff --git a/src/codec/utils/DecodeStream.h b/src/codec/utils/DecodeStream.h
index 4ecb52c450..2831f0544e 100644
--- a/src/codec/utils/DecodeStream.h
+++ b/src/codec/utils/DecodeStream.h
@@ -21,7 +21,7 @@
 #include <string>
 #include "codec/utils/StreamContext.h"
 #include "pag/types.h"
-#include "tgfx/utils/DataView.h"
+#include "tgfx/core/DataView.h"
 
 namespace pag {
 
diff --git a/src/codec/utils/EncodeStream.h b/src/codec/utils/EncodeStream.h
index edf09e9e65..8e4f688cc7 100644
--- a/src/codec/utils/EncodeStream.h
+++ b/src/codec/utils/EncodeStream.h
@@ -20,7 +20,7 @@
 
 #include "codec/utils/StreamContext.h"
 #include "pag/file.h"
-#include "tgfx/utils/DataView.h"
+#include "tgfx/core/DataView.h"
 
 namespace pag {
 
diff --git a/src/platform/android/GPUDrawable.cpp b/src/platform/android/GPUDrawable.cpp
index cfea247c8f..97b4c4fadc 100644
--- a/src/platform/android/GPUDrawable.cpp
+++ b/src/platform/android/GPUDrawable.cpp
@@ -18,7 +18,7 @@
 
 #include "GPUDrawable.h"
 #include "base/utils/Log.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(ANativeWindow* nativeWindow,
diff --git a/src/platform/android/GPUDrawable.h b/src/platform/android/GPUDrawable.h
index a88e8e1158..45acb79e40 100644
--- a/src/platform/android/GPUDrawable.h
+++ b/src/platform/android/GPUDrawable.h
@@ -21,7 +21,7 @@
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/egl/EGLWindow.h"
+#include "tgfx/gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {
 
diff --git a/src/platform/android/HardwareDecoder.cpp b/src/platform/android/HardwareDecoder.cpp
index 9f9c05e6b2..227a5d4742 100644
--- a/src/platform/android/HardwareDecoder.cpp
+++ b/src/platform/android/HardwareDecoder.cpp
@@ -19,8 +19,8 @@
 #include "HardwareDecoder.h"
 #include "base/utils/Log.h"
 #include "platform/android/JStringUtil.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/Task.h"
 
 namespace pag {
 static Global<jclass> HardwareDecoderClass;
diff --git a/src/platform/android/JNativeTask.cpp b/src/platform/android/JNativeTask.cpp
index 5a3d9deabd..a365b47851 100644
--- a/src/platform/android/JNativeTask.cpp
+++ b/src/platform/android/JNativeTask.cpp
@@ -18,7 +18,7 @@
 
 #include <jni.h>
 #include "JNIHelper.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Task.h"
 
 extern "C" PAG_API void Java_org_libpag_NativeTask_Run(JNIEnv* env, jclass, jobject runnable) {
   static pag::Global<jclass> runnableClass = env->FindClass("java/lang/Runnable");
diff --git a/src/platform/cocoa/private/NativeTextShaper.mm b/src/platform/cocoa/private/NativeTextShaper.mm
index e9987b950f..8cfcff9ef4 100644
--- a/src/platform/cocoa/private/NativeTextShaper.mm
+++ b/src/platform/cocoa/private/NativeTextShaper.mm
@@ -18,8 +18,8 @@
 
 #include "NativeTextShaper.h"
 #include <CoreText/CoreText.h>
+#include "tgfx/core/UTF.h"
 #include "tgfx/platform/apple/CTTypeface.h"
-#include "tgfx/utils/UTF.h"
 
 namespace pag {
 std::optional<PositionedGlyphs> NativeTextShaper::Shape(
diff --git a/src/platform/cocoa/private/PAGFileImpl.mm b/src/platform/cocoa/private/PAGFileImpl.mm
index d92b76b0de..77c09d3e1f 100644
--- a/src/platform/cocoa/private/PAGFileImpl.mm
+++ b/src/platform/cocoa/private/PAGFileImpl.mm
@@ -19,7 +19,7 @@
 #import "PAGFileImpl.h"
 
 #include "pag/pag.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Task.h"
 
 #import "PAGDiskCacheImpl.h"
 #import "PAGLayerImpl+Internal.h"
diff --git a/src/platform/ios/private/GPUDrawable.h b/src/platform/ios/private/GPUDrawable.h
index 66aebd1517..59eed2aafd 100644
--- a/src/platform/ios/private/GPUDrawable.h
+++ b/src/platform/ios/private/GPUDrawable.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/eagl/EAGLWindow.h"
+#include "tgfx/gpu/opengl/eagl/EAGLWindow.h"
 
 namespace pag {
 
diff --git a/src/platform/ios/private/PAGSurfaceImpl.mm b/src/platform/ios/private/PAGSurfaceImpl.mm
index dccdfaaf88..8aba8108a0 100644
--- a/src/platform/ios/private/PAGSurfaceImpl.mm
+++ b/src/platform/ios/private/PAGSurfaceImpl.mm
@@ -25,7 +25,7 @@
 #include "pag/types.h"
 #include "platform/cocoa/private/PixelBufferUtil.h"
 #include "rendering/drawables/HardwareBufferDrawable.h"
-#include "tgfx/opengl/eagl/EAGLDevice.h"
+#include "tgfx/gpu/opengl/eagl/EAGLDevice.h"
 
 @interface PAGSurfaceImpl ()
 
diff --git a/src/platform/mac/private/GPUDrawable.h b/src/platform/mac/private/GPUDrawable.h
index 58c12f3d60..8df35f4205 100644
--- a/src/platform/mac/private/GPUDrawable.h
+++ b/src/platform/mac/private/GPUDrawable.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/cgl/CGLWindow.h"
+#include "tgfx/gpu/opengl/cgl/CGLWindow.h"
 
 namespace pag {
 class GPUDrawable : public Drawable {
diff --git a/src/platform/mac/private/GPUDrawable.mm b/src/platform/mac/private/GPUDrawable.mm
index a92cafabb3..45e9361a54 100644
--- a/src/platform/mac/private/GPUDrawable.mm
+++ b/src/platform/mac/private/GPUDrawable.mm
@@ -17,8 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "GPUDrawable.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/cgl/CGLWindow.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/cgl/CGLWindow.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromView(NSView* view) {
diff --git a/src/platform/ohos/GPUDrawable.cpp b/src/platform/ohos/GPUDrawable.cpp
index cfba20539a..a7093e23c7 100644
--- a/src/platform/ohos/GPUDrawable.cpp
+++ b/src/platform/ohos/GPUDrawable.cpp
@@ -19,7 +19,7 @@
 #include "GPUDrawable.h"
 #include <native_window/external_window.h>
 #include "base/utils/Log.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(NativeWindow* nativeWindow,
diff --git a/src/platform/ohos/GPUDrawable.h b/src/platform/ohos/GPUDrawable.h
index 880311015b..b2dcd10b56 100644
--- a/src/platform/ohos/GPUDrawable.h
+++ b/src/platform/ohos/GPUDrawable.h
@@ -20,7 +20,7 @@
 
 #include <native_window/external_window.h>
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/egl/EGLWindow.h"
+#include "tgfx/gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {
 
diff --git a/src/platform/ohos/JPAGImage.cpp b/src/platform/ohos/JPAGImage.cpp
index 7053af53d8..6a1382089b 100644
--- a/src/platform/ohos/JPAGImage.cpp
+++ b/src/platform/ohos/JPAGImage.cpp
@@ -19,9 +19,9 @@
 #include <js_native_api.h>
 #include <rawfile/raw_file.h>
 #include <rawfile/raw_file_manager.h>
-#include <tgfx/platform/ohos/OHOSPixelMap.h>
 #include "JsHelper.h"
 #include "rendering/editing/StillImage.h"
+#include "tgfx/platform/ohos/OHOSPixelMap.h"
 
 namespace pag {
 
diff --git a/src/platform/ohos/JsHelper.cpp b/src/platform/ohos/JsHelper.cpp
index 49c2e7b506..da9f5b9e51 100644
--- a/src/platform/ohos/JsHelper.cpp
+++ b/src/platform/ohos/JsHelper.cpp
@@ -19,8 +19,8 @@
 #include "JsHelper.h"
 #include <multimedia/image_framework/image/pixelmap_native.h>
 #include <multimedia/image_framework/image_pixel_map_mdk.h>
-#include <tgfx/core/ImageInfo.h>
 #include "base/utils/Log.h"
+#include "tgfx/core/ImageInfo.h"
 
 namespace pag {
 
diff --git a/src/platform/qt/GPUDrawable.cpp b/src/platform/qt/GPUDrawable.cpp
index ee662df4d9..7ab84e30dd 100644
--- a/src/platform/qt/GPUDrawable.cpp
+++ b/src/platform/qt/GPUDrawable.cpp
@@ -18,7 +18,7 @@
 
 #include "GPUDrawable.h"
 #include <QQuickWindow>
-#include "tgfx/opengl/qt/QGLWindow.h"
+#include "tgfx/gpu/opengl/qt/QGLWindow.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::MakeFrom(QQuickItem* quickItem,
diff --git a/src/platform/web/GPUDrawable.cpp b/src/platform/web/GPUDrawable.cpp
index e758b46e62..1a54655799 100644
--- a/src/platform/web/GPUDrawable.cpp
+++ b/src/platform/web/GPUDrawable.cpp
@@ -18,8 +18,8 @@
 
 #include "GPUDrawable.h"
 #include "base/utils/Log.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/GLDefines.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/GLDefines.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromCanvasID(const std::string& canvasID) {
diff --git a/src/platform/web/GPUDrawable.h b/src/platform/web/GPUDrawable.h
index cf2ac93e60..89d59d273e 100644
--- a/src/platform/web/GPUDrawable.h
+++ b/src/platform/web/GPUDrawable.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/webgl/WebGLWindow.h"
+#include "tgfx/gpu/opengl/webgl/WebGLWindow.h"
 
 namespace pag {
 class GPUDrawable : public Drawable {
diff --git a/src/platform/web/HardwareDecoder.cpp b/src/platform/web/HardwareDecoder.cpp
index 1855f3b216..8243b63b37 100644
--- a/src/platform/web/HardwareDecoder.cpp
+++ b/src/platform/web/HardwareDecoder.cpp
@@ -20,7 +20,7 @@
 #include "WebVideoSequenceDemuxer.h"
 #include "base/utils/TimeUtil.h"
 #include "rendering/sequences/VideoSequenceDemuxer.h"
-#include "tgfx/opengl/GLFunctions.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 
 using namespace emscripten;
 
diff --git a/src/platform/web/NativeTextShaper.cpp b/src/platform/web/NativeTextShaper.cpp
index 6706f4250e..c748a7dbd0 100644
--- a/src/platform/web/NativeTextShaper.cpp
+++ b/src/platform/web/NativeTextShaper.cpp
@@ -19,7 +19,7 @@
 #include "NativeTextShaper.h"
 #include "UnicodeEmojiTable.hh"
 #include "rendering/FontManager.h"
-#include "tgfx/utils/UTF.h"
+#include "tgfx/core/UTF.h"
 
 namespace pag {
 template <typename T>
diff --git a/src/platform/web/PAGWasmBindings.cpp b/src/platform/web/PAGWasmBindings.cpp
index 387d391919..4fcb431eec 100644
--- a/src/platform/web/PAGWasmBindings.cpp
+++ b/src/platform/web/PAGWasmBindings.cpp
@@ -26,7 +26,7 @@
 #include "rendering/editing/StillImage.h"
 #include "tgfx/core/ImageInfo.h"
 #include "tgfx/core/PathTypes.h"
-#include "tgfx/opengl/GLDefines.h"
+#include "tgfx/gpu/opengl/GLDefines.h"
 
 using namespace emscripten;
 
diff --git a/src/platform/win/GPUDrawable.cpp b/src/platform/win/GPUDrawable.cpp
index 551ccb5a76..0ecc57c36e 100644
--- a/src/platform/win/GPUDrawable.cpp
+++ b/src/platform/win/GPUDrawable.cpp
@@ -19,7 +19,7 @@
 #include "GPUDrawable.h"
 #include <windows.h>
 #include "base/utils/Log.h"
-#include "tgfx/opengl/egl/EGLWindow.h"
+#include "tgfx/gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(void* nativeWindow, void* sharedContext) {
diff --git a/src/rendering/PAGAnimator.cpp b/src/rendering/PAGAnimator.cpp
index 71ed650cb7..f14a964963 100644
--- a/src/rendering/PAGAnimator.cpp
+++ b/src/rendering/PAGAnimator.cpp
@@ -20,8 +20,8 @@
 #include "base/utils/TimeUtil.h"
 #include "platform/Platform.h"
 #include "rendering/utils/DisplayLinkWrapper.h"
-#include "tgfx/utils/Clock.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Clock.h"
+#include "tgfx/core/Task.h"
 
 namespace pag {
 static constexpr int AnimationTypeEnd = 1;
diff --git a/src/rendering/PAGAnimator.h b/src/rendering/PAGAnimator.h
index 2d27d4114c..1f5dbba247 100644
--- a/src/rendering/PAGAnimator.h
+++ b/src/rendering/PAGAnimator.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "pag/pag.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Task.h"
 
 namespace pag {
 /**
diff --git a/src/rendering/PAGPlayer.cpp b/src/rendering/PAGPlayer.cpp
index a5c57d1ec5..c475f99852 100644
--- a/src/rendering/PAGPlayer.cpp
+++ b/src/rendering/PAGPlayer.cpp
@@ -25,7 +25,7 @@
 #include "rendering/utils/ApplyScaleMode.h"
 #include "rendering/utils/LockGuard.h"
 #include "rendering/utils/ScopedLock.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 PAGPlayer::PAGPlayer() {
diff --git a/src/rendering/PAGSurface.cpp b/src/rendering/PAGSurface.cpp
index a954973a9c..f7f0df1161 100644
--- a/src/rendering/PAGSurface.cpp
+++ b/src/rendering/PAGSurface.cpp
@@ -24,7 +24,7 @@
 #include "rendering/utils/GLRestorer.h"
 #include "rendering/utils/LockGuard.h"
 #include "rendering/utils/shaper/TextShaper.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 
diff --git a/src/rendering/PAGSurfaceFactory.cpp b/src/rendering/PAGSurfaceFactory.cpp
index e74e570216..189a48868d 100644
--- a/src/rendering/PAGSurfaceFactory.cpp
+++ b/src/rendering/PAGSurfaceFactory.cpp
@@ -23,7 +23,7 @@
 #include "rendering/drawables/OffscreenDrawable.h"
 #include "rendering/drawables/RenderTargetDrawable.h"
 #include "rendering/drawables/TextureDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 std::shared_ptr<PAGSurface> PAGSurface::MakeFrom(std::shared_ptr<Drawable> drawable) {
diff --git a/src/rendering/Performance.h b/src/rendering/Performance.h
index f0b701b05d..f44837959e 100644
--- a/src/rendering/Performance.h
+++ b/src/rendering/Performance.h
@@ -20,7 +20,7 @@
 
 #include "base/utils/Log.h"
 #include "pag/types.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 class Performance {
diff --git a/src/rendering/caches/DiskCache.cpp b/src/rendering/caches/DiskCache.cpp
index 5d39f92bf9..ab064a0860 100644
--- a/src/rendering/caches/DiskCache.cpp
+++ b/src/rendering/caches/DiskCache.cpp
@@ -20,9 +20,9 @@
 #include "pag/pag.h"
 #include "platform/Platform.h"
 #include "rendering/utils/Directory.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/DataView.h"
-#include "tgfx/utils/Stream.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/DataView.h"
+#include "tgfx/core/Stream.h"
 
 namespace pag {
 class FileInfo {
diff --git a/src/rendering/caches/RenderCache.cpp b/src/rendering/caches/RenderCache.cpp
index 53e301f8a7..7ef9d3181e 100644
--- a/src/rendering/caches/RenderCache.cpp
+++ b/src/rendering/caches/RenderCache.cpp
@@ -27,7 +27,7 @@
 #include "rendering/renderers/FilterRenderer.h"
 #include "rendering/sequences/SequenceImageProxy.h"
 #include "rendering/sequences/SequenceInfo.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 // 300M设置的大一些用于兜底，通常在大于20M时就开始随时清理。
diff --git a/src/rendering/caches/SequenceFile.cpp b/src/rendering/caches/SequenceFile.cpp
index 414d112a4e..cf466683b2 100644
--- a/src/rendering/caches/SequenceFile.cpp
+++ b/src/rendering/caches/SequenceFile.cpp
@@ -22,8 +22,8 @@
 #include "base/utils/Log.h"
 #include "pag/file.h"
 #include "rendering/utils/Directory.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/DataView.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/DataView.h"
 
 namespace pag {
 static constexpr uint8_t FILE_VERSION = 1;
diff --git a/src/rendering/caches/SequenceFile.h b/src/rendering/caches/SequenceFile.h
index 1db3e68e77..ecdc82b6fa 100644
--- a/src/rendering/caches/SequenceFile.h
+++ b/src/rendering/caches/SequenceFile.h
@@ -25,8 +25,8 @@
 #include "rendering/utils/BitmapBuffer.h"
 #include "rendering/utils/LZ4Decoder.h"
 #include "rendering/utils/LZ4Encoder.h"
+#include "tgfx/core/Buffer.h"
 #include "tgfx/core/ImageInfo.h"
-#include "tgfx/utils/Buffer.h"
 
 namespace pag {
 class DiskCache;
diff --git a/src/rendering/caches/TextAtlas.cpp b/src/rendering/caches/TextAtlas.cpp
index 1b770e3480..a95b0c234a 100644
--- a/src/rendering/caches/TextAtlas.cpp
+++ b/src/rendering/caches/TextAtlas.cpp
@@ -20,7 +20,7 @@
 #include "RenderCache.h"
 #include "tgfx/core/Canvas.h"
 #include "tgfx/core/Mask.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 class Atlas {
diff --git a/src/rendering/caches/TextAtlas.h b/src/rendering/caches/TextAtlas.h
index 7b9bc6ab03..a93336b1ec 100644
--- a/src/rendering/caches/TextAtlas.h
+++ b/src/rendering/caches/TextAtlas.h
@@ -20,8 +20,8 @@
 
 #include "TextBlock.h"
 #include "pag/types.h"
+#include "tgfx/core/BytesKey.h"
 #include "tgfx/core/Image.h"
-#include "tgfx/utils/BytesKey.h"
 
 namespace pag {
 class RenderCache;
diff --git a/src/rendering/drawables/BitmapDrawable.cpp b/src/rendering/drawables/BitmapDrawable.cpp
index 15f786b3a2..527f61da88 100644
--- a/src/rendering/drawables/BitmapDrawable.cpp
+++ b/src/rendering/drawables/BitmapDrawable.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "BitmapDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 std::shared_ptr<BitmapDrawable> BitmapDrawable::Make(int width, int height) {
diff --git a/src/rendering/drawables/DoubleBufferedDrawable.cpp b/src/rendering/drawables/DoubleBufferedDrawable.cpp
index 333bed1a89..5e03a4efc1 100644
--- a/src/rendering/drawables/DoubleBufferedDrawable.cpp
+++ b/src/rendering/drawables/DoubleBufferedDrawable.cpp
@@ -18,7 +18,7 @@
 
 #include "DoubleBufferedDrawable.h"
 #include "base/utils/TGFXCast.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 #include "tgfx/platform/HardwareBuffer.h"
 
 namespace pag {
diff --git a/src/rendering/drawables/Drawable.h b/src/rendering/drawables/Drawable.h
index b3f9ed707b..6cb83ef6fe 100644
--- a/src/rendering/drawables/Drawable.h
+++ b/src/rendering/drawables/Drawable.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "pag/gpu.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 
diff --git a/src/rendering/drawables/HardwareBufferDrawable.cpp b/src/rendering/drawables/HardwareBufferDrawable.cpp
index de222f6ed1..7eb67e702b 100644
--- a/src/rendering/drawables/HardwareBufferDrawable.cpp
+++ b/src/rendering/drawables/HardwareBufferDrawable.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "HardwareBufferDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 #include "tgfx/platform/HardwareBuffer.h"
 
 namespace pag {
diff --git a/src/rendering/drawables/OffscreenDrawable.cpp b/src/rendering/drawables/OffscreenDrawable.cpp
index 0ee8fc0bfc..2d6f6a2e93 100644
--- a/src/rendering/drawables/OffscreenDrawable.cpp
+++ b/src/rendering/drawables/OffscreenDrawable.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "OffscreenDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 std::shared_ptr<OffscreenDrawable> OffscreenDrawable::Make(int width, int height) {
diff --git a/src/rendering/editing/StillImage.cpp b/src/rendering/editing/StillImage.cpp
index 451ff2fae0..21eda874e5 100644
--- a/src/rendering/editing/StillImage.cpp
+++ b/src/rendering/editing/StillImage.cpp
@@ -23,7 +23,7 @@
 #include "rendering/caches/RenderCache.h"
 #include "rendering/graphics/Graphic.h"
 #include "rendering/graphics/Picture.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 std::shared_ptr<PAGImage> PAGImage::FromPath(const std::string& filePath) {
diff --git a/src/rendering/filters/DisplacementMapFilter.cpp b/src/rendering/filters/DisplacementMapFilter.cpp
index 32dc638961..4afcbb1445 100644
--- a/src/rendering/filters/DisplacementMapFilter.cpp
+++ b/src/rendering/filters/DisplacementMapFilter.cpp
@@ -20,7 +20,7 @@
 #include "rendering/caches/LayerCache.h"
 #include "rendering/caches/RenderCache.h"
 #include "rendering/filters/utils/FilterHelper.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 static const char FRAGMENT_SHADER[] = R"(
diff --git a/src/rendering/filters/GradientOverlayFilter.cpp b/src/rendering/filters/GradientOverlayFilter.cpp
index ca8ec2f051..c0a0fb2a49 100644
--- a/src/rendering/filters/GradientOverlayFilter.cpp
+++ b/src/rendering/filters/GradientOverlayFilter.cpp
@@ -20,7 +20,7 @@
 #include "base/utils/MathUtil.h"
 #include "base/utils/TGFXCast.h"
 #include "rendering/graphics/GradientPaint.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 GradientOverlayFilter::GradientOverlayFilter(GradientOverlayStyle* layerStyle)
diff --git a/src/rendering/filters/LayerFilter.h b/src/rendering/filters/LayerFilter.h
index 65912e29d4..a2aad7c139 100644
--- a/src/rendering/filters/LayerFilter.h
+++ b/src/rendering/filters/LayerFilter.h
@@ -22,7 +22,7 @@
 #include "pag/file.h"
 #include "pag/pag.h"
 #include "rendering/filters/utils/FilterHelper.h"
-#include "tgfx/opengl/GLResource.h"
+#include "tgfx/gpu/opengl/GLResource.h"
 
 namespace pag {
 std::vector<tgfx::Point> ComputeVerticesForMotionBlurAndBulge(const tgfx::Rect& inputBounds,
diff --git a/src/rendering/filters/utils/FilterBuffer.h b/src/rendering/filters/utils/FilterBuffer.h
index e681c207a9..2757c7bae7 100644
--- a/src/rendering/filters/utils/FilterBuffer.h
+++ b/src/rendering/filters/utils/FilterBuffer.h
@@ -21,7 +21,7 @@
 #include "pag/file.h"
 #include "pag/pag.h"
 #include "rendering/filters/Filter.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 class FilterBuffer {
diff --git a/src/rendering/filters/utils/FilterHelper.cpp b/src/rendering/filters/utils/FilterHelper.cpp
index 284b037d32..6131f0a2f0 100644
--- a/src/rendering/filters/utils/FilterHelper.cpp
+++ b/src/rendering/filters/utils/FilterHelper.cpp
@@ -18,7 +18,7 @@
 
 #include "FilterHelper.h"
 #include "base/utils/USE.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::array<float, 9> ToGLMatrix(const tgfx::Matrix& matrix) {
diff --git a/src/rendering/filters/utils/FilterHelper.h b/src/rendering/filters/utils/FilterHelper.h
index 225c9141f7..5d004e0319 100644
--- a/src/rendering/filters/utils/FilterHelper.h
+++ b/src/rendering/filters/utils/FilterHelper.h
@@ -23,7 +23,7 @@
 #include "pag/file.h"
 #include "pag/pag.h"
 #include "rendering/filters/Filter.h"
-#include "tgfx/opengl/GLFunctions.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 
 namespace pag {
 std::array<float, 9> ToGLMatrix(const tgfx::Matrix& matrix);
diff --git a/src/rendering/graphics/Canvas.cpp b/src/rendering/graphics/Canvas.cpp
index 26d6520df7..bec1e53dd9 100644
--- a/src/rendering/graphics/Canvas.cpp
+++ b/src/rendering/graphics/Canvas.cpp
@@ -18,7 +18,7 @@
 
 #include "Canvas.h"
 #include "rendering/caches/RenderCache.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 struct CanvasState {
diff --git a/src/rendering/graphics/Canvas.h b/src/rendering/graphics/Canvas.h
index d270eb72b6..2f34f251fd 100644
--- a/src/rendering/graphics/Canvas.h
+++ b/src/rendering/graphics/Canvas.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "tgfx/core/Canvas.h"
-#include "tgfx/gpu/SurfaceOptions.h"
+#include "tgfx/core/SurfaceOptions.h"
 
 namespace pag {
 class RenderCache;
diff --git a/src/rendering/graphics/FeatherMask.cpp b/src/rendering/graphics/FeatherMask.cpp
index 5f2dcb6427..424071286b 100644
--- a/src/rendering/graphics/FeatherMask.cpp
+++ b/src/rendering/graphics/FeatherMask.cpp
@@ -23,7 +23,7 @@
 #include "rendering/utils/PathUtil.h"
 #include "tgfx/core/Canvas.h"
 #include "tgfx/core/Mask.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::shared_ptr<Graphic> FeatherMask::MakeFrom(const std::vector<MaskData*>& masks,
diff --git a/src/rendering/graphics/Glyph.cpp b/src/rendering/graphics/Glyph.cpp
index a98e9954f4..8351a019d8 100644
--- a/src/rendering/graphics/Glyph.cpp
+++ b/src/rendering/graphics/Glyph.cpp
@@ -19,7 +19,7 @@
 #include "Glyph.h"
 #include <unordered_map>
 #include "rendering/utils/shaper/TextShaper.h"
-#include "tgfx/utils/UTF.h"
+#include "tgfx/core/UTF.h"
 
 namespace pag {
 std::vector<GlyphHandle> Glyph::BuildFromText(const std::string& text, const tgfx::Font& font,
diff --git a/src/rendering/graphics/Glyph.h b/src/rendering/graphics/Glyph.h
index 313337c2f6..acfe51394c 100644
--- a/src/rendering/graphics/Glyph.h
+++ b/src/rendering/graphics/Glyph.h
@@ -19,8 +19,8 @@
 #pragma once
 
 #include "pag/types.h"
+#include "tgfx/core/BytesKey.h"
 #include "tgfx/core/Font.h"
-#include "tgfx/utils/BytesKey.h"
 
 namespace pag {
 /**
diff --git a/src/rendering/graphics/GradientPaint.cpp b/src/rendering/graphics/GradientPaint.cpp
index 708827c68a..59ad9143b3 100644
--- a/src/rendering/graphics/GradientPaint.cpp
+++ b/src/rendering/graphics/GradientPaint.cpp
@@ -138,7 +138,7 @@ std::shared_ptr<tgfx::Shader> GradientPaint::getShader() const {
   } else if (gradientType == GradientFillType::Angle) {
     auto center = startPoint + endPoint;
     center.set(center.x * 0.5f, center.y * 0.5f);
-    shader = tgfx::Shader::MakeSweepGradient(center, 0, 360, colors, positions);
+    shader = tgfx::Shader::MakeConicGradient(center, 0, 360, colors, positions);
   } else if (gradientType == GradientFillType::Reflected) {
     auto reflectedColors = colors;
     reflectedColors.insert(reflectedColors.begin(), colors.rbegin(), colors.rend() - 1);
diff --git a/src/rendering/graphics/Modifier.cpp b/src/rendering/graphics/Modifier.cpp
index 1f68e81ec4..1e7b9b1039 100644
--- a/src/rendering/graphics/Modifier.cpp
+++ b/src/rendering/graphics/Modifier.cpp
@@ -23,7 +23,7 @@
 #include "base/utils/UniqueID.h"
 #include "rendering/utils/SurfaceUtil.h"
 #include "tgfx/core/BlendMode.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 class BlendModifier : public Modifier {
diff --git a/src/rendering/graphics/Picture.cpp b/src/rendering/graphics/Picture.cpp
index 056cbb1967..d8ad3622bf 100644
--- a/src/rendering/graphics/Picture.cpp
+++ b/src/rendering/graphics/Picture.cpp
@@ -20,9 +20,9 @@
 #include <unordered_set>
 #include "base/utils/MatrixUtil.h"
 #include "rendering/caches/RenderCache.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/GLDevice.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 static std::shared_ptr<tgfx::Image> RescaleImage(tgfx::Context* context,
diff --git a/src/rendering/graphics/Shape.cpp b/src/rendering/graphics/Shape.cpp
index 2c1f1ee3c7..6f63184157 100644
--- a/src/rendering/graphics/Shape.cpp
+++ b/src/rendering/graphics/Shape.cpp
@@ -22,7 +22,7 @@
 #include "tgfx/core/Canvas.h"
 #include "tgfx/core/Mask.h"
 #include "tgfx/core/Shader.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::shared_ptr<Graphic> Shape::MakeFrom(ID assetID, const tgfx::Path& path, tgfx::Color color) {
diff --git a/src/rendering/graphics/Snapshot.cpp b/src/rendering/graphics/Snapshot.cpp
index a4c767a9a9..119bccc319 100644
--- a/src/rendering/graphics/Snapshot.cpp
+++ b/src/rendering/graphics/Snapshot.cpp
@@ -19,7 +19,7 @@
 #include "Snapshot.h"
 #include "base/utils/MatrixUtil.h"
 #include "rendering/caches/RenderCache.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 size_t Snapshot::memoryUsage() const {
diff --git a/src/rendering/renderers/FilterRenderer.cpp b/src/rendering/renderers/FilterRenderer.cpp
index 44b60f45c2..221ee2213a 100644
--- a/src/rendering/renderers/FilterRenderer.cpp
+++ b/src/rendering/renderers/FilterRenderer.cpp
@@ -28,7 +28,7 @@
 #include "rendering/filters/utils/FilterBuffer.h"
 #include "rendering/filters/utils/FilterHelper.h"
 #include "rendering/utils/SurfaceUtil.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 
diff --git a/src/rendering/sequences/BitmapSequenceReader.cpp b/src/rendering/sequences/BitmapSequenceReader.cpp
index 1f8efbce06..5f45189ed7 100644
--- a/src/rendering/sequences/BitmapSequenceReader.cpp
+++ b/src/rendering/sequences/BitmapSequenceReader.cpp
@@ -17,9 +17,9 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "BitmapSequenceReader.h"
+#include "tgfx/core/Buffer.h"
 #include "tgfx/core/ImageCodec.h"
 #include "tgfx/core/Pixmap.h"
-#include "tgfx/utils/Buffer.h"
 
 namespace pag {
 BitmapSequenceReader::BitmapSequenceReader(std::shared_ptr<File> file, BitmapSequence* sequence)
diff --git a/src/rendering/sequences/DiskSequenceReader.cpp b/src/rendering/sequences/DiskSequenceReader.cpp
index dc39979868..7ed6895a42 100644
--- a/src/rendering/sequences/DiskSequenceReader.cpp
+++ b/src/rendering/sequences/DiskSequenceReader.cpp
@@ -19,7 +19,7 @@
 #include "DiskSequenceReader.h"
 #include "base/utils/TGFXCast.h"
 #include "platform/Platform.h"
-#include "tgfx/utils/Buffer.h"
+#include "tgfx/core/Buffer.h"
 
 namespace pag {
 
diff --git a/src/rendering/sequences/VideoReader.cpp b/src/rendering/sequences/VideoReader.cpp
index 3941606961..99569b0c37 100644
--- a/src/rendering/sequences/VideoReader.cpp
+++ b/src/rendering/sequences/VideoReader.cpp
@@ -19,7 +19,7 @@
 #include "VideoReader.h"
 #include "base/utils/TimeUtil.h"
 #include "platform/Platform.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 
diff --git a/src/rendering/utils/GLRestorer.h b/src/rendering/utils/GLRestorer.h
index bddf0f7ee6..53b4f315bb 100644
--- a/src/rendering/utils/GLRestorer.h
+++ b/src/rendering/utils/GLRestorer.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "tgfx/opengl/GLFunctions.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 
 namespace pag {
 class GLRestorer {
diff --git a/src/rendering/utils/SurfaceUtil.h b/src/rendering/utils/SurfaceUtil.h
index 2755058146..c1bf9fe4cb 100644
--- a/src/rendering/utils/SurfaceUtil.h
+++ b/src/rendering/utils/SurfaceUtil.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/graphics/Canvas.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 class SurfaceUtil {
diff --git a/src/rendering/utils/Trace.cpp b/src/rendering/utils/Trace.cpp
index 1d17131171..18743bbd17 100644
--- a/src/rendering/utils/Trace.cpp
+++ b/src/rendering/utils/Trace.cpp
@@ -19,7 +19,7 @@
 #include "Trace.h"
 #include "platform/Platform.h"
 #include "tgfx/core/Bitmap.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 void Trace(std::shared_ptr<tgfx::Surface> surface, const std::string& path) {
diff --git a/src/rendering/utils/Trace.h b/src/rendering/utils/Trace.h
index 5a7497e293..4b49fbc77d 100644
--- a/src/rendering/utils/Trace.h
+++ b/src/rendering/utils/Trace.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "tgfx/core/Pixmap.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 /**
diff --git a/src/rendering/utils/shaper/TextShaperPrimitive.cpp b/src/rendering/utils/shaper/TextShaperPrimitive.cpp
index 2d44f304ce..ab17f4ed6e 100644
--- a/src/rendering/utils/shaper/TextShaperPrimitive.cpp
+++ b/src/rendering/utils/shaper/TextShaperPrimitive.cpp
@@ -18,7 +18,7 @@
 
 #include "TextShaperPrimitive.h"
 #include "rendering/FontManager.h"
-#include "tgfx/utils/UTF.h"
+#include "tgfx/core/UTF.h"
 
 namespace pag {
 PositionedGlyphs TextShaperPrimitive::Shape(const std::string& text,
diff --git a/src/rendering/video/SoftAVCDecoder.cpp b/src/rendering/video/SoftAVCDecoder.cpp
index a0035438d7..178957e0e4 100644
--- a/src/rendering/video/SoftAVCDecoder.cpp
+++ b/src/rendering/video/SoftAVCDecoder.cpp
@@ -18,7 +18,7 @@
 
 #include "SoftAVCDecoder.h"
 #include <cstdlib>
-#include "tgfx/utils/Buffer.h"
+#include "tgfx/core/Buffer.h"
 
 #ifdef PAG_USE_LIBAVC
 
diff --git a/src/rendering/video/SoftAVCDecoder.h b/src/rendering/video/SoftAVCDecoder.h
index a9beb3a62d..02427d6ace 100644
--- a/src/rendering/video/SoftAVCDecoder.h
+++ b/src/rendering/video/SoftAVCDecoder.h
@@ -23,8 +23,8 @@
 #include "base/utils/Log.h"
 #include "pag/decoder.h"
 #include "pag/types.h"
+#include "tgfx/core/Buffer.h"
 #include "tgfx/core/Data.h"
-#include "tgfx/utils/Buffer.h"
 
 extern "C" {
 #pragma clang diagnostic push
diff --git a/src/rendering/video/SoftwareDecoderWrapper.h b/src/rendering/video/SoftwareDecoderWrapper.h
index dfb291a5e9..e9a3b54d4b 100644
--- a/src/rendering/video/SoftwareDecoderWrapper.h
+++ b/src/rendering/video/SoftwareDecoderWrapper.h
@@ -21,7 +21,7 @@
 #include <list>
 #include "VideoDecoder.h"
 #include "pag/decoder.h"
-#include "tgfx/utils/Buffer.h"
+#include "tgfx/core/Buffer.h"
 
 namespace pag {
 class SoftwareDecoderWrapper : public VideoDecoder {
diff --git a/test/src/PAGBlendTest.cpp b/test/src/PAGBlendTest.cpp
index dada99bad2..67b0e5783b 100644
--- a/test/src/PAGBlendTest.cpp
+++ b/test/src/PAGBlendTest.cpp
@@ -16,8 +16,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "tgfx/opengl/GLDevice.h"
-#include "tgfx/opengl/GLFunctions.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 #include "utils/TestUtils.h"
 
 namespace pag {
diff --git a/test/src/PAGCompareFrameTest.cpp b/test/src/PAGCompareFrameTest.cpp
index 2daabc6218..dfe6409368 100644
--- a/test/src/PAGCompareFrameTest.cpp
+++ b/test/src/PAGCompareFrameTest.cpp
@@ -24,8 +24,8 @@
 #include "base/utils/TimeUtil.h"
 #include "nlohmann/json.hpp"
 #include "rendering/caches/RenderCache.h"
-#include "tgfx/utils/Clock.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Clock.h"
+#include "tgfx/core/Task.h"
 #include "utils/TestUtils.h"
 
 namespace pag {
diff --git a/test/src/PAGFuzzTest.cpp b/test/src/PAGFuzzTest.cpp
index b503cc00fd..452e041f49 100644
--- a/test/src/PAGFuzzTest.cpp
+++ b/test/src/PAGFuzzTest.cpp
@@ -21,8 +21,8 @@
 #include <vector>
 #include "nlohmann/json.hpp"
 #include "pag/pag.h"
-#include "tgfx/utils/Clock.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Clock.h"
+#include "tgfx/core/Task.h"
 #include "utils/TestUtils.h"
 
 namespace pag {
diff --git a/test/src/PAGImageTest.cpp b/test/src/PAGImageTest.cpp
index b9dbe34d18..6f68a36d90 100644
--- a/test/src/PAGImageTest.cpp
+++ b/test/src/PAGImageTest.cpp
@@ -20,8 +20,8 @@
 #include "nlohmann/json.hpp"
 #include "pag/pag.h"
 #include "tgfx/core/ImageCodec.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 #include "utils/TestUtils.h"
 
 namespace pag {
diff --git a/test/src/PAGSurfaceTest.cpp b/test/src/PAGSurfaceTest.cpp
index 8492a79445..0b3de4ae88 100644
--- a/test/src/PAGSurfaceTest.cpp
+++ b/test/src/PAGSurfaceTest.cpp
@@ -17,8 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "rendering/drawables/TextureDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
-#include "tgfx/opengl/GLFunctions.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 #include "utils/TestUtils.h"
 
 namespace pag {
diff --git a/test/src/utils/Baseline.cpp b/test/src/utils/Baseline.cpp
index 16416bd4f0..faa4024401 100644
--- a/test/src/utils/Baseline.cpp
+++ b/test/src/utils/Baseline.cpp
@@ -23,8 +23,8 @@
 #include <iostream>
 #include "nlohmann/json.hpp"
 #include "tgfx/core/ImageCodec.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 #include "utils/TestDir.h"
 #include "utils/TestUtils.h"
 
diff --git a/test/src/utils/DevicePool.h b/test/src/utils/DevicePool.h
index 95696c4176..e0e6694129 100644
--- a/test/src/utils/DevicePool.h
+++ b/test/src/utils/DevicePool.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 class DevicePool {
diff --git a/test/src/utils/TestUtils.cpp b/test/src/utils/TestUtils.cpp
index 87362074b8..4d859c09e5 100644
--- a/test/src/utils/TestUtils.cpp
+++ b/test/src/utils/TestUtils.cpp
@@ -20,9 +20,9 @@
 #include <fstream>
 #include "base/utils/TGFXCast.h"
 #include "rendering/utils/Directory.h"
-#include "tgfx/opengl/GLFunctions.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/Stream.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/Stream.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 #include "utils/ProjectPath.h"
 #include "utils/TestDir.h"
 
diff --git a/test/src/utils/TestUtils.h b/test/src/utils/TestUtils.h
index e102e1dbd8..b9c1cdc224 100644
--- a/test/src/utils/TestUtils.h
+++ b/test/src/utils/TestUtils.h
@@ -22,10 +22,10 @@
 #include "base/PAGTest.h"
 #include "base/utils/TGFXCast.h"
 #include "pag/pag.h"
+#include "tgfx/core/Clock.h"
 #include "tgfx/core/Image.h"
 #include "tgfx/core/ImageCodec.h"
 #include "tgfx/core/Pixmap.h"
-#include "tgfx/utils/Clock.h"
 #include "utils/Baseline.h"
 #include "utils/OffscreenSurface.h"
 #include "utils/ProjectPath.h"