diff --git a/Fab2ApprovalSystem-Development.yml b/Fab2ApprovalSystem-Development.yml
deleted file mode 100644
index 2988744..0000000
--- a/Fab2ApprovalSystem-Development.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-trigger:
-  branches:
-    include:
-      - Development
-  paths:
-    include:
-      - "Fab2ApprovalSystem/*"
-    exclude:
-      - "**/*.yaml"
-      - "**/*.yml"
-      - "SQL/*"
-      - "references/*"
-      - "packages/*"
-      - "Kendo/*"
-
-pool:
-  name: Mesa-IIS
-  demands: Fab2ApprovalSystem-Development
-
-variables:
-  # solution: '**/*.sln'
-  # buildPlatform: 'Any CPU'
-  buildConfiguration: "Debug"
-  ASPNETCORE_ENVIRONMENT: "Development"
-
-steps:
-  - script: |
-      set assemblyTitle=Fab2ApprovalSystem
-      echo %assemblyTitle%
-      echo ##vso[task.setvariable variable=AssemblyTitle;]%assemblyTitle%
-      echo $(AssemblyTitle)
-    displayName: AssemblyTitle
-
-  - script: |
-      set targetFrameworkVersion=v4.8
-      echo %targetFrameworkVersion%
-      echo ##vso[task.setvariable variable=TargetFrameworkVersion;]%targetFrameworkVersion%
-      echo $(TargetFrameworkVersion)
-    displayName: TargetFrameworkVersion
-
-  - script: |
-      set coreVersion=na
-      echo %coreVersion%
-      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
-      echo $(CoreVersion)
-    displayName: CoreVersion
-
-  - script: |
-      set configuration=Debug
-      echo %configuration%
-      echo ##vso[task.setvariable variable=Configuration;]%configuration%
-      echo $(Configuration)
-    displayName: Configuration
-
-  - script: |
-      REM set nugetSource=https://messa017.infineon.com/v3/index.json
-      set nugetSource=https://eaf-prod.mes.infineon.com/v3/index.json
-      echo %nugetSource%
-      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
-      echo $(NugetSource)
-    displayName: NugetSource
-
-  - script: |
-      set gitCommit=$(Build.SourceVersion)
-      set gitCommitSeven=%gitCommit:~0,7%
-      echo %gitCommitSeven%
-      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
-      echo $(GitCommitSeven)
-    displayName: GitCommitSeven
-
-  - script: |
-      echo $(AssemblyTitle)
-      echo $(Build.BuildId)
-      echo $(Build.Reason)
-      echo $(Build.Repository.Id)
-      echo $(Build.Repository.Name)
-      echo $(Build.SourceVersion)
-      echo $(CoreVersion)
-      echo $(Configuration)
-      echo $(NugetSource)
-      echo $(GitCommitSeven)
-      echo $(TargetFrameworkVersion)
-      REM echo $(pipelinePassword)
-    displayName: "Echo Check"
-
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(Configuration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:RestoreSources=$(NugetSource) $(AssemblyTitle).csproj'
-    workingDirectory: Fab2ApprovalSystem
-    displayName: "Framework Restore"
-
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(Configuration);TargetFrameworkVersion=$(TargetFrameworkVersion) $(AssemblyTitle).csproj'
-    workingDirectory: Fab2ApprovalSystem
-    displayName: "Framework Build"
-
-  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(Configuration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:DebugSymbols=false /p:DeleteExistingFiles=true /p:DeployOnBuild=true /p:EnableUpdateAble=true /p:ExcludeApp_Data=true /p:LastUsedBuildConfiguration=$(Configuration) /p:LastUsedPlatform="Any CPU" /p:LaunchSiteAfterPublish=true /p:OutputPath="D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)" /p:PreCompileBeforePublish=true /p:PublishProvider=FileSystem /p:PublishUrl="D:/PublishUrl" /p:SiteUrlToLaunchAfterPublish="" /p:WDPMergeOption=DoNotMerge /p:WebPublishMethod=FileSystem $(AssemblyTitle).csproj'
-    workingDirectory: Fab2ApprovalSystem
-    displayName: "Framework Pack"
-
-  - script: '"C:/Program Files (x86)/IIS/Microsoft Web Deploy V3/MSDeploy.exe" -AllowUntrusted -dest:auto -disableLink:AppPoolExtension -disableLink:CertificateExtension -disableLink:ContentExtension -setParam:name="IIS Web Application Name",value=$(Build.Repository.Name) -setParamFile:"D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)" "/_PublishedWebsites/$(Build.Repository.Name)_Package/$(Build.Repository.Name).SetParameters.xml" -source:package="D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)" "/_PublishedWebsites/$(AssemblyTitle)_Package/$(AssemblyTitle).zip" -verb:sync'
-    workingDirectory: Fab2ApprovalSystem
-    displayName: "Framework Deploy"
-    enabled: false
-
-  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
-    displayName: "Force Fail"
-    enabled: false
diff --git a/MesaFabApproval.API/pipeline.yml b/MesaFabApproval.API/pipeline.yml
new file mode 100644
index 0000000..0e5f904
--- /dev/null
+++ b/MesaFabApproval.API/pipeline.yml
@@ -0,0 +1,84 @@
+trigger:
+  branches:
+    includes:
+      - master
+  paths:
+    includes:
+      - MesaFabApproval.API
+      - MesaFabApproval.Shared
+
+variables:
+  buildConfiguration: "Release"
+
+stages:
+  - stage: Test
+    displayName: "Test"
+    pool:
+      name: MesaFabApproval
+      demands: Fab2ApprovalSystem-Dev
+    jobs:
+      - job: BuildPublish
+        steps:
+          - script: |
+              echo build configuration: $(BuildConfiguration)
+            displayName: "Echo Check"
+
+          - task: DotNetCoreCLI@2
+            displayName: "Build"
+            inputs:
+              command: "build"
+              configuration: $(BuildConfiguration)
+              projects: MesaFabApproval.API
+
+          - task: DotNetCoreCLI@2
+            displayName: "Publish"
+            inputs:
+              command: "publish"
+              publishWebProjects: false
+              projects: MesaFabApproval.API
+              zipAfterPublish: true
+              arguments: "-c $(BuildConfiguration) -o $(Build.ArtifactStagingDirectory) -r win-x64 --self-contained"
+
+          - task: CopyFiles@2
+            displayName: "Copy Files"
+            inputs:
+              SourceFolder: "$(Build.ArtifactStagingDirectory)"
+              TargetFolder: 'D:\$(Build.Repository.Name)\API\$(Build.BuildId)\$(BuildConfiguration)'
+              CleanTargetFolder: true
+              retryCount: "3"
+
+  - stage: Prod
+    displayName: "Prod"
+    pool:
+      name: MesaFabApproval
+      demands: Fab2ApprovalSystem
+    jobs:
+      - job: BuildPublish
+        steps:
+          - script: |
+              echo build configuration: $(BuildConfiguration)
+            displayName: "Echo Check"
+
+          - task: DotNetCoreCLI@2
+            displayName: "Build"
+            inputs:
+              command: "build"
+              configuration: $(BuildConfiguration)
+              projects: MesaFabApproval.API
+
+          - task: DotNetCoreCLI@2
+            displayName: "Publish"
+            inputs:
+              command: "publish"
+              publishWebProjects: false
+              projects: MesaFabApproval.API
+              zipAfterPublish: true
+              arguments: "-c $(BuildConfiguration) -o $(Build.ArtifactStagingDirectory) -r win-x64 --self-contained"
+
+          - task: CopyFiles@2
+            displayName: "Copy Files"
+            inputs:
+              SourceFolder: "$(Build.ArtifactStagingDirectory)"
+              TargetFolder: 'D:\$(Build.Repository.Name)\API\$(Build.BuildId)\$(BuildConfiguration)'
+              CleanTargetFolder: true
+              retryCount: "3"
diff --git a/MesaFabApproval.Client/pipeline.yml b/MesaFabApproval.Client/pipeline.yml
new file mode 100644
index 0000000..3a91778
--- /dev/null
+++ b/MesaFabApproval.Client/pipeline.yml
@@ -0,0 +1,84 @@
+trigger:
+  branches:
+    includes:
+      - master
+  paths:
+    includes:
+      - MesaFabApproval.Client
+      - MesaFabApproval.Shared
+
+variables:
+  buildConfiguration: "Release"
+
+stages:
+  - stage: Test
+    displayName: "Test"
+    pool:
+      name: MesaFabApproval
+      demands: Fab2ApprovalSystem-Dev
+    jobs:
+      - job: BuildPublish
+        steps:
+          - script: |
+              echo build configuration: $(BuildConfiguration)
+            displayName: "Echo Check"
+
+          - task: DotNetCoreCLI@2
+            displayName: "Build"
+            inputs:
+              command: "build"
+              configuration: $(BuildConfiguration)
+              projects: MesaFabApproval.Client
+
+          - task: DotNetCoreCLI@2
+            displayName: "Publish"
+            inputs:
+              command: "publish"
+              publishWebProjects: false
+              projects: MesaFabApproval.Client
+              zipAfterPublish: true
+              arguments: "-c $(BuildConfiguration) -o $(Build.ArtifactStagingDirectory) -r win-x64 --self-contained"
+
+          - task: CopyFiles@2
+            displayName: "Copy Files"
+            inputs:
+              SourceFolder: "$(Build.ArtifactStagingDirectory)"
+              TargetFolder: 'D:\$(Build.Repository.Name)\Client\$(Build.BuildId)\$(BuildConfiguration)'
+              CleanTargetFolder: true
+              retryCount: "3"
+
+  - stage: Prod
+    displayName: "Prod"
+    pool:
+      name: MesaFabApproval
+      demands: Fab2ApprovalSystem
+    jobs:
+      - job: BuildPublish
+        steps:
+          - script: |
+              echo build configuration: $(BuildConfiguration)
+            displayName: "Echo Check"
+
+          - task: DotNetCoreCLI@2
+            displayName: "Build"
+            inputs:
+              command: "build"
+              configuration: $(BuildConfiguration)
+              projects: MesaFabApproval.Client
+
+          - task: DotNetCoreCLI@2
+            displayName: "Publish"
+            inputs:
+              command: "publish"
+              publishWebProjects: false
+              projects: MesaFabApproval.Client
+              zipAfterPublish: true
+              arguments: "-c $(BuildConfiguration) -o $(Build.ArtifactStagingDirectory) -r win-x64 --self-contained"
+
+          - task: CopyFiles@2
+            displayName: "Copy Files"
+            inputs:
+              SourceFolder: "$(Build.ArtifactStagingDirectory)"
+              TargetFolder: 'D:\$(Build.Repository.Name)\Client\$(Build.BuildId)\$(BuildConfiguration)'
+              CleanTargetFolder: true
+              retryCount: "3"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a50f299..660d6ee 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,7 @@ stages:
   - stage: Development
     displayName: Development
     pool:
-      name: Mesa-FabApproval
+      name: MesaFabApproval
       demands: Fab2ApprovalSystem-Dev
     variables:
       ASPNETCORE_ENVIRONMENT: "Development"