diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter
index f2fff326363..5389f652c87 100755
--- a/engine/src/flutter/ci/licenses_golden/licenses_flutter
+++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter
@@ -426,42 +426,69 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/bitmap_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/browser_detection.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/browser_location.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvas_pool.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/n_way_canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/path.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/clipboard.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/canvas_kit_canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/canvaskit_api.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/color_filter.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/embedded_views.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/fonts.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/image.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/image_filter.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/initialization.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/layer.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/layer_scene_builder.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/layer_tree.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/mask_filter.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/n_way_canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/painting.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/path.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/picture.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/picture_recorder.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/platform_message.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/raster_cache.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/rasterizer.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/shader.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/skia_object_cache.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/surface.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/text.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/util.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/vertices.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/viewport_metrics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom_renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/frame_reference.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/history.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/clip.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/image_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/offset.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/opacity.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/painting.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/conic.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/cubic.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_ref.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_utils.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_windings.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/tangent.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/picture.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shader.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface_stats.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/transform.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html_image_codec.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/keyboard.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse_cursor.dart
@@ -489,33 +516,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codec.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codecs.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/serialization.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/shadow.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/backdrop_filter.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/clip.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/debug_canvas_reuse_overlay.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/image_filter.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/offset.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/opacity.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/painting.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/conic.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/cubic.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/path.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/path_metrics.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/path_ref.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/path_to_svg.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/path_utils.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/path_windings.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path/tangent.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/picture.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/platform_view.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/recording_canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/render_vertices.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/scene.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/scene_builder.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/shader.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/surface.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/surface_stats.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/transform.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/test_embedding.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text/font_collection.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text/line_break_properties.dart
diff --git a/engine/src/flutter/lib/web_ui/CODE_CONVENTIONS.md b/engine/src/flutter/lib/web_ui/CODE_CONVENTIONS.md
new file mode 100644
index 00000000000..de91812be7b
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/CODE_CONVENTIONS.md
@@ -0,0 +1,62 @@
+# Web-specific coding conventions and terminology
+
+Here you will find various naming and structural conventions used in the Web
+engine code. This is not a code style guide. For code style refer to
+[Flutter's style guide][1]. This document does not apply outside the `web_ui`
+directory.
+
+## CanvasKit Renderer
+
+All code specific to the CanvasKit renderer lives in `lib/src/engine/canvaskit`.
+
+CanvasKit bindings should use the exact names defined in CanvasKit's JavaScript
+API, even if it violates Flutter's style guide, such as function names that
+start with a capital letter (e.g. "MakeSkVertices"). This makes it easier to find
+the relevant code in Skia's source code. CanvasKit bindings should all go in
+the `canvaskit_api.dart` file.
+
+Files and directories should use all-lower-case "canvaskit", without
+capitalization or punctuation (such as "canvasKit", "canvas-kit", "canvas_kit").
+This is consistent with Skia's conventions.
+
+Variable, function, method, and class names should use camel case, i.e.
+"canvasKit", "CanvasKit".
+
+In documentation (doc comments, flutter.dev website, markdown files,
+blog posts, etc) refer to Flutter's usage of CanvasKit as "CanvasKit renderer"
+(to avoid confusion with CanvasKit as the standalone library, which can be used
+without Flutter).
+
+Classes that wrap CanvasKit classes should replace the `Sk` class prefix with
+`Ck` (which stands for "CanvasKit"), e.g. `CkPaint` wraps `SkPaint`, `CkImage`
+wraps `SkImage`.
+
+## HTML Renderer
+
+All code specific to the HTML renderer lives in `lib/src/engine/html`.
+
+In documentation (doc comments, flutter.dev website, markdown files,
+blog posts, etc) refer to Flutter's HTML implementation as "HTML renderer". We
+include SVG, CSS, and Canvas 2D under the "HTML" umbrella.
+
+The implementation of the layer system uses the term "surface" to refer to
+layers. We rely on persisting the DOM information across frames to gain
+efficiency. Each concrete implementation of the `Surface` class should start
+with the prefix `Persisted`, e.g. `PersistedOpacity`, `PersistedPicture`.
+
+## Semantics
+
+The semantics (accessibility) code is shared between CanvasKit and HTML. All
+semantics code lives in `lib/src/engine/semantics`.
+
+## Text editing
+
+Text editing code is shared between CanvasKit and HTML, and it lives in
+`lib/src/engine/text_editing`.
+
+## Common utilities
+
+Small common utilities do not need dedicated directories. It is OK to put all
+such utilities in `lib/src/engine` (see, for example, `alarm_clock.dart`).
+
+[1]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine.dart b/engine/src/flutter/lib/web_ui/lib/src/engine.dart
index 4a5ddfe706a..232b00e4c60 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine.dart
@@ -27,43 +27,70 @@ part 'engine/assets.dart';
 part 'engine/bitmap_canvas.dart';
 part 'engine/browser_detection.dart';
 part 'engine/browser_location.dart';
+part 'engine/canvaskit/canvas.dart';
+part 'engine/canvaskit/canvaskit_canvas.dart';
+part 'engine/canvaskit/canvaskit_api.dart';
+part 'engine/canvaskit/color_filter.dart';
+part 'engine/canvaskit/embedded_views.dart';
+part 'engine/canvaskit/fonts.dart';
+part 'engine/canvaskit/image.dart';
+part 'engine/canvaskit/image_filter.dart';
+part 'engine/canvaskit/initialization.dart';
+part 'engine/canvaskit/layer.dart';
+part 'engine/canvaskit/layer_scene_builder.dart';
+part 'engine/canvaskit/layer_tree.dart';
+part 'engine/canvaskit/mask_filter.dart';
+part 'engine/canvaskit/n_way_canvas.dart';
+part 'engine/canvaskit/path.dart';
+part 'engine/canvaskit/painting.dart';
+part 'engine/canvaskit/path_metrics.dart';
+part 'engine/canvaskit/picture.dart';
+part 'engine/canvaskit/picture_recorder.dart';
+part 'engine/canvaskit/platform_message.dart';
+part 'engine/canvaskit/raster_cache.dart';
+part 'engine/canvaskit/rasterizer.dart';
+part 'engine/canvaskit/shader.dart';
+part 'engine/canvaskit/skia_object_cache.dart';
+part 'engine/canvaskit/surface.dart';
+part 'engine/canvaskit/text.dart';
+part 'engine/canvaskit/util.dart';
+part 'engine/canvaskit/vertices.dart';
+part 'engine/canvaskit/viewport_metrics.dart';
 part 'engine/canvas_pool.dart';
 part 'engine/clipboard.dart';
 part 'engine/color_filter.dart';
-part 'engine/compositor/canvas.dart';
-part 'engine/compositor/canvas_kit_canvas.dart';
-part 'engine/compositor/canvaskit_api.dart';
-part 'engine/compositor/color_filter.dart';
-part 'engine/compositor/embedded_views.dart';
-part 'engine/compositor/fonts.dart';
-part 'engine/compositor/image.dart';
-part 'engine/compositor/image_filter.dart';
-part 'engine/compositor/initialization.dart';
-part 'engine/compositor/layer.dart';
-part 'engine/compositor/layer_scene_builder.dart';
-part 'engine/compositor/layer_tree.dart';
-part 'engine/compositor/mask_filter.dart';
-part 'engine/compositor/n_way_canvas.dart';
-part 'engine/compositor/path.dart';
-part 'engine/compositor/painting.dart';
-part 'engine/compositor/path_metrics.dart';
-part 'engine/compositor/picture.dart';
-part 'engine/compositor/picture_recorder.dart';
-part 'engine/compositor/platform_message.dart';
-part 'engine/compositor/raster_cache.dart';
-part 'engine/compositor/rasterizer.dart';
-part 'engine/compositor/shader.dart';
-part 'engine/compositor/skia_object_cache.dart';
-part 'engine/compositor/surface.dart';
-part 'engine/compositor/text.dart';
-part 'engine/compositor/util.dart';
-part 'engine/compositor/vertices.dart';
-part 'engine/compositor/viewport_metrics.dart';
 part 'engine/dom_canvas.dart';
 part 'engine/dom_renderer.dart';
 part 'engine/engine_canvas.dart';
 part 'engine/frame_reference.dart';
 part 'engine/history.dart';
+part 'engine/html/backdrop_filter.dart';
+part 'engine/html/canvas.dart';
+part 'engine/html/clip.dart';
+part 'engine/html/debug_canvas_reuse_overlay.dart';
+part 'engine/html/image_filter.dart';
+part 'engine/html/offset.dart';
+part 'engine/html/opacity.dart';
+part 'engine/html/painting.dart';
+part 'engine/html/path/conic.dart';
+part 'engine/html/path/cubic.dart';
+part 'engine/html/path/path.dart';
+part 'engine/html/path/path_metrics.dart';
+part 'engine/html/path/path_ref.dart';
+part 'engine/html/path/path_to_svg.dart';
+part 'engine/html/path/path_utils.dart';
+part 'engine/html/path/path_windings.dart';
+part 'engine/html/path/tangent.dart';
+part 'engine/html/picture.dart';
+part 'engine/html/platform_view.dart';
+part 'engine/html/recording_canvas.dart';
+part 'engine/html/render_vertices.dart';
+part 'engine/html/scene.dart';
+part 'engine/html/scene_builder.dart';
+part 'engine/html/shader.dart';
+part 'engine/html/surface.dart';
+part 'engine/html/surface_stats.dart';
+part 'engine/html/transform.dart';
 part 'engine/html_image_codec.dart';
 part 'engine/keyboard.dart';
 part 'engine/mouse_cursor.dart';
@@ -91,33 +118,6 @@ part 'engine/services/message_codec.dart';
 part 'engine/services/message_codecs.dart';
 part 'engine/services/serialization.dart';
 part 'engine/shadow.dart';
-part 'engine/surface/backdrop_filter.dart';
-part 'engine/surface/canvas.dart';
-part 'engine/surface/clip.dart';
-part 'engine/surface/debug_canvas_reuse_overlay.dart';
-part 'engine/surface/image_filter.dart';
-part 'engine/surface/offset.dart';
-part 'engine/surface/opacity.dart';
-part 'engine/surface/painting.dart';
-part 'engine/surface/path/conic.dart';
-part 'engine/surface/path/cubic.dart';
-part 'engine/surface/path/path.dart';
-part 'engine/surface/path/path_metrics.dart';
-part 'engine/surface/path/path_ref.dart';
-part 'engine/surface/path/path_to_svg.dart';
-part 'engine/surface/path/path_utils.dart';
-part 'engine/surface/path/path_windings.dart';
-part 'engine/surface/path/tangent.dart';
-part 'engine/surface/picture.dart';
-part 'engine/surface/platform_view.dart';
-part 'engine/surface/recording_canvas.dart';
-part 'engine/surface/render_vertices.dart';
-part 'engine/surface/scene.dart';
-part 'engine/surface/scene_builder.dart';
-part 'engine/surface/shader.dart';
-part 'engine/surface/surface.dart';
-part 'engine/surface/surface_stats.dart';
-part 'engine/surface/transform.dart';
 part 'engine/test_embedding.dart';
 part 'engine/text/font_collection.dart';
 part 'engine/text/line_break_properties.dart';
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvas.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvaskit_api.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
similarity index 99%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvaskit_api.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
index 3f6cfa54b53..0690e52138d 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvaskit_api.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
@@ -17,7 +17,7 @@ late CanvasKit canvasKit;
 /// static APIs.
 ///
 /// See, e.g. [SkPaint].
-@JS('window.flutter_canvas_kit')
+@JS('window.flutterCanvasKit')
 external set windowFlutterCanvasKit(CanvasKit value);
 
 @JS()
@@ -105,7 +105,7 @@ class CanvasKitInitPromise {
   external void then(CanvasKitInitCallback callback);
 }
 
-@JS('window.flutter_canvas_kit.SkColorSpace.SRGB')
+@JS('window.flutterCanvasKit.SkColorSpace.SRGB')
 external SkColorSpace get SkColorSpaceSRGB;
 
 @JS()
@@ -709,7 +709,7 @@ class SkShader {
 // with `new`. Also in Dart you can't write this:
 //
 //     external SkPaint SkPaint();
-@JS('window.flutter_canvas_kit.SkPaint')
+@JS('window.flutterCanvasKit.SkPaint')
 class SkPaint {
   // TODO(yjbanov): implement invertColors, see paint.cc
   external SkPaint();
@@ -845,7 +845,7 @@ external _NativeFloat32ArrayType get _nativeFloat32ArrayType;
 @JS()
 class _NativeFloat32ArrayType {}
 
-@JS('window.flutter_canvas_kit.Malloc')
+@JS('window.flutterCanvasKit.Malloc')
 external SkFloat32List _mallocFloat32List(
   _NativeFloat32ArrayType float32ListType,
   int size,
@@ -864,7 +864,7 @@ SkFloat32List mallocFloat32List(int size) {
 /// The [list] is no longer usable after calling this function.
 ///
 /// Use this function to free lists owned by the engine.
-@JS('window.flutter_canvas_kit.Free')
+@JS('window.flutterCanvasKit.Free')
 external void freeFloat32List(SkFloat32List list);
 
 /// Wraps a [Float32List] backed by WASM memory.
@@ -960,7 +960,7 @@ List<Float32List> encodeRawColorList(Int32List rawColors) {
   return toSkFloatColorList(colors);
 }
 
-@JS('window.flutter_canvas_kit.SkPath')
+@JS('window.flutterCanvasKit.SkPath')
 class SkPath {
   external SkPath([SkPath? other]);
   external void setFillType(SkFillType fillType);
@@ -1092,7 +1092,7 @@ class SkPath {
   );
 }
 
-@JS('window.flutter_canvas_kit.SkContourMeasureIter')
+@JS('window.flutterCanvasKit.SkContourMeasureIter')
 class SkContourMeasureIter {
   external SkContourMeasureIter(SkPath path, bool forceClosed, int startIndex);
   external SkContourMeasure? next();
@@ -1246,7 +1246,7 @@ Uint16List toUint16List(List<int> ints) {
   return result;
 }
 
-@JS('window.flutter_canvas_kit.SkPictureRecorder')
+@JS('window.flutterCanvasKit.SkPictureRecorder')
 class SkPictureRecorder {
   external SkPictureRecorder();
   external SkCanvas beginRecording(SkRect bounds);
@@ -1519,7 +1519,7 @@ class SkFontMgr {
   external void delete();
 }
 
-@JS('window.flutter_canvas_kit.TypefaceFontProvider')
+@JS('window.flutterCanvasKit.TypefaceFontProvider')
 class TypefaceFontProvider extends SkFontMgr {
   external TypefaceFontProvider();
   external void registerFont(Uint8List font, String family);
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvas_kit_canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/canvas_kit_canvas.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/color_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/color_filter.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/embedded_views.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/embedded_views.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/fonts.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/fonts.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/image.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/image.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/image_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/image_filter.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/initialization.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/initialization.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/layer.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/layer.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/layer.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/layer.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/layer_scene_builder.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/layer_scene_builder.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/layer_tree.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/layer_tree.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/mask_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/mask_filter.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/n_way_canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/n_way_canvas.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/n_way_canvas.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/n_way_canvas.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/painting.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/painting.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/path.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/path.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/picture.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/picture.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/picture.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/picture.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/picture_recorder.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/picture_recorder.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/platform_message.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/platform_message.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/raster_cache.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/raster_cache.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/rasterizer.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/rasterizer.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/shader.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/shader.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/skia_object_cache.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/skia_object_cache.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/surface.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/surface.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/text.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/text.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/util.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/util.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/vertices.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/vertices.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/viewport_metrics.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/compositor/viewport_metrics.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/backdrop_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/backdrop_filter.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/canvas.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/canvas.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/canvas.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/clip.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/clip.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/clip.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/clip.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/debug_canvas_reuse_overlay.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/debug_canvas_reuse_overlay.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/image_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/image_filter.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/image_filter.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/image_filter.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/offset.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/offset.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/offset.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/offset.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/opacity.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/opacity.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/opacity.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/opacity.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/painting.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/painting.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/painting.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/painting.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/conic.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/conic.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/conic.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/conic.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/cubic.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/cubic.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/cubic.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/cubic.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_metrics.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_metrics.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_ref.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_ref.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_ref.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_ref.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_to_svg.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_to_svg.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_utils.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_utils.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_utils.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_utils.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_windings.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_windings.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/path_windings.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/path_windings.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/tangent.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/path/tangent.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/path/tangent.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/path/tangent.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/picture.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/picture.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/picture.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/picture.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/platform_view.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/platform_view.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/recording_canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/recording_canvas.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/render_vertices.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/render_vertices.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/scene.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/scene.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/scene.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/scene.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/scene_builder.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/scene_builder.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/shader.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/shader.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/shader.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/shader.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/surface.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/surface.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/surface.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/surface.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/surface_stats.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/surface_stats.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/surface_stats.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/surface_stats.dart
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/surface/transform.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html/transform.dart
similarity index 100%
rename from engine/src/flutter/lib/web_ui/lib/src/engine/surface/transform.dart
rename to engine/src/flutter/lib/web_ui/lib/src/engine/html/transform.dart