diff --git a/src/CBT.Microsoft.Common.props/CBT.Microsoft.Common.props.nuproj b/src/CBT.Microsoft.Common.props/CBT.Microsoft.Common.props.nuproj
index e79ba2c..3c33e74 100644
--- a/src/CBT.Microsoft.Common.props/CBT.Microsoft.Common.props.nuproj
+++ b/src/CBT.Microsoft.Common.props/CBT.Microsoft.Common.props.nuproj
@@ -8,10 +8,10 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.props))\build.props" />
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <ItemGroup>
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\Extensions\After.Microsoft.Common.props" />
-    <Content Include="CBT\Module\Extensions\Before.Microsoft.Common.props" />
-    <Content Include="CBT\Module\module.config" />
+    <Content Include="build\CBT.Microsoft.Common.props.props" />
+    <Content Include="build\CBT.After.Microsoft.Common.props" />
+    <Content Include="build\CBT.Before.Microsoft.Common.props" />
+    <Content Include="build\module.config" />
     <None Include="version.json" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
diff --git a/src/CBT.Microsoft.Common.props/CBT/Module/Extensions/After.Microsoft.Common.props b/src/CBT.Microsoft.Common.props/build/CBT.After.Microsoft.Common.props
similarity index 50%
rename from src/CBT.Microsoft.Common.props/CBT/Module/Extensions/After.Microsoft.Common.props
rename to src/CBT.Microsoft.Common.props/build/CBT.After.Microsoft.Common.props
index b944d4e..a49b31f 100644
--- a/src/CBT.Microsoft.Common.props/CBT/Module/Extensions/After.Microsoft.Common.props
+++ b/src/CBT.Microsoft.Common.props/build/CBT.After.Microsoft.Common.props
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <CBTInjectionFile>After.Microsoft.Common.props</CBTInjectionFile>
   </PropertyGroup>
 
   <Import Project="$(CBTSavedCustomAfterMicrosoftCommonProps)" Condition=" '$(CBTSavedCustomAfterMicrosoftCommonProps)' != '' And Exists('$(CBTSavedCustomAfterMicrosoftCommonProps)') " />
   
-  <Import Project="$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)') " />
 
-  <Import Project="$(CBTModuleExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTModuleExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(CBTInjectionFile)') " />
   
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.props/CBT/Module/Extensions/Before.Microsoft.Common.props b/src/CBT.Microsoft.Common.props/build/CBT.Before.Microsoft.Common.props
similarity index 50%
rename from src/CBT.Microsoft.Common.props/CBT/Module/Extensions/Before.Microsoft.Common.props
rename to src/CBT.Microsoft.Common.props/build/CBT.Before.Microsoft.Common.props
index 102341f..8d55f24 100644
--- a/src/CBT.Microsoft.Common.props/CBT/Module/Extensions/Before.Microsoft.Common.props
+++ b/src/CBT.Microsoft.Common.props/build/CBT.Before.Microsoft.Common.props
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <CBTInjectionFile>Before.Microsoft.Common.props</CBTInjectionFile>
   </PropertyGroup>
 
   <Import Project="$(CBTSavedCustomBeforeMicrosoftCommonProps)" Condition=" '$(CBTSavedCustomBeforeMicrosoftCommonProps)' != '' And Exists('$(CBTSavedCustomBeforeMicrosoftCommonProps)') " />
   
-  <Import Project="$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)') " />
   
-  <Import Project="$(CBTModuleExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTModuleExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(CBTInjectionFile)') " />
   
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.props/CBT/Module/Build.props b/src/CBT.Microsoft.Common.props/build/CBT.Microsoft.Common.props.props
similarity index 77%
rename from src/CBT.Microsoft.Common.props/CBT/Module/Build.props
rename to src/CBT.Microsoft.Common.props/build/CBT.Microsoft.Common.props.props
index 31f0638..80447f4 100644
--- a/src/CBT.Microsoft.Common.props/CBT/Module/Build.props
+++ b/src/CBT.Microsoft.Common.props/build/CBT.Microsoft.Common.props.props
@@ -4,7 +4,7 @@
     <CBTSavedCustomBeforeMicrosoftCommonProps>$(CustomBeforeMicrosoftCommonProps)</CBTSavedCustomBeforeMicrosoftCommonProps>
     <CBTSavedCustomAfterMicrosoftCommonProps>$(CustomAfterMicrosoftCommonProps)</CBTSavedCustomAfterMicrosoftCommonProps>
 
