diff --git a/src/ImageSharp/Drawing/Brushes/Brushes.cs b/src/ImageSharp.Drawing/Brushes/Brushes.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/Brushes.cs
rename to src/ImageSharp.Drawing/Brushes/Brushes.cs
diff --git a/src/ImageSharp/Drawing/Brushes/Brushes{TColor}.cs b/src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/Brushes{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs
diff --git a/src/ImageSharp/Drawing/Brushes/IBrush.cs b/src/ImageSharp.Drawing/Brushes/IBrush.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/IBrush.cs
rename to src/ImageSharp.Drawing/Brushes/IBrush.cs
diff --git a/src/ImageSharp/Drawing/Brushes/ImageBrush.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/ImageBrush.cs
rename to src/ImageSharp.Drawing/Brushes/ImageBrush.cs
diff --git a/src/ImageSharp/Drawing/Brushes/ImageBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/ImageBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs
diff --git a/src/ImageSharp/Drawing/Brushes/PatternBrush.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/PatternBrush.cs
rename to src/ImageSharp.Drawing/Brushes/PatternBrush.cs
diff --git a/src/ImageSharp/Drawing/Brushes/PatternBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/PatternBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs
diff --git a/src/ImageSharp/Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/Processors/BrushApplicator.cs
rename to src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
diff --git a/src/ImageSharp/Drawing/Brushes/RecolorBrush.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/RecolorBrush.cs
rename to src/ImageSharp.Drawing/Brushes/RecolorBrush.cs
diff --git a/src/ImageSharp/Drawing/Brushes/RecolorBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/RecolorBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs
diff --git a/src/ImageSharp/Drawing/Brushes/SolidBrush.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/SolidBrush.cs
rename to src/ImageSharp.Drawing/Brushes/SolidBrush.cs
diff --git a/src/ImageSharp/Drawing/Brushes/SolidBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Brushes/SolidBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs
diff --git a/src/ImageSharp/Drawing/DrawImage.cs b/src/ImageSharp.Drawing/DrawImage.cs
similarity index 100%
rename from src/ImageSharp/Drawing/DrawImage.cs
rename to src/ImageSharp.Drawing/DrawImage.cs
diff --git a/src/ImageSharp/Drawing/DrawPath.cs b/src/ImageSharp.Drawing/DrawPath.cs
similarity index 100%
rename from src/ImageSharp/Drawing/DrawPath.cs
rename to src/ImageSharp.Drawing/DrawPath.cs
diff --git a/src/ImageSharp/Drawing/Drawable.cs b/src/ImageSharp.Drawing/Drawable.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Drawable.cs
rename to src/ImageSharp.Drawing/Drawable.cs
diff --git a/src/ImageSharp/Drawing/FillRegion.cs b/src/ImageSharp.Drawing/FillRegion.cs
similarity index 100%
rename from src/ImageSharp/Drawing/FillRegion.cs
rename to src/ImageSharp.Drawing/FillRegion.cs
diff --git a/src/ImageSharp/Drawing/GraphicsOptions.cs b/src/ImageSharp.Drawing/GraphicsOptions.cs
similarity index 100%
rename from src/ImageSharp/Drawing/GraphicsOptions.cs
rename to src/ImageSharp.Drawing/GraphicsOptions.cs
diff --git a/src/ImageSharp/Drawing/Pens/IPen.cs b/src/ImageSharp.Drawing/Pens/IPen.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/IPen.cs
rename to src/ImageSharp.Drawing/Pens/IPen.cs
diff --git a/src/ImageSharp/Drawing/Pens/Pen.cs b/src/ImageSharp.Drawing/Pens/Pen.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/Pen.cs
rename to src/ImageSharp.Drawing/Pens/Pen.cs
diff --git a/src/ImageSharp/Drawing/Pens/Pens.cs b/src/ImageSharp.Drawing/Pens/Pens.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/Pens.cs
rename to src/ImageSharp.Drawing/Pens/Pens.cs
diff --git a/src/ImageSharp/Drawing/Pens/Pens{TColor}.cs b/src/ImageSharp.Drawing/Pens/Pens{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/Pens{TColor}.cs
rename to src/ImageSharp.Drawing/Pens/Pens{TColor}.cs
diff --git a/src/ImageSharp/Drawing/Pens/Pen{TColor}.cs b/src/ImageSharp.Drawing/Pens/Pen{TColor}.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/Pen{TColor}.cs
rename to src/ImageSharp.Drawing/Pens/Pen{TColor}.cs
diff --git a/src/ImageSharp/Drawing/Pens/Processors/ColoredPointInfo.cs b/src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/Processors/ColoredPointInfo.cs
rename to src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs
diff --git a/src/ImageSharp/Drawing/Pens/Processors/PenApplicator.cs b/src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Pens/Processors/PenApplicator.cs
rename to src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs
diff --git a/src/ImageSharp/Drawing/PointInfo.cs b/src/ImageSharp.Drawing/PointInfo.cs
similarity index 100%
rename from src/ImageSharp/Drawing/PointInfo.cs
rename to src/ImageSharp.Drawing/PointInfo.cs
diff --git a/src/ImageSharp/Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Processors/DrawImageProcessor.cs
rename to src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
diff --git a/src/ImageSharp/Drawing/Processors/DrawPathProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Processors/DrawPathProcessor.cs
rename to src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs
diff --git a/src/ImageSharp/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Processors/FillProcessor.cs
rename to src/ImageSharp.Drawing/Processors/FillProcessor.cs
diff --git a/src/ImageSharp/Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Processors/FillRegionProcessor.cs
rename to src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
diff --git a/src/ImageSharp/Drawing/Region.cs b/src/ImageSharp.Drawing/Region.cs
similarity index 100%
rename from src/ImageSharp/Drawing/Region.cs
rename to src/ImageSharp.Drawing/Region.cs
diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs
index 11f16769b..252ef3eae 100644
--- a/src/Shared/AssemblyInfo.Common.cs
+++ b/src/Shared/AssemblyInfo.Common.cs
@@ -33,7 +33,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: AssemblyInformationalVersion("1.0.0.0")]
 
-// Ensure the internals can be tested.
+// Ensure the internals can be built and tested.
+[assembly: InternalsVisibleTo("ImageSharp.Drawing")]
 [assembly: InternalsVisibleTo("ImageSharp.Benchmarks")]
 [assembly: InternalsVisibleTo("ImageSharp.Tests")]
 [assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]
\ No newline at end of file