diff --git a/Examples.sln b/Examples.sln
new file mode 100644
index 0000000000..297e6627bd
--- /dev/null
+++ b/Examples.sln
@@ -0,0 +1,81 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1705
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApiTrace", "examples\api_trace\ApiTraceAddon.vcxproj", "{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GenericDepth", "examples\generic_depth\GenericDepthAddon.vcxproj", "{3BDC6D1C-086F-4B99-BE68-86146FC74D35}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderModDump", "examples\shadermod_dump\ShaderModDumpAddon.vcxproj", "{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderModReplace", "examples\shadermod_replace\ShaderModReplaceAddon.vcxproj", "{D80FD73E-5195-462A-B963-9A1CE30E2944}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureModDump", "examples\texturemod_dump\TextureModDumpAddon.vcxproj", "{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureModReplace", "examples\texturemod_replace\TextureModReplaceAddon.vcxproj", "{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug|x64.ActiveCfg = Debug|x64
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug|x64.Build.0 = Debug|x64
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug|x86.ActiveCfg = Debug|Win32
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug|x86.Build.0 = Debug|Win32
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release|x64.ActiveCfg = Release|x64
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release|x64.Build.0 = Release|x64
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release|x86.ActiveCfg = Release|Win32
+		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release|x86.Build.0 = Release|Win32
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|x64.ActiveCfg = Debug|x64
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|x64.Build.0 = Debug|x64
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|x86.ActiveCfg = Debug|Win32
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|x86.Build.0 = Debug|Win32
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|x64.ActiveCfg = Release|x64
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|x64.Build.0 = Release|x64
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|x86.ActiveCfg = Release|Win32
+		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|x86.Build.0 = Release|Win32
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug|x64.ActiveCfg = Debug|x64
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug|x64.Build.0 = Debug|x64
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug|x86.ActiveCfg = Debug|Win32
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug|x86.Build.0 = Debug|Win32
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release|x64.ActiveCfg = Release|x64
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release|x64.Build.0 = Release|x64
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release|x86.ActiveCfg = Release|Win32
+		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release|x86.Build.0 = Release|Win32
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug|x64.ActiveCfg = Debug|x64
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug|x64.Build.0 = Debug|x64
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug|x86.ActiveCfg = Debug|Win32
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug|x86.Build.0 = Debug|Win32
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release|x64.ActiveCfg = Release|x64
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release|x64.Build.0 = Release|x64
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release|x86.ActiveCfg = Release|Win32
+		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release|x86.Build.0 = Release|Win32
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug|x64.ActiveCfg = Debug|x64
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug|x64.Build.0 = Debug|x64
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug|x86.ActiveCfg = Debug|Win32
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug|x86.Build.0 = Debug|Win32
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release|x64.ActiveCfg = Release|x64
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release|x64.Build.0 = Release|x64
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release|x86.ActiveCfg = Release|Win32
+		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release|x86.Build.0 = Release|Win32
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug|x64.ActiveCfg = Debug|x64
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug|x64.Build.0 = Debug|x64
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug|x86.ActiveCfg = Debug|Win32
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug|x86.Build.0 = Debug|Win32
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release|x64.ActiveCfg = Release|x64
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release|x64.Build.0 = Release|x64
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release|x86.ActiveCfg = Release|Win32
+		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {91D46C18-E4DA-4FAE-9B8F-8282D6F9BA63}
+	EndGlobalSection
+EndGlobal
diff --git a/ReShade.sln b/ReShade.sln
index fb169c07ce..2789d8fa48 100644
--- a/ReShade.sln
+++ b/ReShade.sln
@@ -6,13 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReShade", "ReShade.vcxproj", "{0401ADF5-D085-4A3D-95B2-D9B7896BB338}"
 	ProjectSection(ProjectDependencies) = postProject
 		{09C0D610-9B82-40D8-B37E-0D26E3BFF77F} = {09C0D610-9B82-40D8-B37E-0D26E3BFF77F}
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35} = {3BDC6D1C-086F-4B99-BE68-86146FC74D35}
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73} = {F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}
 		{9A62233B-0B70-4B48-91E8-35AA666BC32E} = {9A62233B-0B70-4B48-91E8-35AA666BC32E}
-		{D80FD73E-5195-462A-B963-9A1CE30E2944} = {D80FD73E-5195-462A-B963-9A1CE30E2944}
 		{D1C2099B-BEC7-4993-8947-01D4A1F7EAE2} = {D1C2099B-BEC7-4993-8947-01D4A1F7EAE2}
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6} = {CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6} = {FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}
 		{723BDEF8-4A39-4961-BDAB-54074012FF47} = {723BDEF8-4A39-4961-BDAB-54074012FF47}
 		{783FEDFB-5124-4F8C-87BC-70AA8490266B} = {783FEDFB-5124-4F8C-87BC-70AA8490266B}
 	EndProjectSection
@@ -43,20 +38,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FXC", "ReShadeFXC.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Injector", "ReShadeInject.vcxproj", "{D388A856-4100-49AB-8FAF-62D63F8AC155}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{5FC92F22-284D-4F19-832D-3E3C369DB0B3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApiTrace", "examples\ApiTraceAddon.vcxproj", "{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GenericDepth", "examples\GenericDepthAddon.vcxproj", "{3BDC6D1C-086F-4B99-BE68-86146FC74D35}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderModDump", "examples\ShaderModDumpAddon.vcxproj", "{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderModReplace", "examples\ShaderModReplaceAddon.vcxproj", "{D80FD73E-5195-462A-B963-9A1CE30E2944}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureModDump", "examples\TextureModDumpAddon.vcxproj", "{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureModReplace", "examples\TextureModReplaceAddon.vcxproj", "{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug App|32-bit = Debug App|32-bit
@@ -241,82 +222,6 @@ Global
 		{D388A856-4100-49AB-8FAF-62D63F8AC155}.Release|32-bit.Build.0 = Release|Win32
 		{D388A856-4100-49AB-8FAF-62D63F8AC155}.Release|64-bit.ActiveCfg = Release|x64
 		{D388A856-4100-49AB-8FAF-62D63F8AC155}.Release|64-bit.Build.0 = Release|x64
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug App|32-bit.ActiveCfg = Debug|Win32
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug App|64-bit.ActiveCfg = Debug|x64
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug Setup|32-bit.ActiveCfg = Debug|Win32
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug Setup|64-bit.ActiveCfg = Debug|x64
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug|32-bit.ActiveCfg = Debug|Win32
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Debug|64-bit.ActiveCfg = Debug|x64
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release App|32-bit.ActiveCfg = Release|Win32
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release App|64-bit.ActiveCfg = Release|x64
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release Setup|32-bit.ActiveCfg = Release|Win32
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release Setup|64-bit.ActiveCfg = Release|x64
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release|32-bit.ActiveCfg = Release|Win32
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7}.Release|64-bit.ActiveCfg = Release|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug App|32-bit.ActiveCfg = Debug|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug App|64-bit.ActiveCfg = Debug|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug Setup|32-bit.ActiveCfg = Debug|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug Setup|64-bit.ActiveCfg = Debug|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|32-bit.ActiveCfg = Debug Built-In|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|32-bit.Build.0 = Debug Built-In|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|64-bit.ActiveCfg = Debug Built-In|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Debug|64-bit.Build.0 = Debug Built-In|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release App|32-bit.ActiveCfg = Release|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release App|64-bit.ActiveCfg = Release|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release Setup|32-bit.ActiveCfg = Release|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release Setup|64-bit.ActiveCfg = Release|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|32-bit.ActiveCfg = Release Built-In|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|32-bit.Build.0 = Release Built-In|Win32
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|64-bit.ActiveCfg = Release Built-In|x64
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35}.Release|64-bit.Build.0 = Release Built-In|x64
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug App|32-bit.ActiveCfg = Debug|Win32
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug App|64-bit.ActiveCfg = Debug|x64
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug Setup|32-bit.ActiveCfg = Debug|Win32
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug Setup|64-bit.ActiveCfg = Debug|x64
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug|32-bit.ActiveCfg = Debug|Win32
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Debug|64-bit.ActiveCfg = Debug|x64
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release App|32-bit.ActiveCfg = Release|Win32
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release App|64-bit.ActiveCfg = Release|x64
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release Setup|32-bit.ActiveCfg = Release|Win32
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release Setup|64-bit.ActiveCfg = Release|x64
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release|32-bit.ActiveCfg = Release|Win32
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73}.Release|64-bit.ActiveCfg = Release|x64
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug App|32-bit.ActiveCfg = Debug|Win32
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug App|64-bit.ActiveCfg = Debug|x64
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug Setup|32-bit.ActiveCfg = Debug|Win32
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug Setup|64-bit.ActiveCfg = Debug|x64
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug|32-bit.ActiveCfg = Debug|Win32
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Debug|64-bit.ActiveCfg = Debug|x64
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release App|32-bit.ActiveCfg = Release|Win32
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release App|64-bit.ActiveCfg = Release|x64
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release Setup|32-bit.ActiveCfg = Release|Win32
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release Setup|64-bit.ActiveCfg = Release|x64
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release|32-bit.ActiveCfg = Release|Win32
-		{D80FD73E-5195-462A-B963-9A1CE30E2944}.Release|64-bit.ActiveCfg = Release|x64
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug App|32-bit.ActiveCfg = Debug|Win32
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug App|64-bit.ActiveCfg = Debug|x64
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug Setup|32-bit.ActiveCfg = Debug|Win32
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug Setup|64-bit.ActiveCfg = Debug|x64
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug|32-bit.ActiveCfg = Debug|Win32
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Debug|64-bit.ActiveCfg = Debug|x64
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release App|32-bit.ActiveCfg = Release|Win32
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release App|64-bit.ActiveCfg = Release|x64
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release Setup|32-bit.ActiveCfg = Release|Win32
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release Setup|64-bit.ActiveCfg = Release|x64
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release|32-bit.ActiveCfg = Release|Win32
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6}.Release|64-bit.ActiveCfg = Release|x64
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug App|32-bit.ActiveCfg = Debug|Win32
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug App|64-bit.ActiveCfg = Debug|x64
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug Setup|32-bit.ActiveCfg = Debug|Win32
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug Setup|64-bit.ActiveCfg = Debug|x64
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug|32-bit.ActiveCfg = Debug|Win32
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Debug|64-bit.ActiveCfg = Debug|x64
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release App|32-bit.ActiveCfg = Release|Win32
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release App|64-bit.ActiveCfg = Release|x64
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release Setup|32-bit.ActiveCfg = Release|Win32
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release Setup|64-bit.ActiveCfg = Release|x64
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release|32-bit.ActiveCfg = Release|Win32
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6}.Release|64-bit.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -328,13 +233,6 @@ Global
 		{723BDEF8-4A39-4961-BDAB-54074012FF47} = {11B78243-91C3-4357-9FDD-4EAFBF4EE52B}
 		{65640687-0740-4681-B018-17DBF33E061C} = {EDA44797-8501-4D24-BF3F-CCE904412ED7}
 		{D388A856-4100-49AB-8FAF-62D63F8AC155} = {EDA44797-8501-4D24-BF3F-CCE904412ED7}
-		{5FC92F22-284D-4F19-832D-3E3C369DB0B3} = {EDA44797-8501-4D24-BF3F-CCE904412ED7}
-		{5F86B6C7-D5F9-4EF1-AD3E-AE465CDB5CB7} = {5FC92F22-284D-4F19-832D-3E3C369DB0B3}
-		{3BDC6D1C-086F-4B99-BE68-86146FC74D35} = {5FC92F22-284D-4F19-832D-3E3C369DB0B3}
-		{F1541A1E-CE3E-4D1B-87B7-F6E0D5C68B73} = {5FC92F22-284D-4F19-832D-3E3C369DB0B3}
-		{D80FD73E-5195-462A-B963-9A1CE30E2944} = {5FC92F22-284D-4F19-832D-3E3C369DB0B3}
-		{FBE035F6-A729-465C-9EB8-1F94DFC4A8B6} = {5FC92F22-284D-4F19-832D-3E3C369DB0B3}
-		{CF5F2DF4-4C59-4B66-8A0E-BC0D92792AF6} = {5FC92F22-284D-4F19-832D-3E3C369DB0B3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D62E660A-3A0C-4026-8DCB-D3B7959E0951}
diff --git a/ReShade.vcxproj b/ReShade.vcxproj
index c07b4eb928..42646b4711 100644
--- a/ReShade.vcxproj
+++ b/ReShade.vcxproj
@@ -402,6 +402,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="examples\generic_depth\generic_depth.cpp">
+      <!-- Force include "reshade.hpp" before anything else when creating built-in add-on, so that no Dear ImGui functions are created. -->
+      <ForcedIncludeFiles>reshade.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <PreprocessorDefinitions>BUILTIN_ADDON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="source\addon.cpp" />
     <ClCompile Include="source\addon_manager.cpp" />
     <ClCompile Include="source\d2d1\d2d1.cpp" />
diff --git a/ReShade.vcxproj.filters b/ReShade.vcxproj.filters
index a74f825fe7..efe73880bf 100644
--- a/ReShade.vcxproj.filters
+++ b/ReShade.vcxproj.filters
@@ -84,6 +84,9 @@
     <ClCompile Include="source\addon_manager.cpp">
       <Filter>core\runtime</Filter>
     </ClCompile>
+    <ClCompile Include="examples\generic_depth\generic_depth.cpp">
+      <Filter>core\runtime</Filter>
+    </ClCompile>
     <ClCompile Include="source\input.cpp">
       <Filter>core\runtime</Filter>
     </ClCompile>
diff --git a/examples/GenericDepthAddon.vcxproj b/examples/GenericDepthAddon.vcxproj
deleted file mode 100644
index 324c3c4ca1..0000000000
--- a/examples/GenericDepthAddon.vcxproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Built-In|Win32">
-      <Configuration>Debug Built-In</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Built-In|x64">
-      <Configuration>Debug Built-In</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Built-In|Win32">
-      <Configuration>Release Built-In</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Built-In|x64">
-      <Configuration>Release Built-In</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{3BDC6D1C-086F-4B99-BE68-86146FC74D35}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
-    <ProjectName>GenericDepth</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug Built-In'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release Built-In'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\deps\ImGui.props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug Built-In'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release Built-In'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Built-In|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>BUILTIN_ADDON;WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;$(SolutionDir)source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <!-- Force include "reshade.hpp" before anything else when creating built-in add-on, so that no Dear ImGui functions are created. -->
-      <ForcedIncludeFiles>reshade.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Built-In|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>BUILTIN_ADDON;WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;$(SolutionDir)source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <!-- Force include "reshade.hpp" before anything else when creating built-in add-on, so that no Dear ImGui functions are created. -->
-      <ForcedIncludeFiles>reshade.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Built-In|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>BUILTIN_ADDON;_HAS_EXCEPTIONS=0;WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;$(SolutionDir)source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <ExceptionHandling>false</ExceptionHandling>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <!-- Force include "reshade.hpp" before anything else when creating built-in add-on, so that no Dear ImGui functions are created. -->
-      <ForcedIncludeFiles>reshade.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Built-In|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>BUILTIN_ADDON;_HAS_EXCEPTIONS=0;WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;$(SolutionDir)source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <ExceptionHandling>false</ExceptionHandling>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <!-- Force include "reshade.hpp" before anything else when creating built-in add-on, so that no Dear ImGui functions are created. -->
-      <ForcedIncludeFiles>reshade.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="generic_depth\generic_depth.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/examples/ApiTraceAddon.vcxproj b/examples/api_trace/ApiTraceAddon.vcxproj
similarity index 87%
rename from examples/ApiTraceAddon.vcxproj
rename to examples/api_trace/ApiTraceAddon.vcxproj
index a01422ff37..c38ec71989 100644
--- a/examples/ApiTraceAddon.vcxproj
+++ b/examples/api_trace/ApiTraceAddon.vcxproj
@@ -44,17 +44,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\deps\ImGui.props" />
+    <Import Project="..\..\deps\ImGui.props" />
   </ImportGroup>
   <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release App\</OutDir>
     <TargetExt>.addon</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -64,7 +58,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -80,7 +74,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -97,7 +91,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -116,7 +110,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -128,7 +122,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="api_trace\api_trace.cpp" />
+    <ClCompile Include="api_trace.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/examples/api_trace/api_trace.cpp b/examples/api_trace/api_trace.cpp
index 187580ad3b..1ed0472f6c 100644
--- a/examples/api_trace/api_trace.cpp
+++ b/examples/api_trace/api_trace.cpp
@@ -890,8 +890,6 @@ void unregister_addon_api_trace()
 	reshade::unregister_event<reshade::addon_event::present>(on_present);
 }
 
