diff --git a/ReFuel.StbImage.sln b/ReFuel.StbImage.sln
index e50073f..0ef347a 100644
--- a/ReFuel.StbImage.sln
+++ b/ReFuel.StbImage.sln
@@ -3,20 +3,32 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReFuel.StbImage", "ReFuel.StbImage.csproj", "{413ACBF4-3851-416F-B2A2-F7157EC306B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReFuel.StbImage", "ReFuel.StbImage\ReFuel.StbImage.csproj", "{EB001CC8-6821-4579-BD5D-27C56A3C121E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Release|x64.Build.0 = Release|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB001CC8-6821-4579-BD5D-27C56A3C121E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{413ACBF4-3851-416F-B2A2-F7157EC306B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{413ACBF4-3851-416F-B2A2-F7157EC306B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{413ACBF4-3851-416F-B2A2-F7157EC306B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{413ACBF4-3851-416F-B2A2-F7157EC306B2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
 EndGlobal
diff --git a/ReFuel.StbImage.csproj b/ReFuel.StbImage/ReFuel.StbImage.csproj
similarity index 100%
rename from ReFuel.StbImage.csproj
rename to ReFuel.StbImage/ReFuel.StbImage.csproj
diff --git a/StbImage.cs b/ReFuel.StbImage/StbImage.cs
similarity index 100%
rename from StbImage.cs
rename to ReFuel.StbImage/StbImage.cs
diff --git a/Stbi.Manual.cs b/ReFuel.StbImage/Stbi.Manual.cs
similarity index 100%
rename from Stbi.Manual.cs
rename to ReFuel.StbImage/Stbi.Manual.cs
diff --git a/Stbi.cs b/ReFuel.StbImage/Stbi.cs
similarity index 100%
rename from Stbi.cs
rename to ReFuel.StbImage/Stbi.cs
diff --git a/StbiImageFormat.cs b/ReFuel.StbImage/StbiImageFormat.cs
similarity index 100%
rename from StbiImageFormat.cs
rename to ReFuel.StbImage/StbiImageFormat.cs
diff --git a/StbiStreamWrapper.cs b/ReFuel.StbImage/StbiStreamWrapper.cs
similarity index 100%
rename from StbiStreamWrapper.cs
rename to ReFuel.StbImage/StbiStreamWrapper.cs
diff --git a/StbiWrite.cs b/ReFuel.StbImage/StbiWrite.cs
similarity index 100%
rename from StbiWrite.cs
rename to ReFuel.StbImage/StbiWrite.cs
diff --git a/etc/ReFuel.StbImage.Common.props b/etc/ReFuel.StbImage.Common.props
new file mode 100644
index 0000000..e69de29