-    <CustomBeforeMicrosoftCommonProps>$(MSBuildThisFileDirectory)\Extensions\Before.Microsoft.Common.props</CustomBeforeMicrosoftCommonProps>
-    <CustomAfterMicrosoftCommonProps>$(MSBuildThisFileDirectory)\Extensions\After.Microsoft.Common.props</CustomAfterMicrosoftCommonProps>
+    <CustomBeforeMicrosoftCommonProps>$(MSBuildThisFileDirectory)\CBT.Before.Microsoft.Common.props</CustomBeforeMicrosoftCommonProps>
+    <CustomAfterMicrosoftCommonProps>$(MSBuildThisFileDirectory)\CBT.After.Microsoft.Common.props</CustomAfterMicrosoftCommonProps>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.props/CBT/Module/module.config b/src/CBT.Microsoft.Common.props/build/module.config
similarity index 100%
rename from src/CBT.Microsoft.Common.props/CBT/Module/module.config
rename to src/CBT.Microsoft.Common.props/build/module.config
diff --git a/src/CBT.Microsoft.Common.props/version.json b/src/CBT.Microsoft.Common.props/version.json
index 975da16..8dd06ee 100644
--- a/src/CBT.Microsoft.Common.props/version.json
+++ b/src/CBT.Microsoft.Common.props/version.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.Microsoft\\.Common\\.props.*"
   ],
diff --git a/src/CBT.Microsoft.Common.targets/CBT.Microsoft.Common.targets.nuproj b/src/CBT.Microsoft.Common.targets/CBT.Microsoft.Common.targets.nuproj
index 82cc856..dd67e13 100644
--- a/src/CBT.Microsoft.Common.targets/CBT.Microsoft.Common.targets.nuproj
+++ b/src/CBT.Microsoft.Common.targets/CBT.Microsoft.Common.targets.nuproj
@@ -11,10 +11,10 @@
     <None Include="version.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\Extensions\After.Microsoft.Common.targets" />
-    <Content Include="CBT\Module\Extensions\Before.Microsoft.Common.targets" />
-    <Content Include="CBT\Module\module.config" />
+    <Content Include="build\CBT.Microsoft.Common.targets.props" />
+    <Content Include="build\CBT.After.Microsoft.Common.targets" />
+    <Content Include="build\CBT.Before.Microsoft.Common.targets" />
+    <Content Include="build\module.config" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.targets/CBT/Module/Extensions/After.Microsoft.Common.targets b/src/CBT.Microsoft.Common.targets/build/CBT.After.Microsoft.Common.targets
similarity index 50%
rename from src/CBT.Microsoft.Common.targets/CBT/Module/Extensions/After.Microsoft.Common.targets
rename to src/CBT.Microsoft.Common.targets/build/CBT.After.Microsoft.Common.targets
index 74cecb4..4818b9d 100644
--- a/src/CBT.Microsoft.Common.targets/CBT/Module/Extensions/After.Microsoft.Common.targets
+++ b/src/CBT.Microsoft.Common.targets/build/CBT.After.Microsoft.Common.targets
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <CBTInjectionFile>After.Microsoft.Common.targets</CBTInjectionFile>
   </PropertyGroup>
 
   <Import Project="$(CBTSavedCustomAfterMicrosoftCommonTargets)" Condition=" '$(CBTSavedCustomAfterMicrosoftCommonTargets)' != '' And Exists('$(CBTSavedCustomAfterMicrosoftCommonTargets)') " />
   
-  <Import Project="$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)') " />
 