-#ifdef _WINDLL
-
 extern "C" __declspec(dllexport) const char *NAME = "API Trace";
 extern "C" __declspec(dllexport) const char *DESCRIPTION = "Example add-on that logs all graphics API calls to an overlay window.";
 
@@ -912,5 +910,3 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
 
 	return TRUE;
 }
-
-#endif
diff --git a/examples/generic_depth/GenericDepthAddon.vcxproj b/examples/generic_depth/GenericDepthAddon.vcxproj
new file mode 100644
index 0000000000..7e5a17b9f7
--- /dev/null
+++ b/examples/generic_depth/GenericDepthAddon.vcxproj
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{3BDC6D1C-086F-4B99-BE68-86146FC74D35}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
+    <ProjectName>GenericDepth</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\deps\ImGui.props" />
+  </ImportGroup>
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <TargetExt>.addon</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="generic_depth.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
\ No newline at end of file
diff --git a/examples/generic_depth/generic_depth.cpp b/examples/generic_depth/generic_depth.cpp
index eebd71d8bd..1c447653b9 100644
--- a/examples/generic_depth/generic_depth.cpp
+++ b/examples/generic_depth/generic_depth.cpp
@@ -886,7 +886,7 @@ void unregister_addon_depth()
 	reshade::unregister_event<reshade::addon_event::reshade_reloaded_effects>(update_effect_runtime);
 }
 
