diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln
index a491a0dd..5a2061ff 100644
--- a/BootstrapAdmin.sln
+++ b/BootstrapAdmin.sln
@@ -67,14 +67,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41B6D37A-5E5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin", "admin", "{E03B7391-B52F-4449-B400-5CD9DE01F085}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D8F90830-15D0-4031-94EE-6E5D93CB734A}"
-	ProjectSection(SolutionItems) = preProject
-		appveyor.build.ps1 = appveyor.build.ps1
-		appveyor.install.ps1 = appveyor.install.ps1
-		appveyor.test.ps1 = appveyor.test.ps1
-		appveyor.yml = appveyor.yml
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{E057452E-00EB-4C46-9F8D-14096AAE8148}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
@@ -91,36 +83,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcipts", "srcipts", "{72C1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "win", "win", "{C6F2DCA0-7941-4C28-9328-2D495F5DCB00}"
 	ProjectSection(SolutionItems) = preProject
-		publish-admin.cmd = publish-admin.cmd
-		publish-client.cmd = publish-client.cmd
-		watch-run-admin.cmd = watch-run-admin.cmd
-		watch-run-client.cmd = watch-run-client.cmd
+		scripts\windows\publish-admin.cmd = scripts\windows\publish-admin.cmd
+		scripts\windows\publish-client.cmd = scripts\windows\publish-client.cmd
+		scripts\windows\watch-run-admin.cmd = scripts\windows\watch-run-admin.cmd
+		scripts\windows\watch-run-client.cmd = scripts\windows\watch-run-client.cmd
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{FDCFC3E3-14CF-40B2-9FE5-5BC239AAC110}"
 	ProjectSection(SolutionItems) = preProject
-		deploy-admin.sh = deploy-admin.sh
-		deploy-client.sh = deploy-client.sh
-		init.sh = init.sh
-		publish-admin.sh = publish-admin.sh
-		publish-client.sh = publish-client.sh
-		watch-run-admin.sh = watch-run-admin.sh
-		watch-run-client.sh = watch-run-client.sh
+		scripts\linux\deploy-admin.sh = scripts\linux\deploy-admin.sh
+		scripts\linux\deploy-client.sh = scripts\linux\deploy-client.sh
+		scripts\linux\init.sh = scripts\linux\init.sh
+		scripts\linux\publish-admin.sh = scripts\linux\publish-admin.sh
+		scripts\linux\publish-client.sh = scripts\linux\publish-client.sh
+		scripts\linux\watch-run-admin.sh = scripts\linux\watch-run-admin.sh
+		scripts\linux\watch-run-client.sh = scripts\linux\watch-run-client.sh
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{5F732D4E-133B-4DA6-811B-C369CDC3FB89}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "appveyor", "appveyor", "{5F732D4E-133B-4DA6-811B-C369CDC3FB89}"
 	ProjectSection(SolutionItems) = preProject
-		appveyor.build.ps1 = appveyor.build.ps1
-		appveyor.install.ps1 = appveyor.install.ps1
-		appveyor.test.ps1 = appveyor.test.ps1
+		scripts\appveyor\appveyor.build.ps1 = scripts\appveyor\appveyor.build.ps1
+		scripts\appveyor\appveyor.install.ps1 = scripts\appveyor\appveyor.install.ps1
+		scripts\appveyor\appveyor.test.ps1 = scripts\appveyor\appveyor.test.ps1
 		appveyor.yml = appveyor.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{68F7C160-3FB2-4129-8F89-96F78B2DA0A9}"
 	ProjectSection(SolutionItems) = preProject
-		services\ba.admin.service = services\ba.admin.service
-		services\ba.client.service = services\ba.client.service
-		services\nginx.service = services\nginx.service
+		scripts\linux\services\ba.admin.service = scripts\linux\services\ba.admin.service
+		scripts\linux\services\ba.client.service = scripts\linux\services\ba.client.service
+		scripts\linux\services\nginx.service = scripts\linux\services\nginx.service
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Oracle", "Oracle", "{41E078CA-F005-4B66-B440-FD7EB731AD61}"
diff --git a/appveyor.yml b/appveyor.yml
index 153800ff..b24084aa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,13 +25,13 @@ services:
 - mongodb
 install:
 - ps: >-
-    .\appveyor.install.ps1
+    .\scripts\appveyor\appveyor.install.ps1
 build_script:
 - ps: >-
-    .\appveyor.build.ps1
+    .\scripts\appveyor\appveyor.build.ps1
 test_script:
 - ps: >-
-    .\appveyor.test.ps1
+    .\scripts\appveyor\appveyor.test.ps1
 artifacts:
 - path: src\admin\Bootstrap.Admin\bin\release\netcoreapp3.1\publish\
   name: BootstrapAdmin
diff --git a/appveyor.build.ps1 b/scripts/appveyor/appveyor.build.ps1
similarity index 100%
rename from appveyor.build.ps1
rename to scripts/appveyor/appveyor.build.ps1
diff --git a/appveyor.install.ps1 b/scripts/appveyor/appveyor.install.ps1
similarity index 100%
rename from appveyor.install.ps1
rename to scripts/appveyor/appveyor.install.ps1
diff --git a/appveyor.test.ps1 b/scripts/appveyor/appveyor.test.ps1
similarity index 97%
rename from appveyor.test.ps1
rename to scripts/appveyor/appveyor.test.ps1
index 97b11f0a..4bbf89de 100644
--- a/appveyor.test.ps1
+++ b/scripts/appveyor/appveyor.test.ps1
@@ -54,7 +54,7 @@ function reportCoveralls() {
 }
 
 function installCodecov {
-    write-host "install Codecov.Tool tools" -ForegroundColor Cyan
+    write-host "install codecov.tool tools" -ForegroundColor Cyan
     dotnet tool install Codecov.Tool --tool-path ".\tools"
 }
 
diff --git a/deploy-admin.sh b/scripts/linux/deploy-admin.sh
similarity index 100%
rename from deploy-admin.sh
rename to scripts/linux/deploy-admin.sh
diff --git a/deploy-client.sh b/scripts/linux/deploy-client.sh
similarity index 100%
rename from deploy-client.sh
rename to scripts/linux/deploy-client.sh
diff --git a/init.sh b/scripts/linux/init.sh
similarity index 100%
rename from init.sh
rename to scripts/linux/init.sh
diff --git a/publish-admin.sh b/scripts/linux/publish-admin.sh
similarity index 100%
rename from publish-admin.sh
rename to scripts/linux/publish-admin.sh
diff --git a/publish-client.sh b/scripts/linux/publish-client.sh
similarity index 100%
rename from publish-client.sh
rename to scripts/linux/publish-client.sh
diff --git a/services/ba.admin.service b/scripts/linux/services/ba.admin.service
similarity index 100%
rename from services/ba.admin.service
rename to scripts/linux/services/ba.admin.service
diff --git a/services/ba.client.service b/scripts/linux/services/ba.client.service
similarity index 100%
rename from services/ba.client.service
rename to scripts/linux/services/ba.client.service
diff --git a/services/nginx.service b/scripts/linux/services/nginx.service
similarity index 100%
rename from services/nginx.service
rename to scripts/linux/services/nginx.service
diff --git a/watch-run-admin.sh b/scripts/linux/watch-run-admin.sh
similarity index 100%
rename from watch-run-admin.sh
rename to scripts/linux/watch-run-admin.sh
diff --git a/watch-run-client.sh b/scripts/linux/watch-run-client.sh
similarity index 100%
rename from watch-run-client.sh
rename to scripts/linux/watch-run-client.sh
diff --git a/publish-admin.cmd b/scripts/windows/publish-admin.cmd
similarity index 100%
rename from publish-admin.cmd
rename to scripts/windows/publish-admin.cmd
diff --git a/publish-client.cmd b/scripts/windows/publish-client.cmd
similarity index 100%
rename from publish-client.cmd
rename to scripts/windows/publish-client.cmd
diff --git a/watch-run-admin.cmd b/scripts/windows/watch-run-admin.cmd
similarity index 100%
rename from watch-run-admin.cmd
rename to scripts/windows/watch-run-admin.cmd
diff --git a/watch-run-client.cmd b/scripts/windows/watch-run-client.cmd
similarity index 100%
rename from watch-run-client.cmd
rename to scripts/windows/watch-run-client.cmd