diff --git a/libraries/scrcpy-decoder-tinyh264/src/decoder.ts b/libraries/scrcpy-decoder-tinyh264/src/decoder.ts
index dd58b8b3..f7b83e84 100644
--- a/libraries/scrcpy-decoder-tinyh264/src/decoder.ts
+++ b/libraries/scrcpy-decoder-tinyh264/src/decoder.ts
@@ -58,12 +58,12 @@ export class TinyH264Decoder implements ScrcpyVideoDecoder {
     }
 
     #frameRendered = 0;
-    get frameRendered() {
+    get framesRendered() {
         return this.#frameRendered;
     }
 
     #frameSkipped = 0;
-    get frameSkipped() {
+    get framesSkipped() {
         return this.#frameSkipped;
     }
 
diff --git a/libraries/scrcpy-decoder-tinyh264/src/types.ts b/libraries/scrcpy-decoder-tinyh264/src/types.ts
index 5cf4936c..39217c15 100644
--- a/libraries/scrcpy-decoder-tinyh264/src/types.ts
+++ b/libraries/scrcpy-decoder-tinyh264/src/types.ts
@@ -13,8 +13,8 @@ export interface ScrcpyVideoDecoderCapability {
 export interface ScrcpyVideoDecoder extends Disposable {
     readonly renderer: HTMLElement;
     readonly sizeChanged: Event<{ width: number; height: number }>;
-    readonly frameRendered: number;
-    readonly frameSkipped: number;
+    readonly framesRendered: number;
+    readonly framesSkipped: number;
     readonly writable: WritableStream<ScrcpyMediaStreamPacket>;
 }
 
diff --git a/libraries/scrcpy-decoder-webcodecs/src/index.ts b/libraries/scrcpy-decoder-webcodecs/src/video/decoder.ts
similarity index 100%
rename from libraries/scrcpy-decoder-webcodecs/src/index.ts
rename to libraries/scrcpy-decoder-webcodecs/src/video/decoder.ts
diff --git a/libraries/scrcpy-decoder-webcodecs/src/bitmap.ts b/libraries/scrcpy-decoder-webcodecs/src/video/render/bitmap.ts
similarity index 100%
rename from libraries/scrcpy-decoder-webcodecs/src/bitmap.ts
rename to libraries/scrcpy-decoder-webcodecs/src/video/render/bitmap.ts
diff --git a/libraries/scrcpy-decoder-webcodecs/src/renderer.ts b/libraries/scrcpy-decoder-webcodecs/src/video/render/type.ts
similarity index 100%
rename from libraries/scrcpy-decoder-webcodecs/src/renderer.ts
rename to libraries/scrcpy-decoder-webcodecs/src/video/render/type.ts
diff --git a/libraries/scrcpy-decoder-webcodecs/src/webgl.ts b/libraries/scrcpy-decoder-webcodecs/src/video/render/webgl.ts
similarity index 100%
rename from libraries/scrcpy-decoder-webcodecs/src/webgl.ts
rename to libraries/scrcpy-decoder-webcodecs/src/video/render/webgl.ts