-#ifdef _WINDLL
+#ifndef BUILTIN_ADDON
 
 extern "C" __declspec(dllexport) const char *NAME = "Generic Depth";
 extern "C" __declspec(dllexport) const char *DESCRIPTION = "Automatic depth buffer detection that works in the majority of games.";
diff --git a/examples/ShaderModDumpAddon.vcxproj b/examples/shadermod_dump/ShaderModDumpAddon.vcxproj
similarity index 86%
rename from examples/ShaderModDumpAddon.vcxproj
rename to examples/shadermod_dump/ShaderModDumpAddon.vcxproj
index 5781a4b99a..4221488134 100644
--- a/examples/ShaderModDumpAddon.vcxproj
+++ b/examples/shadermod_dump/ShaderModDumpAddon.vcxproj
@@ -46,14 +46,8 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release App\</OutDir>
     <TargetExt>.addon</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -63,7 +57,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -78,7 +72,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -94,7 +88,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -112,7 +106,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -123,10 +117,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="shadermod_dump\shadermod_dump.cpp" />
+    <ClCompile Include="shadermod_dump.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="shadermod_dump\crc32_hash.hpp" />
+    <ClInclude Include="crc32_hash.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/examples/shadermod_dump/shadermod_dump.cpp b/examples/shadermod_dump/shadermod_dump.cpp
index 5aa6ac79d8..3903149c75 100644
--- a/examples/shadermod_dump/shadermod_dump.cpp
+++ b/examples/shadermod_dump/shadermod_dump.cpp
@@ -54,17 +54,6 @@ static bool on_create_pipeline(device *device, pipeline_desc &desc, uint32_t, co
 	return false;
 }
 