-  <Import Project="$(CBTModuleExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTModuleExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(CBTInjectionFile)') " />
   
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.targets/CBT/Module/Extensions/Before.Microsoft.Common.targets b/src/CBT.Microsoft.Common.targets/build/CBT.Before.Microsoft.Common.targets
similarity index 50%
rename from src/CBT.Microsoft.Common.targets/CBT/Module/Extensions/Before.Microsoft.Common.targets
rename to src/CBT.Microsoft.Common.targets/build/CBT.Before.Microsoft.Common.targets
index 9d10e98..5cc1048 100644
--- a/src/CBT.Microsoft.Common.targets/CBT/Module/Extensions/Before.Microsoft.Common.targets
+++ b/src/CBT.Microsoft.Common.targets/build/CBT.Before.Microsoft.Common.targets
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <CBTInjectionFile>Before.Microsoft.Common.targets</CBTInjectionFile>
   </PropertyGroup>
 
   <Import Project="$(CBTSavedCustomBeforeMicrosoftCommonTargets)" Condition=" '$(CBTSavedCustomBeforeMicrosoftCommonTargets)' != '' And Exists('$(CBTSavedCustomBeforeMicrosoftCommonTargets)') " />
   
-  <Import Project="$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTLocalBuildExtensionsPath)' != '' And Exists('$(CBTLocalBuildExtensionsPath)\$(CBTInjectionFile)') " />
   
-  <Import Project="$(CBTModuleExtensionsPath)\$(MSBuildThisFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(MSBuildThisFile)') " />
+  <Import Project="$(CBTModuleExtensionsPath)\$(CBTInjectionFile)" Condition=" '$(CBTModuleExtensionsPath)' != '' And Exists('$(CBTModuleExtensionsPath)\$(CBTInjectionFile)') " />
   
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.targets/CBT/Module/Build.props b/src/CBT.Microsoft.Common.targets/build/CBT.Microsoft.Common.targets.props
similarity index 76%
rename from src/CBT.Microsoft.Common.targets/CBT/Module/Build.props
rename to src/CBT.Microsoft.Common.targets/build/CBT.Microsoft.Common.targets.props
index de6d1cf..ff09e7b 100644
--- a/src/CBT.Microsoft.Common.targets/CBT/Module/Build.props
+++ b/src/CBT.Microsoft.Common.targets/build/CBT.Microsoft.Common.targets.props
@@ -4,7 +4,7 @@
     <CBTSavedCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets)</CBTSavedCustomBeforeMicrosoftCommonTargets>
     <CBTSavedCustomAfterMicrosoftCommonTargets>$(CustomAfterMicrosoftCommonTargets)</CBTSavedCustomAfterMicrosoftCommonTargets>
 
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)\Extensions\Before.Microsoft.Common.targets</CustomBeforeMicrosoftCommonTargets>
-    <CustomAfterMicrosoftCommonTargets>$(MSBuildThisFileDirectory)\Extensions\After.Microsoft.Common.targets</CustomAfterMicrosoftCommonTargets>
+    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)\CBT.Before.Microsoft.Common.targets</CustomBeforeMicrosoftCommonTargets>
+    <CustomAfterMicrosoftCommonTargets>$(MSBuildThisFileDirectory)\CBT.After.Microsoft.Common.targets</CustomAfterMicrosoftCommonTargets>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CBT.Microsoft.Common.targets/CBT/Module/module.config b/src/CBT.Microsoft.Common.targets/build/module.config
similarity index 100%
rename from src/CBT.Microsoft.Common.targets/CBT/Module/module.config
rename to src/CBT.Microsoft.Common.targets/build/module.config
diff --git a/src/CBT.Microsoft.Common.targets/version.json b/src/CBT.Microsoft.Common.targets/version.json
index 9f84e9f..1c1207a 100644
--- a/src/CBT.Microsoft.Common.targets/version.json
+++ b/src/CBT.Microsoft.Common.targets/version.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-dev",
-  "buildNumberOffset": 1,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.Microsoft\\.Common\\.targets.*"
   ],