diff --git a/src/Squidex.Infrastructure/Images/IAssetStorage.cs b/src/Squidex.Infrastructure/Assets/IAssetStorage.cs
similarity index 93%
rename from src/Squidex.Infrastructure/Images/IAssetStorage.cs
rename to src/Squidex.Infrastructure/Assets/IAssetStorage.cs
index 0a5dfdf33..c152601cc 100644
--- a/src/Squidex.Infrastructure/Images/IAssetStorage.cs
+++ b/src/Squidex.Infrastructure/Assets/IAssetStorage.cs
@@ -10,7 +10,7 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Squidex.Infrastructure.Images
+namespace Squidex.Infrastructure.Assets
 {
     public interface IAssetStorage
     {
diff --git a/src/Squidex.Infrastructure/Images/IThumbnailGenerator.cs b/src/Squidex.Infrastructure/Assets/IAssetThumbnailGenerator.cs
similarity index 79%
rename from src/Squidex.Infrastructure/Images/IThumbnailGenerator.cs
rename to src/Squidex.Infrastructure/Assets/IAssetThumbnailGenerator.cs
index 66b22eceb..c974a877f 100644
--- a/src/Squidex.Infrastructure/Images/IThumbnailGenerator.cs
+++ b/src/Squidex.Infrastructure/Assets/IAssetThumbnailGenerator.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  IThumbnailGenerator.cs
+//  IAssetThumbnailGenerator.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
@@ -9,9 +9,9 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Squidex.Infrastructure.Images
+namespace Squidex.Infrastructure.Assets
 {
-    public interface IThumbnailGenerator
+    public interface IAssetThumbnailGenerator
     {
         Task<Stream> GetThumbnailOrNullAsync(Stream input, int dimension);
     }
diff --git a/src/Squidex.Infrastructure/Images/ImageSharp/ImageSharpThumbnailGenerator.cs b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs
similarity index 83%
rename from src/Squidex.Infrastructure/Images/ImageSharp/ImageSharpThumbnailGenerator.cs
rename to src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs
index 54c0af791..f6aa05e3a 100644
--- a/src/Squidex.Infrastructure/Images/ImageSharp/ImageSharpThumbnailGenerator.cs
+++ b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs
@@ -1,5 +1,5 @@
 // ==========================================================================
-//  ImageSharpThumbnailGenerator.cs
+//  ImageSharpAssetThumbnailGenerator.cs
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex Group
@@ -12,11 +12,11 @@ using ImageSharp;
 using ImageSharp.Formats;
 using ImageSharp.Processing;
 
-namespace Squidex.Infrastructure.Images.ImageSharp
+namespace Squidex.Infrastructure.Assets.ImageSharp
 {
-    public sealed class ImageSharpThumbnailGenerator : IThumbnailGenerator
+    public sealed class ImageSharpAssetThumbnailGenerator : IAssetThumbnailGenerator
     {
-        public ImageSharpThumbnailGenerator()
+        public ImageSharpAssetThumbnailGenerator()
         {
             Configuration.Default.AddImageFormat(new JpegFormat());
             Configuration.Default.AddImageFormat(new PngFormat());
diff --git a/src/Squidex.Infrastructure/Images/Physical/PhysicalAssetStorage.cs b/src/Squidex.Infrastructure/Assets/Physical/PhysicalAssetStorage.cs
similarity index 97%
rename from src/Squidex.Infrastructure/Images/Physical/PhysicalAssetStorage.cs
rename to src/Squidex.Infrastructure/Assets/Physical/PhysicalAssetStorage.cs
index fe3fe89f1..30945aa3a 100644
--- a/src/Squidex.Infrastructure/Images/Physical/PhysicalAssetStorage.cs
+++ b/src/Squidex.Infrastructure/Assets/Physical/PhysicalAssetStorage.cs
@@ -10,7 +10,7 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Squidex.Infrastructure.Images.Physical
+namespace Squidex.Infrastructure.Assets.Physical
 {
     public sealed class PhysicalAssetStorage : IAssetStorage, IExternalSystem
     {
diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
index 42928d91f..c845e08be 100644
--- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
+++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
@@ -8,9 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ImageSharp" Version="1.0.0-alpha4-00031" />
-    <PackageReference Include="ImageSharp.Formats.Jpeg" Version="1.0.0-alpha2-00158" />
-    <PackageReference Include="ImageSharp.Formats.Png" Version="1.0.0-alpha2-00154" />
-    <PackageReference Include="ImageSharp.Processing" Version="1.0.0-alpha2-00146" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.2-beta2" />
diff --git a/src/Squidex/Controllers/Api/Assets/AssetsController.cs b/src/Squidex/Controllers/Api/Assets/AssetsController.cs
index 6d7bca1a8..083064063 100644
--- a/src/Squidex/Controllers/Api/Assets/AssetsController.cs
+++ b/src/Squidex/Controllers/Api/Assets/AssetsController.cs
@@ -17,7 +17,7 @@ using NSwag.Annotations;
 using Squidex.Core.Identity;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Commands;
-using Squidex.Infrastructure.Images;
+using Squidex.Infrastructure.Assets;
 using Squidex.Pipeline;
 using Squidex.Write.Assets.Commands;
 
@@ -34,12 +34,12 @@ namespace Squidex.Controllers.Api.Assets
     {
         private readonly IAssetStorage assetStorage;
         private readonly AssetConfig assetsConfig;
-        private readonly IThumbnailGenerator thumbnailGenerator;
+        private readonly IAssetThumbnailGenerator thumbnailGenerator;
 
         public AssetsController(
             ICommandBus commandBus, 
             IAssetStorage assetStorage, 
-            IThumbnailGenerator thumbnailGenerator,
+            IAssetThumbnailGenerator thumbnailGenerator,
             IOptions<AssetConfig> assetsConfig) 
             : base(commandBus)
         {