-void register_addon_shadermod_dump()
-{
-	reshade::register_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
-}
-void unregister_addon_shadermod_dump()
-{
-	reshade::unregister_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
-}
-
-#ifdef _WINDLL
-
 extern "C" __declspec(dllexport) const char *NAME = "ShaderMod Dump";
 extern "C" __declspec(dllexport) const char *DESCRIPTION = "Example add-on that dumps all shaders used by the application to disk.";
 
@@ -75,15 +64,13 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
 	case DLL_PROCESS_ATTACH:
 		if (!reshade::register_addon(hModule))
 			return FALSE;
-		register_addon_shadermod_dump();
+		reshade::register_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
 		break;
 	case DLL_PROCESS_DETACH:
-		unregister_addon_shadermod_dump();
+		reshade::unregister_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
 		reshade::unregister_addon(hModule);
 		break;
 	}
 
 	return TRUE;
 }
-
-#endif
diff --git a/examples/ShaderModReplaceAddon.vcxproj b/examples/shadermod_replace/ShaderModReplaceAddon.vcxproj
similarity index 86%
rename from examples/ShaderModReplaceAddon.vcxproj
rename to examples/shadermod_replace/ShaderModReplaceAddon.vcxproj
index 7b595ade5b..4a954456a7 100644
--- a/examples/ShaderModReplaceAddon.vcxproj
+++ b/examples/shadermod_replace/ShaderModReplaceAddon.vcxproj
@@ -46,14 +46,8 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release App\</OutDir>
     <TargetExt>.addon</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -63,7 +57,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -78,7 +72,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -94,7 +88,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -112,7 +106,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -123,10 +117,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="shadermod_replace\shadermod_replace.cpp" />
