diff --git a/src/CBT.AssemblyInfo/CBT.AssemblyInfo.nuproj b/src/CBT.AssemblyInfo/CBT.AssemblyInfo.nuproj
index 4ddf2c2..b794d32 100644
--- a/src/CBT.AssemblyInfo/CBT.AssemblyInfo.nuproj
+++ b/src/CBT.AssemblyInfo/CBT.AssemblyInfo.nuproj
@@ -14,12 +14,7 @@
     <None Include="version.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CBT\Module\After.Microsoft.Common.targets" />
-    <Content Include="CBT\Module\AssemblyInfo.targets" />
-    <Content Include="CBT\Module\Build.props" />
-    <Content Include="CBT\Module\module.config" />
-    <Content Include="CBT\Module\Templates\AssemblyInfo.cs" />
-    <Content Include="CBT\Module\Templates\AssemblyInfo.vb" />
+    <Content Include="build\**\*" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/CBT.AssemblyInfo/CBT/Module/After.Microsoft.Common.targets b/src/CBT.AssemblyInfo/build/After.Microsoft.Common.targets
similarity index 100%
rename from src/CBT.AssemblyInfo/CBT/Module/After.Microsoft.Common.targets
rename to src/CBT.AssemblyInfo/build/After.Microsoft.Common.targets
diff --git a/src/CBT.AssemblyInfo/CBT/Module/AssemblyInfo.targets b/src/CBT.AssemblyInfo/build/AssemblyInfo.targets
similarity index 100%
rename from src/CBT.AssemblyInfo/CBT/Module/AssemblyInfo.targets
rename to src/CBT.AssemblyInfo/build/AssemblyInfo.targets
diff --git a/src/CBT.AssemblyInfo/CBT/Module/Build.props b/src/CBT.AssemblyInfo/build/CBT.AssemblyInfo.props
similarity index 100%
rename from src/CBT.AssemblyInfo/CBT/Module/Build.props
rename to src/CBT.AssemblyInfo/build/CBT.AssemblyInfo.props
diff --git a/src/CBT.AssemblyInfo/CBT/Module/Templates/AssemblyInfo.cs b/src/CBT.AssemblyInfo/build/Templates/AssemblyInfo.cs
similarity index 100%
rename from src/CBT.AssemblyInfo/CBT/Module/Templates/AssemblyInfo.cs
rename to src/CBT.AssemblyInfo/build/Templates/AssemblyInfo.cs
diff --git a/src/CBT.AssemblyInfo/CBT/Module/Templates/AssemblyInfo.vb b/src/CBT.AssemblyInfo/build/Templates/AssemblyInfo.vb
similarity index 100%
rename from src/CBT.AssemblyInfo/CBT/Module/Templates/AssemblyInfo.vb
rename to src/CBT.AssemblyInfo/build/Templates/AssemblyInfo.vb
diff --git a/src/CBT.AssemblyInfo/CBT/Module/module.config b/src/CBT.AssemblyInfo/build/module.config
similarity index 100%
rename from src/CBT.AssemblyInfo/CBT/Module/module.config
rename to src/CBT.AssemblyInfo/build/module.config
diff --git a/src/CBT.AssemblyInfo/version.json b/src/CBT.AssemblyInfo/version.json
index 919eb35..f55247b 100644
--- a/src/CBT.AssemblyInfo/version.json
+++ b/src/CBT.AssemblyInfo/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": 3,
+  "version": "2.0-dev",
+  "buildNumberOffset": 0,
   "publicReleaseRefSpec": [
     "^refs/tags/CBT\\.AssemblyInfo.*"
   ],