diff --git a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
index 37ac31f8..a08d746b 100644
--- a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
+++ b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
@@ -30,6 +30,7 @@
 	
   <ItemGroup>
     <Folder Include="Controllers\" />
+    <Folder Include="Controllers\" />
   </ItemGroup>
 	
   <ItemGroup>
diff --git a/EnvelopeGenerator.Finalizer/Worker.cs b/EnvelopeGenerator.Finalizer/Job/FinishEnvelopeJob.cs
similarity index 60%
rename from EnvelopeGenerator.Finalizer/Worker.cs
rename to EnvelopeGenerator.Finalizer/Job/FinishEnvelopeJob.cs
index a2b7c8dc..bd854399 100644
--- a/EnvelopeGenerator.Finalizer/Worker.cs
+++ b/EnvelopeGenerator.Finalizer/Job/FinishEnvelopeJob.cs
@@ -1,14 +1,12 @@
-using EnvelopeGenerator.Finalizer.Models;
-using Microsoft.Extensions.Options;
 using Quartz;
 
-namespace EnvelopeGenerator.Finalizer
+namespace EnvelopeGenerator.Finalizer.Job
 {
-    public class Worker : IJob
+    public class FinishEnvelopeJob : IJob
     {
-        private readonly ILogger<Worker> _logger;
+        private readonly ILogger<FinishEnvelopeJob> _logger;
 
-        public Worker(ILogger<Worker> logger)
+        public FinishEnvelopeJob(ILogger<FinishEnvelopeJob> logger)
         {
             _logger = logger;
         }
diff --git a/EnvelopeGenerator.Finalizer/Program.cs b/EnvelopeGenerator.Finalizer/Program.cs
index f76e0b30..17131ca0 100644
--- a/EnvelopeGenerator.Finalizer/Program.cs
+++ b/EnvelopeGenerator.Finalizer/Program.cs
@@ -1,7 +1,7 @@
 using CommandDotNet.Execution;
 using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
 using EnvelopeGenerator.DependencyInjection;
-using EnvelopeGenerator.Finalizer;
+using EnvelopeGenerator.Finalizer.Job;
 using EnvelopeGenerator.Finalizer.Models;
 using EnvelopeGenerator.Infrastructure;
 using MediatR;
@@ -46,19 +46,19 @@ try
     builder.Services.AddSwaggerGen();
     #endregion
 
-    #region AQuartz
+    #region Quartz
     builder.Services.AddQuartz(q =>
     {
-        var name = $"{typeof(Worker).FullName}";
+        var name = $"{typeof(FinishEnvelopeJob).FullName}";
         var jobKey = new JobKey(name);
-        q.AddJob<Worker>(opts => opts.WithIdentity(jobKey));
+        q.AddJob<FinishEnvelopeJob>(opts => opts.WithIdentity(jobKey));
 
-        var expression = config[nameof(Worker) + ":CronExpression"];
+        var expression = config[nameof(FinishEnvelopeJob) + ":CronExpression"];
         if (string.IsNullOrWhiteSpace(expression))
             throw new InvalidOperationException(
              "Cron expression for the Worker job is not configured. " +
              "Please provide a valid cron schedule in the configuration under " +
-             $"'{nameof(Worker)}:CronExpression'.");
+             $"'{nameof(FinishEnvelopeJob)}:CronExpression'.");
 
         q.AddTrigger(opts => opts
             .ForJob(jobKey)
diff --git a/EnvelopeGenerator.Finalizer/appsettings.Worker.json b/EnvelopeGenerator.Finalizer/appsettings.Job.json
similarity index 61%
rename from EnvelopeGenerator.Finalizer/appsettings.Worker.json
rename to EnvelopeGenerator.Finalizer/appsettings.Job.json
index 0164fd6d..7290cf84 100644
--- a/EnvelopeGenerator.Finalizer/appsettings.Worker.json
+++ b/EnvelopeGenerator.Finalizer/appsettings.Job.json
@@ -1,5 +1,5 @@
 {
-  "Worker": {
+  "FinishEnvelopeJob": {
     "CronExpression": "* * * * * ?"
   }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Finalizer/appsettings.Worker.Database.json b/EnvelopeGenerator.Finalizer/appsettings.Worker.Database.json
deleted file mode 100644
index 4124b453..00000000
--- a/EnvelopeGenerator.Finalizer/appsettings.Worker.Database.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "UseDbMigration": false,
-  "ConnectionStrings": {
-    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
-    "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
-  },
-  "DbTriggerParams": {
-    "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ],
-    "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
-    "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
-    "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
-    "Receiver": [],
-    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
-  }
-}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Finalizer/appsettings.Worker.Development.json b/EnvelopeGenerator.Finalizer/appsettings.Worker.Development.json
deleted file mode 100644
index b2dcdb67..00000000
--- a/EnvelopeGenerator.Finalizer/appsettings.Worker.Development.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}
diff --git a/EnvelopeGenerator.Finalizer/appsettings.Worker.Logging.json b/EnvelopeGenerator.Finalizer/appsettings.Worker.Logging.json
deleted file mode 100644
index 2909cf07..00000000
--- a/EnvelopeGenerator.Finalizer/appsettings.Worker.Logging.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
-    "MinimumLevel": {
-      "Default": "Verbose",
-      "Override": {
-        "Microsoft": "Warning",
-        "System": "Warning"
-      }
-    },
-    "WriteTo": [
-      {
-        "Name": "Console",
-        "Args": {
-          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Verbose-.txt",
-          "rollingInterval": "Day",
-          "restrictedToMinimumLevel": "Verbose",
-          "retainedFileCountLimit": 30,
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Debug-.txt",
-          "rollingInterval": "Day",
-          "restrictedToMinimumLevel": "Debug",
-          "retainedFileCountLimit": 30,
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Info-.txt",
-          "rollingInterval": "Day",
-          "restrictedToMinimumLevel": "Information",
-          "retainedFileCountLimit": 30,
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Warning-.txt",
-          "rollingInterval": "Day",
-          "restrictedToMinimumLevel": "Warning",
-          "retainedFileCountLimit": 30,
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Error-.txt",
-          "rollingInterval": "Day",
-          "restrictedToMinimumLevel": "Error",
-          "retainedFileCountLimit": 30,
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Fatal-.txt",
-          "rollingInterval": "Day",
-          "restrictedToMinimumLevel": "Fatal",
-          "retainedFileCountLimit": 30,
-          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
-        }
-      }
-    ],
-    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]
-  }
-}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Finalizer/appsettings.Worker.PdfBurner.json b/EnvelopeGenerator.Finalizer/appsettings.Worker.PdfBurner.json
deleted file mode 100644
index 3f0309cb..00000000
--- a/EnvelopeGenerator.Finalizer/appsettings.Worker.PdfBurner.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "IgnoredLabels": {
-    "Label": [
-      "Date",
-      "Datum",
-      "ZIP",
-      "PLZ",
-      "Place",
-      "Ort",
-      "Position",
-      "Stellung"
-    ]
-  }
-}
\ No newline at end of file