+    <ClCompile Include="shadermod_replace.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="shadermod_replace\crc32_hash.hpp" />
+    <ClInclude Include="crc32_hash.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/examples/shadermod_replace/shadermod_replace.cpp b/examples/shadermod_replace/shadermod_replace.cpp
index e2f8e09c96..16a3d3ee01 100644
--- a/examples/shadermod_replace/shadermod_replace.cpp
+++ b/examples/shadermod_replace/shadermod_replace.cpp
@@ -97,19 +97,6 @@ static void on_after_create_pipeline(device *device, const pipeline_desc &desc,
 	replaced_stages = static_cast<shader_stage>(0);
 }
 
-void register_addon_shadermod_replace()
-{
-	reshade::register_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
-	reshade::register_event<reshade::addon_event::init_pipeline>(on_after_create_pipeline);
-}
-void unregister_addon_shadermod_replace()
-{
-	reshade::unregister_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
-	reshade::unregister_event<reshade::addon_event::init_pipeline>(on_after_create_pipeline);
-}
-
-#ifdef _WINDLL
-
 extern "C" __declspec(dllexport) const char *NAME = "ShaderMod Replace";
 extern "C" __declspec(dllexport) const char *DESCRIPTION = "Example add-on that replaces shaders the application creates with binaries loaded from disk.";
 
