diff --git a/build/download-build-steps.yml b/.azure-pipelines/download-build-steps.yml
similarity index 100%
rename from build/download-build-steps.yml
rename to .azure-pipelines/download-build-steps.yml
diff --git a/build/install-pwsh-steps.yml b/.azure-pipelines/install-pwsh-steps.yml
similarity index 100%
rename from build/install-pwsh-steps.yml
rename to .azure-pipelines/install-pwsh-steps.yml
diff --git a/build/jobs.yml b/.azure-pipelines/jobs.yml
similarity index 100%
rename from build/jobs.yml
rename to .azure-pipelines/jobs.yml
diff --git a/build/publish-artifacts-steps.yml b/.azure-pipelines/publish-artifacts-steps.yml
similarity index 100%
rename from build/publish-artifacts-steps.yml
rename to .azure-pipelines/publish-artifacts-steps.yml
diff --git a/Repo.props b/Repo.props
index 4acf84bbf19b..f466ca8148be 100644
--- a/Repo.props
+++ b/Repo.props
@@ -6,7 +6,6 @@
     <RepoSrc>$(RepoRoot)src/</RepoSrc>
     <RepoArtifacts>$(RepoRoot)artifacts/</RepoArtifacts>
     <RepoTools>$(RepoRoot)tools/</RepoTools>
-    <RepoBuild>$(RepoRoot)build/</RepoBuild>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/build.proj b/build.proj
index 34100e49b5b1..7551986bccf8 100644
--- a/build.proj
+++ b/build.proj
@@ -143,7 +143,7 @@
     <MakeDir Directories="$(PackageDirectory)" />
 
     <!-- Copy appropriate targets -->
-    <Copy SourceFiles="$(RepoBuild)after.Azure.PowerShell.sln.targets" DestinationFolder="$(RepoArtifacts)" />
+    <Copy SourceFiles="$(RepoTools)after.Azure.PowerShell.sln.targets" DestinationFolder="$(RepoArtifacts)" />
 
     <!-- Build and create package content -->
     <Exec Command="dotnet --version" />
diff --git a/build/after.Azure.PowerShell.sln.targets b/tools/after.Azure.PowerShell.sln.targets
similarity index 100%
rename from build/after.Azure.PowerShell.sln.targets
rename to tools/after.Azure.PowerShell.sln.targets