diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15b83df..2458864 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ stages:
  - installer
 
 
-admin:build:
+ABC:build:
  stage: build
  before_script:
    - *nuget-fix
@@ -54,6 +54,8 @@ admin:build:
    - *version-fix
  script:    
    - '& "$env:MSBUILD_PATH" GPW_Admin/GPW_Admin.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
+   - '& "$env:MSBUILD_PATH" GPW_Barcode/GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
+   - '& "$env:MSBUILD_PATH" GPW_Commesse/GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
 # \ cache:
 #    #key: ${CI_COMMIT_REF_SLUG}
 #    # key: ${CI_JOB_NAME}
@@ -68,26 +70,8 @@ admin:build:
 #       # - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 #       - '$env:EXE_RELEASE_FOLDER\GPW_Barcode\'  # saving entire Test project so NUnit can run tests
 #       - '$env:DEPLOY_FOLDER\GPW_Barcode\'  # saving entire Test project so NUnit can run tests
-
-bcode:build:
- stage: build
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
-   - '& "$env:MSBUILD_PATH" GPW_Barcode/GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
-
-commesse:build:
- stage: build
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
-   - '& "$env:MSBUILD_PATH" GPW_Commesse/GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
    
-home:build:
+HS:build:
  stage: build
  before_script:
    - *nuget-fix
@@ -95,14 +79,6 @@ home:build:
    - *version-fix
  script: 
    - '& "$env:MSBUILD_PATH" HOME/HOME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
-  
-smart:build:
- stage: build
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
    - '& "$env:MSBUILD_PATH" GPW_Smart/GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /p:verbosity=Minimal /m'
    
 
@@ -123,7 +99,7 @@ smart:build:
 #     - build_job
 
 
-admin:deploy:
+ABC:deploy:
  stage: deploy
 #  rules:
 #    - if: '$CI_COMMIT_BRANCH == "develop"'
@@ -135,6 +111,9 @@ admin:deploy:
    - *version-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Admin/GPW_Admin.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Barcode/GPW_Barcode.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Commesse/GPW_Commesse.csproj'
+
 #  cache:
 #    #key: ${CI_COMMIT_REF_SLUG}
 #    # key: ${CI_JOB_NAME}
@@ -142,34 +121,11 @@ admin:deploy:
 #    paths:
 #       - packages/
 #    policy: pull
- needs: ["admin:build"]
- dependencies:
-    - admin:build
-   #  - test_job
+ needs: ["ABC:build"]
 #  when:
 #    manual
 
-bcode:deploy:
- stage: deploy
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Barcode/GPW_Barcode.csproj'
- needs: ["bcode:build"]
-
-commesse:deploy:
- stage: deploy
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Commesse/GPW_Commesse.csproj'
- needs: ["commesse:build"]
-    
-home:deploy:
+HS:deploy:
  stage: deploy
  before_script:
    - *nuget-fix
@@ -177,19 +133,10 @@ home:deploy:
    - *version-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal HOME/HOME.csproj'
- needs: ["home:build"]
-
-smart:deploy:
- stage: deploy
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Smart/GPW_Smart.csproj'
- needs: ["smart:build"]
+ needs: ["HS:build"]
 
-admin:install:
+ABC:install:
  stage: installer
 #  rules:
 #    - if: '$CI_COMMIT_BRANCH == "develop"'
@@ -200,85 +147,55 @@ admin:install:
    - '& "$env:NUGET_PATH" restore GPW.sln'  
    - *version-fix
  script: 
+   # ----ADMIN ----
    # IIS 02
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Admin/GPW_Admin.csproj'
    # IIS DEV
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Admin/GPW_Admin.csproj'
    # ZIP package
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/GPW_Admin.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj'
- needs: ["admin:build"]
-#  dependencies:
-#     - admin:build
-   #  - test_job
- when:
-   manual   
-
-bcode:install:
- stage: installer
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
+   # ----BCode ----
    # IIS 02
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Barcode/GPW_Barcode.csproj'
    # IIS DEV
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Barcode/GPW_Barcode.csproj'
    # ZIP package
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/GPW_Barcode.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj'
- needs: ["bcode:build"]
- when:
-   manual
-
-commesse:install:
- stage: installer
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
+   # ----Commesse ----
    # IIS 02
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Commesse/GPW_Commesse.csproj'
    # IIS DEV
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Commesse/GPW_Commesse.csproj'
    # ZIP package
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/GPW_Commesse.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj'
- needs: ["commesse:build"]
+ needs: ["ABC:build"]
+#  dependencies:
+#     - admin:build
+   #  - test_job
  when:
-   manual
+   manual   
 
-home:install:
+HS:install:
  stage: installer
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore GPW.sln'  
    - *version-fix
  script: 
+   # ---- HOME ----
    # IIS 02
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal HOME/HOME.csproj'
    # IIS DEV
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal HOME/HOME.csproj'
    # ZIP package
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/HOME.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj'
- needs: ["home:build"]
- when:
-   manual
-
-
-smart:install:
- stage: installer
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore GPW.sln'  
-   - *version-fix
- script: 
+   # ---- SMART ----
    # IIS 02
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Smart/GPW_Smart.csproj'
    # IIS DEV
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Smart/GPW_Smart.csproj'
    # ZIP package
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/GPW_Smart.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj'
- needs: ["smart:build"]
+ needs: ["HS:build"]
  when:
    manual
-   
\ No newline at end of file