diff --git a/src/SixLabors.Core/Constants.cs b/src/ImageSharp/Constants.cs
similarity index 100%
rename from src/SixLabors.Core/Constants.cs
rename to src/ImageSharp/Constants.cs
diff --git a/src/SixLabors.Core/GeometryUtilities.cs b/src/ImageSharp/GeometryUtilities.cs
similarity index 100%
rename from src/SixLabors.Core/GeometryUtilities.cs
rename to src/ImageSharp/GeometryUtilities.cs
diff --git a/src/SixLabors.Core/Memory/AllocationOptions.cs b/src/ImageSharp/Memory/Allocators/AllocationOptions.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/AllocationOptions.cs
rename to src/ImageSharp/Memory/Allocators/AllocationOptions.cs
diff --git a/src/SixLabors.Core/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs b/src/ImageSharp/Memory/Allocators/ArrayPoolMemoryAllocator.Buffer{T}.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs
rename to src/ImageSharp/Memory/Allocators/ArrayPoolMemoryAllocator.Buffer{T}.cs
diff --git a/src/SixLabors.Core/Memory/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs b/src/ImageSharp/Memory/Allocators/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs
rename to src/ImageSharp/Memory/Allocators/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs
diff --git a/src/SixLabors.Core/Memory/ArrayPoolMemoryAllocator.cs b/src/ImageSharp/Memory/Allocators/ArrayPoolMemoryAllocator.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/ArrayPoolMemoryAllocator.cs
rename to src/ImageSharp/Memory/Allocators/ArrayPoolMemoryAllocator.cs
diff --git a/src/SixLabors.Core/Memory/IManagedByteBuffer.cs b/src/ImageSharp/Memory/Allocators/IManagedByteBuffer.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/IManagedByteBuffer.cs
rename to src/ImageSharp/Memory/Allocators/IManagedByteBuffer.cs
diff --git a/src/SixLabors.Core/Memory/Internals/BasicArrayBuffer.cs b/src/ImageSharp/Memory/Allocators/Internals/BasicArrayBuffer.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/Internals/BasicArrayBuffer.cs
rename to src/ImageSharp/Memory/Allocators/Internals/BasicArrayBuffer.cs
diff --git a/src/SixLabors.Core/Memory/Internals/BasicByteBuffer.cs b/src/ImageSharp/Memory/Allocators/Internals/BasicByteBuffer.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/Internals/BasicByteBuffer.cs
rename to src/ImageSharp/Memory/Allocators/Internals/BasicByteBuffer.cs
diff --git a/src/SixLabors.Core/Memory/Internals/ManagedBufferBase.cs b/src/ImageSharp/Memory/Allocators/Internals/ManagedBufferBase.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/Internals/ManagedBufferBase.cs
rename to src/ImageSharp/Memory/Allocators/Internals/ManagedBufferBase.cs
diff --git a/src/SixLabors.Core/Memory/MemoryAllocator.cs b/src/ImageSharp/Memory/Allocators/MemoryAllocator.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/MemoryAllocator.cs
rename to src/ImageSharp/Memory/Allocators/MemoryAllocator.cs
diff --git a/src/SixLabors.Core/Memory/SimpleGcMemoryAllocator.cs b/src/ImageSharp/Memory/Allocators/SimpleGcMemoryAllocator.cs
similarity index 100%
rename from src/SixLabors.Core/Memory/SimpleGcMemoryAllocator.cs
rename to src/ImageSharp/Memory/Allocators/SimpleGcMemoryAllocator.cs
diff --git a/src/SixLabors.Core/Primitives/Matrix3x2Extensions.cs b/src/ImageSharp/Primitives/Matrix3x2Extensions.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/Matrix3x2Extensions.cs
rename to src/ImageSharp/Primitives/Matrix3x2Extensions.cs
diff --git a/src/SixLabors.Core/Primitives/Point.cs b/src/ImageSharp/Primitives/Point.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/Point.cs
rename to src/ImageSharp/Primitives/Point.cs
diff --git a/src/SixLabors.Core/Primitives/PointF.cs b/src/ImageSharp/Primitives/PointF.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/PointF.cs
rename to src/ImageSharp/Primitives/PointF.cs
diff --git a/src/SixLabors.Core/Primitives/Rectangle.cs b/src/ImageSharp/Primitives/Rectangle.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/Rectangle.cs
rename to src/ImageSharp/Primitives/Rectangle.cs
diff --git a/src/SixLabors.Core/Primitives/RectangleF.cs b/src/ImageSharp/Primitives/RectangleF.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/RectangleF.cs
rename to src/ImageSharp/Primitives/RectangleF.cs
diff --git a/src/SixLabors.Core/Primitives/Size.cs b/src/ImageSharp/Primitives/Size.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/Size.cs
rename to src/ImageSharp/Primitives/Size.cs
diff --git a/src/SixLabors.Core/Primitives/SizeF.cs b/src/ImageSharp/Primitives/SizeF.cs
similarity index 100%
rename from src/SixLabors.Core/Primitives/SizeF.cs
rename to src/ImageSharp/Primitives/SizeF.cs