@@ -120,15 +107,15 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
 	case DLL_PROCESS_ATTACH:
 		if (!reshade::register_addon(hModule))
 			return FALSE;
-		register_addon_shadermod_replace();
+		reshade::register_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
+		reshade::register_event<reshade::addon_event::init_pipeline>(on_after_create_pipeline);
 		break;
 	case DLL_PROCESS_DETACH:
-		unregister_addon_shadermod_replace();
+		reshade::unregister_event<reshade::addon_event::create_pipeline>(on_create_pipeline);
+		reshade::unregister_event<reshade::addon_event::init_pipeline>(on_after_create_pipeline);
 		reshade::unregister_addon(hModule);
 		break;
 	}
 
 	return TRUE;
 }
-
-#endif
diff --git a/examples/TextureModDumpAddon.vcxproj b/examples/texturemod_dump/TextureModDumpAddon.vcxproj
similarity index 80%
rename from examples/TextureModDumpAddon.vcxproj
rename to examples/texturemod_dump/TextureModDumpAddon.vcxproj
index 9ec707e963..14737bf0db 100644
--- a/examples/TextureModDumpAddon.vcxproj
+++ b/examples/texturemod_dump/TextureModDumpAddon.vcxproj
@@ -44,18 +44,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\deps\ImGui.props" />
-    <Import Project="..\deps\stb.props" />
+    <Import Project="..\..\deps\ImGui.props" />
+    <Import Project="..\..\deps\stb.props" />
   </ImportGroup>
   <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release App\</OutDir>
     <TargetExt>.addon</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -65,7 +59,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -81,7 +75,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -98,7 +92,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -117,7 +111,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -129,18 +123,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\deps\stb.vcxproj">
-      <Project>{723bdef8-4a39-4961-bdab-54074012ff47}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="texturemod_dump\descriptor_set_tracking.cpp" />
-    <ClCompile Include="texturemod_dump\texturemod_dump.cpp" />
-    <ClCompile Include="texturemod_dump\texturemod_overlay.cpp" />
+    <ClCompile Include="descriptor_set_tracking.cpp" />
+    <ClCompile Include="texturemod_dump.cpp" />
+    <ClCompile Include="texturemod_overlay.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="texturemod_dump\crc32_hash.hpp" />
-    <ClInclude Include="texturemod_dump\descriptor_set_tracking.hpp" />
+    <ClInclude Include="crc32_hash.hpp" />
+    <ClInclude Include="descriptor_set_tracking.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/examples/texturemod_dump/texturemod_dump.cpp b/examples/texturemod_dump/texturemod_dump.cpp
index 2f60cef214..2bf30c3394 100644
--- a/examples/texturemod_dump/texturemod_dump.cpp
+++ b/examples/texturemod_dump/texturemod_dump.cpp
@@ -3,6 +3,8 @@
  * License: https://github.com/crosire/reshade#license
  */
 
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+
 #include <imgui.h> // Include here as well, so that 'register_addon' initializes the Dear ImGui function table
 #include <reshade.hpp>
 #include "crc32_hash.hpp"
