diff --git a/src/Web/Avalonia.Web/AvaloniaView.cs b/src/Web/Avalonia.Web/AvaloniaView.cs
index 6cc5e42902..1ed1dad3e7 100644
--- a/src/Web/Avalonia.Web/AvaloniaView.cs
+++ b/src/Web/Avalonia.Web/AvaloniaView.cs
@@ -9,6 +9,8 @@ using Avalonia.Input.TextInput;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Avalonia.Web.Interop;
+using Avalonia.Web.Skia;
+
 using SkiaSharp;
 
 namespace Avalonia.Web
diff --git a/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs b/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs
index 02d9b01319..091ab3f68c 100644
--- a/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs
+++ b/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs
@@ -3,6 +3,7 @@ using System;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Media;
+using Avalonia.Web.Skia;
 
 namespace Avalonia.Web
 {
diff --git a/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs b/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs
index d52d7164ce..d08c153966 100644
--- a/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs
+++ b/src/Web/Avalonia.Web/BrowserTopLevelImpl.cs
@@ -11,6 +11,7 @@ using Avalonia.Platform;
 using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
+using Avalonia.Web.Skia;
 using Avalonia.Web.Storage;
 
 namespace Avalonia.Web
diff --git a/src/Web/Avalonia.Web/BrowserSkiaGpu.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpu.cs
similarity index 95%
rename from src/Web/Avalonia.Web/BrowserSkiaGpu.cs
rename to src/Web/Avalonia.Web/Skia/BrowserSkiaGpu.cs
index 20765b5449..f80838232b 100644
--- a/src/Web/Avalonia.Web/BrowserSkiaGpu.cs
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpu.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Avalonia.Skia;
 
-namespace Avalonia.Web
+namespace Avalonia.Web.Skia
 {
     public class BrowserSkiaGpu : ISkiaGpu
     {
diff --git a/src/Web/Avalonia.Web/BrowserSkiaGpuRenderSession.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderSession.cs
similarity index 97%
rename from src/Web/Avalonia.Web/BrowserSkiaGpuRenderSession.cs
rename to src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderSession.cs
index 022ed20022..a7f7d9db3d 100644
--- a/src/Web/Avalonia.Web/BrowserSkiaGpuRenderSession.cs
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderSession.cs
@@ -1,7 +1,7 @@
 using Avalonia.Skia;
 using SkiaSharp;
 
-namespace Avalonia.Web
+namespace Avalonia.Web.Skia
 {
     internal class BrowserSkiaGpuRenderSession : ISkiaGpuRenderSession
     {
diff --git a/src/Web/Avalonia.Web/BrowserSkiaGpuRenderTarget.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderTarget.cs
similarity index 97%
rename from src/Web/Avalonia.Web/BrowserSkiaGpuRenderTarget.cs
rename to src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderTarget.cs
index 644ebf19c8..dba9b34166 100644
--- a/src/Web/Avalonia.Web/BrowserSkiaGpuRenderTarget.cs
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaGpuRenderTarget.cs
@@ -1,7 +1,7 @@
 using Avalonia.Skia;
 using SkiaSharp;
 
-namespace Avalonia.Web
+namespace Avalonia.Web.Skia
 {
     internal class BrowserSkiaGpuRenderTarget : ISkiaGpuRenderTarget
     {
diff --git a/src/Web/Avalonia.Web/BrowserSkiaRasterSurface.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaRasterSurface.cs
similarity index 98%
rename from src/Web/Avalonia.Web/BrowserSkiaRasterSurface.cs
rename to src/Web/Avalonia.Web/Skia/BrowserSkiaRasterSurface.cs
index 0946e72d1d..c7005583ac 100644
--- a/src/Web/Avalonia.Web/BrowserSkiaRasterSurface.cs
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaRasterSurface.cs
@@ -5,7 +5,7 @@ using Avalonia.Platform;
 using Avalonia.Skia;
 using SkiaSharp;
 
-namespace Avalonia.Web
+namespace Avalonia.Web.Skia
 {
     internal class BrowserSkiaRasterSurface : IBrowserSkiaSurface, IFramebufferPlatformSurface, IDisposable
     {
diff --git a/src/Web/Avalonia.Web/BrowserSkiaSurface.cs b/src/Web/Avalonia.Web/Skia/BrowserSkiaSurface.cs
similarity index 95%
rename from src/Web/Avalonia.Web/BrowserSkiaSurface.cs
rename to src/Web/Avalonia.Web/Skia/BrowserSkiaSurface.cs
index 6970cb1f22..27a206c0ec 100644
--- a/src/Web/Avalonia.Web/BrowserSkiaSurface.cs
+++ b/src/Web/Avalonia.Web/Skia/BrowserSkiaSurface.cs
@@ -1,7 +1,7 @@
 using Avalonia.Web.Interop;
 using SkiaSharp;
 
-namespace Avalonia.Web
+namespace Avalonia.Web.Skia
 {
     internal class BrowserSkiaSurface : IBrowserSkiaSurface
     {
@@ -14,7 +14,7 @@ namespace Avalonia.Web
             Scaling = scaling;
             Origin = origin;
         }
-        
+
         public SKColorType ColorType { get; set; }
 
         public PixelSize Size { get; set; }
diff --git a/src/Web/Avalonia.Web/IBrowserSkiaSurface.cs b/src/Web/Avalonia.Web/Skia/IBrowserSkiaSurface.cs
similarity index 84%
rename from src/Web/Avalonia.Web/IBrowserSkiaSurface.cs
rename to src/Web/Avalonia.Web/Skia/IBrowserSkiaSurface.cs
index 4b492f6b17..7301ae45cd 100644
--- a/src/Web/Avalonia.Web/IBrowserSkiaSurface.cs
+++ b/src/Web/Avalonia.Web/Skia/IBrowserSkiaSurface.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Web
+namespace Avalonia.Web.Skia
 {
     internal interface IBrowserSkiaSurface
     {