diff --git a/cmd/csaf_checker/config.go b/cmd/csaf_checker/config.go
new file mode 100644
index 0000000..6ed2691
--- /dev/null
+++ b/cmd/csaf_checker/config.go
@@ -0,0 +1,33 @@
+// This file is Free Software under the MIT License
+// without warranty, see README.md and LICENSES/MIT.txt for details.
+//
+// SPDX-License-Identifier: MIT
+//
+// SPDX-FileCopyrightText: 2023 German Federal Office for Information Security (BSI) <https://www.bsi.bund.de>
+// Software-Engineering: 2023 Intevation GmbH <https://intevation.de>
+
+package main
+
+import (
+	"crypto/tls"
+	"net/http"
+)
+
+type options struct {
+	Output      string      `short:"o" long:"output" description:"File name of the generated report" value-name:"REPORT-FILE"`
+	Format      string      `short:"f" long:"format" choice:"json" choice:"html" description:"Format of report" default:"json"`
+	Insecure    bool        `long:"insecure" description:"Do not check TLS certificates from provider"`
+	ClientCert  *string     `long:"client-cert" description:"TLS client certificate file (PEM encoded data)" value-name:"CERT-FILE"`
+	ClientKey   *string     `long:"client-key" description:"TLS client private key file (PEM encoded data)" value-name:"KEY-FILE"`
+	Version     bool        `long:"version" description:"Display version of the binary"`
+	Verbose     bool        `long:"verbose" short:"v" description:"Verbose output"`
+	Rate        *float64    `long:"rate" short:"r" description:"The average upper limit of https operations per second (defaults to unlimited)"`
+	Years       *uint       `long:"years" short:"y" description:"Number of years to look back from now" value-name:"YEARS"`
+	ExtraHeader http.Header `long:"header" short:"H" description:"One or more extra HTTP header fields"`
+
+	RemoteValidator        string   `long:"validator" description:"URL to validate documents remotely" value-name:"URL"`
+	RemoteValidatorCache   string   `long:"validatorcache" description:"FILE to cache remote validations" value-name:"FILE"`
+	RemoteValidatorPresets []string `long:"validatorpreset" description:"One or more presets to validate remotely" default:"mandatory"`
+
+	clientCerts []tls.Certificate
+}
diff --git a/cmd/csaf_checker/main.go b/cmd/csaf_checker/main.go
index eafa9c8..d614f0b 100644
--- a/cmd/csaf_checker/main.go
+++ b/cmd/csaf_checker/main.go
@@ -19,7 +19,6 @@ import (
 	"html/template"
 	"io"
 	"log"
-	"net/http"
 	"os"
 
 	"github.com/csaf-poc/csaf_distribution/v2/util"
@@ -29,25 +28,6 @@ import (
 //go:embed tmpl/report.html
 var reportHTML string
 
-type options struct {
-	Output      string      `short:"o" long:"output" description:"File name of the generated report" value-name:"REPORT-FILE"`
-	Format      string      `short:"f" long:"format" choice:"json" choice:"html" description:"Format of report" default:"json"`
-	Insecure    bool        `long:"insecure" description:"Do not check TLS certificates from provider"`
-	ClientCert  *string     `long:"client-cert" description:"TLS client certificate file (PEM encoded data)" value-name:"CERT-FILE"`
-	ClientKey   *string     `long:"client-key" description:"TLS client private key file (PEM encoded data)" value-name:"KEY-FILE"`
-	Version     bool        `long:"version" description:"Display version of the binary"`
-	Verbose     bool        `long:"verbose" short:"v" description:"Verbose output"`
-	Rate        *float64    `long:"rate" short:"r" description:"The average upper limit of https operations per second (defaults to unlimited)"`
-	Years       *uint       `long:"years" short:"y" description:"Number of years to look back from now" value-name:"YEARS"`
-	ExtraHeader http.Header `long:"header" short:"H" description:"One or more extra HTTP header fields"`
-
-	RemoteValidator        string   `long:"validator" description:"URL to validate documents remotely" value-name:"URL"`
-	RemoteValidatorCache   string   `long:"validatorcache" description:"FILE to cache remote validations" value-name:"FILE"`
-	RemoteValidatorPresets []string `long:"validatorpreset" description:"One or more presets to validate remotely" default:"mandatory"`
-
-	clientCerts []tls.Certificate
-}
-
 func errCheck(err error) {
 	if err != nil {
 		if flags.WroteHelp(err) {