@@ -598,8 +600,6 @@ void unregister_addon_texmod_dump()
 	reshade::unregister_event<reshade::addon_event::unmap_texture_region>(on_unmap_texture);
 }
 
-#ifdef _WINDLL
-
 extern void register_addon_texmod_overlay(); // See implementation in 'texturemod_overlay.cpp'
 extern void unregister_addon_texmod_overlay();
 
@@ -625,5 +625,3 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
 
 	return TRUE;
 }
-
-#endif
diff --git a/examples/TextureModReplaceAddon.vcxproj b/examples/texturemod_replace/TextureModReplaceAddon.vcxproj
similarity index 83%
rename from examples/TextureModReplaceAddon.vcxproj
rename to examples/texturemod_replace/TextureModReplaceAddon.vcxproj
index 8c8ff95db8..cd3e079450 100644
--- a/examples/TextureModReplaceAddon.vcxproj
+++ b/examples/texturemod_replace/TextureModReplaceAddon.vcxproj
@@ -44,17 +44,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\deps\stb.props" />
+    <Import Project="..\..\deps\stb.props" />
   </ImportGroup>
   <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Debug App\</OutDir>
-    <TargetExt>.addon</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)bin\$(Platform)\Release App\</OutDir>
     <TargetExt>.addon</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -64,7 +58,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -80,7 +74,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -97,7 +91,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -116,7 +110,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -128,15 +122,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\deps\stb.vcxproj">
-      <Project>{723bdef8-4a39-4961-bdab-54074012ff47}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="texturemod_replace\texturemod_replace.cpp" />
+    <ClCompile Include="texturemod_replace.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="texturemod_replace\crc32_hash.hpp" />
+    <ClInclude Include="crc32_hash.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/examples/texturemod_replace/texturemod_replace.cpp b/examples/texturemod_replace/texturemod_replace.cpp
index 3dc8c9311b..21af08c00e 100644
--- a/examples/texturemod_replace/texturemod_replace.cpp
+++ b/examples/texturemod_replace/texturemod_replace.cpp
@@ -3,6 +3,8 @@
  * License: https://github.com/crosire/reshade#license
  */
 
+#define STB_IMAGE_IMPLEMENTATION
+
 #include <reshade.hpp>
 #include "crc32_hash.hpp"
 #include <fstream>
@@ -212,8 +214,6 @@ void unregister_addon_texmod_replace()
 	reshade::unregister_event<reshade::addon_event::unmap_texture_region>(on_unmap_texture);
 }
 
-#ifdef _WINDLL
-
 extern "C" __declspec(dllexport) const char *NAME = "TextureMod Replace";
 extern "C" __declspec(dllexport) const char *DESCRIPTION = "Example add-on that replaces textures the application creates with image files loaded from disk.";
 
@@ -234,5 +234,3 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
 
 	return TRUE;
 }
-
-#endif
diff --git a/source/addon_manager.cpp b/source/addon_manager.cpp
index 82425b40a5..d08fbd5d94 100644
--- a/source/addon_manager.cpp
+++ b/source/addon_manager.cpp
@@ -11,6 +11,11 @@
 #include "dll_log.hpp"
 #include "ini_file.hpp"
 
+#ifndef RESHADE_TEST_APPLICATION
+extern void register_addon_depth();
+extern void unregister_addon_depth();
+#endif
+
 extern HMODULE g_module_handle;
 
 extern std::filesystem::path get_module_path(HMODULE module);
@@ -20,12 +25,6 @@ std::vector<void *> reshade::addon::event_list[static_cast<uint32_t>(reshade::ad
 std::vector<reshade::addon::info> reshade::addon::loaded_info;
 static unsigned long s_reference_count = 0;
 
-#ifndef RESHADE_TEST_APPLICATION
-#pragma comment(lib, "GenericDepth.lib")
-extern void register_addon_depth();
-extern void unregister_addon_depth();
-#endif
-
 void reshade::load_addons()
 {
 	// Only load add-ons the first time a reference is added