diff --git a/ImageSharp.sln b/ImageSharp.sln
index 9c729493b2..223d7c3c16 100644
--- a/ImageSharp.sln
+++ b/ImageSharp.sln
@@ -1,4 +1,4 @@
-
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
@@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Benchmarks", "te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Sandbox46", "tests\ImageSharp.Sandbox46\ImageSharp.Sandbox46.csproj", "{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Formats.Tiff.Tests", "tests\ImageSharp.Formats.Tiff.Tests\ImageSharp.Formats.Tiff.Tests.csproj", "{F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -127,6 +129,18 @@ Global
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x64.Build.0 = Release|Any CPU
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x86.ActiveCfg = Release|Any CPU
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB}.Release|x86.Build.0 = Release|Any CPU
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x64.ActiveCfg = Debug|x64
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x64.Build.0 = Debug|x64
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x86.ActiveCfg = Debug|x86
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Debug|x86.Build.0 = Debug|x86
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x64.ActiveCfg = Release|x64
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x64.Build.0 = Release|x64
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x86.ActiveCfg = Release|x86
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -139,5 +153,6 @@ Global
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
{2BF743D8-2A06-412D-96D7-F448F00C5EA5} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
{96188137-5FA6-4924-AB6E-4EFF79C6E0BB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
+ {F74D25AB-1E5C-4272-9FD3-6DBBD3E207AC} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
EndGlobalSection
EndGlobal
diff --git a/src/ImageSharp.Formats.Tiff/AssemblyInfo.cs b/src/ImageSharp.Formats.Tiff/AssemblyInfo.cs
deleted file mode 100644
index 4d1cbfe55d..0000000000
--- a/src/ImageSharp.Formats.Tiff/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-//
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
-// Ensure the internals can be tested.
-[assembly: InternalsVisibleTo("ImageSharp.Formats.Tiff.Tests")]
\ No newline at end of file
diff --git a/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj b/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj
deleted file mode 100644
index 2df493b7d8..0000000000
--- a/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- netstandard1.1
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffCompression.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffCompression.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffCompression.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffConstants.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffConstants.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffExtraSamples.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffExtraSamples.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffExtraSamples.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffFillOrder.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffFillOrder.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffFillOrder.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffNewSubfileType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffNewSubfileType.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffNewSubfileType.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffOrientation.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffOrientation.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffOrientation.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffPhotometricInterpretation.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffPhotometricInterpretation.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffPhotometricInterpretation.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffPlanarConfiguration.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffPlanarConfiguration.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffPlanarConfiguration.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffResolutionUnit.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffResolutionUnit.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffResolutionUnit.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffSubfileType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffSubfileType.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffSubfileType.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffTags.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffTags.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffTags.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffThreshholding.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffThreshholding.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffThreshholding.cs
diff --git a/src/ImageSharp.Formats.Tiff/Constants/TiffType.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffType.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/Constants/TiffType.cs
rename to src/ImageSharp/Formats/Tiff/Constants/TiffType.cs
diff --git a/src/ImageSharp.Formats.Tiff/ITiffEncoderOptions.cs b/src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/ITiffEncoderOptions.cs
rename to src/ImageSharp/Formats/Tiff/ITiffEncoderOptions.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffDecoder.cs b/src/ImageSharp/Formats/Tiff/TiffDecoder.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffDecoder.cs
rename to src/ImageSharp/Formats/Tiff/TiffDecoder.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffDecoderCore.cs
rename to src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffEncoder.cs b/src/ImageSharp/Formats/Tiff/TiffEncoder.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffEncoder.cs
rename to src/ImageSharp/Formats/Tiff/TiffEncoder.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffEncoderOptions.cs b/src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffEncoderOptions.cs
rename to src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffFormat.cs b/src/ImageSharp/Formats/Tiff/TiffFormat.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffFormat.cs
rename to src/ImageSharp/Formats/Tiff/TiffFormat.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffIfd/TiffIfd.cs b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffIfd/TiffIfd.cs
rename to src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfd.cs
diff --git a/src/ImageSharp.Formats.Tiff/TiffIfd/TiffIfdEntry.cs b/src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs
similarity index 100%
rename from src/ImageSharp.Formats.Tiff/TiffIfd/TiffIfdEntry.cs
rename to src/ImageSharp/Formats/Tiff/TiffIfd/TiffIfdEntry.cs
diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs
index 252ef3eae0..46ed22e4f9 100644
--- a/src/Shared/AssemblyInfo.Common.cs
+++ b/src/Shared/AssemblyInfo.Common.cs
@@ -37,4 +37,5 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("ImageSharp.Drawing")]
[assembly: InternalsVisibleTo("ImageSharp.Benchmarks")]
[assembly: InternalsVisibleTo("ImageSharp.Tests")]
-[assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("ImageSharp.Formats.Tiff.Tests")]
+[assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj b/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj
index 30ec6b75f5..dae9c9db31 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj
+++ b/tests/ImageSharp.Formats.Tiff.Tests/ImageSharp.Formats.Tiff.Tests.csproj
@@ -2,18 +2,18 @@
Exe
- netcoreapp1.0
+ netcoreapp1.1
-
+
+
+
+
-
-
-
-
+