diff --git a/bootstrap.cmd b/build/bootstrap.cmd
similarity index 96%
rename from bootstrap.cmd
rename to build/bootstrap.cmd
index 2e5ea9a186..e6eca1385a 100644
--- a/bootstrap.cmd
+++ b/build/bootstrap.cmd
@@ -6,7 +6,7 @@ dotnet  --info || GOTO missingDotnet
 git --version  || GOTO missingGit
 
 :: Set Build number on all files that uses it
-CALL setVersionNumber.cmd
+CALL build\setVersionNumber.cmd
 
 :: Initialize the compiler's nuspec file
 CALL :nuspecBootstrap
diff --git a/build/init.yml b/build/init.yml
index 1cb22b4c2a..f4e7c27d8c 100644
--- a/build/init.yml
+++ b/build/init.yml
@@ -21,5 +21,5 @@ steps:
 - task: BatchScript@1
   displayName: 'Run bootstrap.cmd'
   inputs:
-    filename: bootstrap.cmd
+    filename: build/bootstrap.cmd
     modifyEnvironment: true
diff --git a/build/sdl-tools.yml b/build/sdl-tools.yml
deleted file mode 100644
index 5afd0ebd74..0000000000
--- a/build/sdl-tools.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-##
-# Runs scanning tools from security team. 
-# See https://www.1eswiki.com/wiki/Secure_Development_Tools_Extension_For_Azure_DevOps
-##
-steps:
-- task: ComponentGovernanceComponentDetection@0
-  displayName: 'Components Detection'
-  inputs:
-    snapshotForceEnabled: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-  displayName: 'SDL: Anti-Malware scan of build sources and/or artifacts'
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-autoapplicability.AutoApplicability@1
-  displayName: 'SDL: Run AutoApplicability'
-  inputs:
-    ExternalRelease: true
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
-  displayName: 'SDL: Analyze managed and unmanaged binaries (exe, dll) for security vulnerabilities (BinSkim)'
-  inputs:
-    InputType: Basic
-    AnalyzeTarget: '$(DllsToScan)'
-    AnalyzeVerbose: true
-    AnalyzeHashes: true
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-codemetrics.CodeMetrics@1
-  displayName: 'SDL: Analyze complexity of managed C# code (CodeMetrics)'
-  inputs:
-    Files: '$(DllsToScan)'
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-  displayName: 'SDL: Analyze source and build output text files for credentials (CredScan)'
-  inputs:
-    debugMode: false
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-fxcop.FxCop@2
-  displayName: 'SDL: Analyze C# code (.NET framework only) for security vulnerabilities (FxCop)'
-  inputs:
-    inputType: Basic
-    targets: '$(DllsToScan)'
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@2
-  displayName: 'SDL: Run the PREfast SDL Native Rules for MSBuild'
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-vulnerabilityassessment.VulnerabilityAssessment@0
-  displayName: 'SDL: Create Vulnerability Assessment'
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
-  displayName: 'SDL: Publish Security Analysis Logs'
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
-  displayName: 'SDL: Post Analysis'
-  inputs:
-    BinSkim: true
-    CredScan: true
-    SDLNativeRules: true
-  continueOnError: true
-  condition: and(succeededOrFailed(), variables.SDLScan)
\ No newline at end of file
diff --git a/setVersionNumber.cmd b/build/setVersionNumber.cmd
similarity index 100%
rename from setVersionNumber.cmd
rename to build/setVersionNumber.cmd
diff --git a/build/steps.yml b/build/steps.yml
index a8797640e5..725824d779 100644
--- a/build/steps.yml
+++ b/build/steps.yml
@@ -15,5 +15,4 @@ steps:
 ##
 # Wrap-up
 ##
-- template: sdl-tools.yml
-- template: step-wrap-up.yml
+- template: wrap-up.yml
diff --git a/src/QsCompiler/build-steps.yml b/src/QsCompiler/build-steps.yml
index 628ddad73a..410cb024f3 100644
--- a/src/QsCompiler/build-steps.yml
+++ b/src/QsCompiler/build-steps.yml
@@ -4,7 +4,7 @@
 steps:
 
 - task: DotNetCoreCLI@2
-  displayName: 'Build and test Q# compiler'
+  displayName: 'Build and test Q# compiler and language server'
   inputs:
     command: test
     arguments: '-c $(BuildConfiguration) -v $(Build.Verbosity)  /p:DefineConstants=$(Assembly.Constants) /p:Version=$(Assembly.Version)'