diff --git a/oval/debian/debian.go b/debian/oval/debian.go
similarity index 98%
rename from oval/debian/debian.go
rename to debian/oval/debian.go
index 1200ea3..bda3b74 100644
--- a/oval/debian/debian.go
+++ b/debian/oval/debian.go
@@ -1,4 +1,4 @@
-package debian
+package oval
 
 import (
 	"encoding/xml"
diff --git a/oval/debian/types.go b/debian/oval/types.go
similarity index 99%
rename from oval/debian/types.go
rename to debian/oval/types.go
index f999f79..5633022 100644
--- a/oval/debian/types.go
+++ b/debian/oval/types.go
@@ -1,4 +1,4 @@
-package debian
+package oval
 
 import (
 	"encoding/xml"
diff --git a/debian/debian.go b/debian/tracker/debian.go
similarity index 99%
rename from debian/debian.go
rename to debian/tracker/debian.go
index c410e8f..b7c7aad 100644
--- a/debian/debian.go
+++ b/debian/tracker/debian.go
@@ -1,4 +1,4 @@
-package debian
+package tracker
 
 import (
 	"encoding/json"
diff --git a/debian/debian_test.go b/debian/tracker/debian_test.go
similarity index 96%
rename from debian/debian_test.go
rename to debian/tracker/debian_test.go
index d554a8c..fab0543 100644
--- a/debian/debian_test.go
+++ b/debian/tracker/debian_test.go
@@ -1,4 +1,4 @@
-package debian_test
+package tracker_test
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"github.com/aquasecurity/vuln-list-update/debian"
+	"github.com/aquasecurity/vuln-list-update/debian/tracker"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -89,7 +89,7 @@ func TestClient_Update(t *testing.T) {
 		assert.NoError(t, err, "URL parse error")
 		u.Path = path.Join(u.Path, tc.path)
 
-		client := debian.Client{
+		client := tracker.Client{
 			URL:         u.String(),
 			VulnListDir: dir,
 			Retry:       0,
diff --git a/debian/testdata/fixtures/debian.json b/debian/tracker/testdata/fixtures/debian.json
similarity index 100%
rename from debian/testdata/fixtures/debian.json
rename to debian/tracker/testdata/fixtures/debian.json
diff --git a/debian/testdata/fixtures/invalid.json b/debian/tracker/testdata/fixtures/invalid.json
similarity index 100%
rename from debian/testdata/fixtures/invalid.json
rename to debian/tracker/testdata/fixtures/invalid.json
diff --git a/debian/testdata/goldens/debian/prototypejs/CVE-2007-2383.json.golden b/debian/tracker/testdata/goldens/debian/prototypejs/CVE-2007-2383.json.golden
similarity index 100%
rename from debian/testdata/goldens/debian/prototypejs/CVE-2007-2383.json.golden
rename to debian/tracker/testdata/goldens/debian/prototypejs/CVE-2007-2383.json.golden
diff --git a/debian/testdata/goldens/debian/prototypejs/CVE-2008-7220.json.golden b/debian/tracker/testdata/goldens/debian/prototypejs/CVE-2008-7220.json.golden
similarity index 100%
rename from debian/testdata/goldens/debian/prototypejs/CVE-2008-7220.json.golden
rename to debian/tracker/testdata/goldens/debian/prototypejs/CVE-2008-7220.json.golden
diff --git a/debian/testdata/goldens/debian/python-scipy/CVE-2013-4251.json.golden b/debian/tracker/testdata/goldens/debian/python-scipy/CVE-2013-4251.json.golden
similarity index 100%
rename from debian/testdata/goldens/debian/python-scipy/CVE-2013-4251.json.golden
rename to debian/tracker/testdata/goldens/debian/python-scipy/CVE-2013-4251.json.golden
diff --git a/main.go b/main.go
index a0e3675..b8594ab 100644
--- a/main.go
+++ b/main.go
@@ -18,16 +18,16 @@ import (
 
 	"github.com/aquasecurity/vuln-list-update/alpine"
 	"github.com/aquasecurity/vuln-list-update/amazon"
-	susecvrf "github.com/aquasecurity/vuln-list-update/cvrf/suse"
-	"github.com/aquasecurity/vuln-list-update/debian"
+	debianoval "github.com/aquasecurity/vuln-list-update/debian/oval"
+	"github.com/aquasecurity/vuln-list-update/debian/tracker"
 	"github.com/aquasecurity/vuln-list-update/ghsa"
 	"github.com/aquasecurity/vuln-list-update/git"
 	"github.com/aquasecurity/vuln-list-update/nvd"
-	debianoval "github.com/aquasecurity/vuln-list-update/oval/debian"
-	oracleoval "github.com/aquasecurity/vuln-list-update/oval/oracle"
-	redhatoval "github.com/aquasecurity/vuln-list-update/oval/redhat"
+	oracleoval "github.com/aquasecurity/vuln-list-update/oracle/oval"
 	"github.com/aquasecurity/vuln-list-update/photon"
-	"github.com/aquasecurity/vuln-list-update/redhat"
+	redhatoval "github.com/aquasecurity/vuln-list-update/redhat/oval"
+	"github.com/aquasecurity/vuln-list-update/redhat/securitydataapi"
+	susecvrf "github.com/aquasecurity/vuln-list-update/suse/cvrf"
 	"github.com/aquasecurity/vuln-list-update/ubuntu"
 	"github.com/aquasecurity/vuln-list-update/utils"
 )
@@ -95,7 +95,7 @@ func run() error {
 		if len(yearList) == 0 {
 			return xerrors.New("years must be specified")
 		}
-		if err := redhat.Update(yearList); err != nil {
+		if err := securitydataapi.Update(yearList); err != nil {
 			return err
 		}
 		commitMsg = "RedHat " + *years
@@ -106,7 +106,7 @@ func run() error {
 		}
 		commitMsg = "Red Hat OVAL v2"
 	case "debian":
-		dc := debian.NewClient()
+		dc := tracker.NewClient()
 		if err := dc.Update(); err != nil {
 			return xerrors.Errorf("error in Debian update: %w", err)
 		}
diff --git a/oval/oracle/oracle.go b/oracle/oval/oval.go
similarity index 99%
rename from oval/oracle/oracle.go
rename to oracle/oval/oval.go
index cc481d7..cbdf1f7 100644
--- a/oval/oracle/oracle.go
+++ b/oracle/oval/oval.go
@@ -1,4 +1,4 @@
-package oracle
+package oval
 
 import (
 	"bytes"
diff --git a/oval/oracle/oracle_test.go b/oracle/oval/oval_test.go
similarity index 98%
rename from oval/oracle/oracle_test.go
rename to oracle/oval/oval_test.go
index 3321279..edf4a95 100644
--- a/oval/oracle/oracle_test.go
+++ b/oracle/oval/oval_test.go
@@ -1,4 +1,4 @@
-package oracle_test
+package oval_test
 
 import (
 	"flag"
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/aquasecurity/vuln-list-update/oval/oracle"
+	"github.com/aquasecurity/vuln-list-update/oracle/oval"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/spf13/afero"
@@ -127,7 +127,7 @@ func TestConfig_Update(t *testing.T) {
 			}))
 			defer ts.Close()
 			url := ts.URL + "/oval/com.oracle.elsa-all.xml.bz2"
-			c := oracle.Config{
+			c := oval.Config{
 				VulnListDir: "/tmp",
 				URL:         url,
 				AppFs:       tc.appFs,
diff --git a/oval/oracle/testdata/ELSA-2007-0057.xml b/oracle/oval/testdata/ELSA-2007-0057.xml
similarity index 100%
rename from oval/oracle/testdata/ELSA-2007-0057.xml
rename to oracle/oval/testdata/ELSA-2007-0057.xml
diff --git a/cvrf/suse/testdata/EOF.txt b/oracle/oval/testdata/EOF.txt
similarity index 100%
rename from cvrf/suse/testdata/EOF.txt
rename to oracle/oval/testdata/EOF.txt
diff --git a/oval/oracle/testdata/all-positive-data.xml.bz2 b/oracle/oval/testdata/all-positive-data.xml.bz2
similarity index 100%
rename from oval/oracle/testdata/all-positive-data.xml.bz2
rename to oracle/oval/testdata/all-positive-data.xml.bz2
diff --git a/oval/oracle/testdata/broken-oval-data.xml.bz2 b/oracle/oval/testdata/broken-oval-data.xml.bz2
similarity index 100%
rename from oval/oracle/testdata/broken-oval-data.xml.bz2
rename to oracle/oval/testdata/broken-oval-data.xml.bz2
diff --git a/oval/oracle/testdata/elsa-2018-1196-1.xml.bz2 b/oracle/oval/testdata/elsa-2018-1196-1.xml.bz2
similarity index 100%
rename from oval/oracle/testdata/elsa-2018-1196-1.xml.bz2
rename to oracle/oval/testdata/elsa-2018-1196-1.xml.bz2
diff --git a/oval/oracle/testdata/golden/ELSA-2007-0057.json b/oracle/oval/testdata/golden/ELSA-2007-0057.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2007-0057.json
rename to oracle/oval/testdata/golden/ELSA-2007-0057.json
diff --git a/oval/oracle/testdata/golden/ELSA-2008-0110.json b/oracle/oval/testdata/golden/ELSA-2008-0110.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2008-0110.json
rename to oracle/oval/testdata/golden/ELSA-2008-0110.json
diff --git a/oval/oracle/testdata/golden/ELSA-2009-1203.json b/oracle/oval/testdata/golden/ELSA-2009-1203.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2009-1203.json
rename to oracle/oval/testdata/golden/ELSA-2009-1203.json
diff --git a/oval/oracle/testdata/golden/ELSA-2010-0809.json b/oracle/oval/testdata/golden/ELSA-2010-0809.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2010-0809.json
rename to oracle/oval/testdata/golden/ELSA-2010-0809.json
diff --git a/oval/oracle/testdata/golden/ELSA-2011-1268.json b/oracle/oval/testdata/golden/ELSA-2011-1268.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2011-1268.json
rename to oracle/oval/testdata/golden/ELSA-2011-1268.json
diff --git a/oval/oracle/testdata/golden/ELSA-2012-1261.json b/oracle/oval/testdata/golden/ELSA-2012-1261.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2012-1261.json
rename to oracle/oval/testdata/golden/ELSA-2012-1261.json
diff --git a/oval/oracle/testdata/golden/ELSA-2013-1732.json b/oracle/oval/testdata/golden/ELSA-2013-1732.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2013-1732.json
rename to oracle/oval/testdata/golden/ELSA-2013-1732.json
diff --git a/oval/oracle/testdata/golden/ELSA-2014-2010.json b/oracle/oval/testdata/golden/ELSA-2014-2010.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2014-2010.json
rename to oracle/oval/testdata/golden/ELSA-2014-2010.json
diff --git a/oval/oracle/testdata/golden/ELSA-2015-2561.json b/oracle/oval/testdata/golden/ELSA-2015-2561.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2015-2561.json
rename to oracle/oval/testdata/golden/ELSA-2015-2561.json
diff --git a/oval/oracle/testdata/golden/ELSA-2016-3646.json b/oracle/oval/testdata/golden/ELSA-2016-3646.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2016-3646.json
rename to oracle/oval/testdata/golden/ELSA-2016-3646.json
diff --git a/oval/oracle/testdata/golden/ELSA-2017-3516.json b/oracle/oval/testdata/golden/ELSA-2017-3516.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2017-3516.json
rename to oracle/oval/testdata/golden/ELSA-2017-3516.json
diff --git a/oval/oracle/testdata/golden/ELSA-2018-1196-1.json b/oracle/oval/testdata/golden/ELSA-2018-1196-1.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2018-1196-1.json
rename to oracle/oval/testdata/golden/ELSA-2018-1196-1.json
diff --git a/oval/oracle/testdata/golden/ELSA-2018-3410.json b/oracle/oval/testdata/golden/ELSA-2018-3410.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2018-3410.json
rename to oracle/oval/testdata/golden/ELSA-2018-3410.json
diff --git a/oval/oracle/testdata/golden/ELSA-2019-4820.json b/oracle/oval/testdata/golden/ELSA-2019-4820.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2019-4820.json
rename to oracle/oval/testdata/golden/ELSA-2019-4820.json
diff --git a/oval/oracle/testdata/golden/ELSA-2019-4821.json b/oracle/oval/testdata/golden/ELSA-2019-4821.json
similarity index 100%
rename from oval/oracle/testdata/golden/ELSA-2019-4821.json
rename to oracle/oval/testdata/golden/ELSA-2019-4821.json
diff --git a/oval/oracle/testdata/invalid-title-format.xml.bz2 b/oracle/oval/testdata/invalid-title-format.xml.bz2
similarity index 100%
rename from oval/oracle/testdata/invalid-title-format.xml.bz2
rename to oracle/oval/testdata/invalid-title-format.xml.bz2
diff --git a/oval/oracle/testdata/invalid.txt b/oracle/oval/testdata/invalid.txt
similarity index 100%
rename from oval/oracle/testdata/invalid.txt
rename to oracle/oval/testdata/invalid.txt
diff --git a/oval/oracle/types.go b/oracle/oval/types.go
similarity index 98%
rename from oval/oracle/types.go
rename to oracle/oval/types.go
index 4ac7322..9fcadc6 100644
--- a/oval/oracle/types.go
+++ b/oracle/oval/types.go
@@ -1,4 +1,4 @@
-package oracle
+package oval
 
 type Oval struct {
 	Definitions []Definition `xml:"definitions>definition"`
diff --git a/oval/oracle/types_test.go b/oracle/oval/types_test.go
similarity index 86%
rename from oval/oracle/types_test.go
rename to oracle/oval/types_test.go
index 9b55ab3..b8fbe40 100644
--- a/oval/oracle/types_test.go
+++ b/oracle/oval/types_test.go
@@ -1,11 +1,11 @@
-package oracle_test
+package oval_test
 
 import (
 	"encoding/xml"
 	"io/ioutil"
 	"testing"
 
-	"github.com/aquasecurity/vuln-list-update/oval/oracle"
+	"github.com/aquasecurity/vuln-list-update/oracle/oval"
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -14,18 +14,18 @@ import (
 func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 	tests := map[string]struct {
 		in   string
-		want *oracle.Oval
+		want *oval.Oval
 	}{
 		"nested_criterias_elsa_data": {
 			// https://linux.oracle.com/oval/com.oracle.elsa-20070057.xml
 			in: "testdata/ELSA-2007-0057.xml",
-			want: &oracle.Oval{
-				Definitions: []oracle.Definition{
+			want: &oval.Oval{
+				Definitions: []oval.Definition{
 					{
 						Title:       "\nELSA-2007-0057:  Moderate: bind security update  (MODERATE)\n",
 						Description: "\n [30:9.3.3-8]\n - added fix for #224445 - CVE-2007-0493 BIND might crash after\n   attempting to read free()-ed memory\n - added fix for #225229 - CVE-2007-0494 BIND dnssec denial of service\n - Resolves: rhbz#224445\n - Resolves: rhbz#225229 \n",
 						Platform:    []string{"Oracle Linux 5"},
-						References: []oracle.Reference{
+						References: []oval.Reference{
 							{
 								Source: "elsa",
 								URI:    "http://linux.oracle.com/errata/ELSA-2007-0057.html",
@@ -42,16 +42,16 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 								ID:     "CVE-2007-0494",
 							},
 						},
-						Criteria: oracle.Criteria{
+						Criteria: oval.Criteria{
 							Operator: "AND",
-							Criterias: []*oracle.Criteria{
+							Criterias: []*oval.Criteria{
 								{
 									Operator: "OR",
-									Criterias: []*oracle.Criteria{
+									Criterias: []*oval.Criteria{
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind-devel is earlier than 30:9.3.3-8.el5",
 												},
@@ -63,7 +63,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind-sdb is earlier than 30:9.3.3-8.el5",
 												},
@@ -75,7 +75,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind-libs is earlier than 30:9.3.3-8.el5",
 												},
@@ -87,7 +87,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind-libbind-devel is earlier than 30:9.3.3-8.el5",
 												},
@@ -99,7 +99,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind-utils is earlier than 30:9.3.3-8.el5",
 												},
@@ -111,7 +111,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind-chroot is earlier than 30:9.3.3-8.el5",
 												},
@@ -123,7 +123,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "bind is earlier than 30:9.3.3-8.el5",
 												},
@@ -135,7 +135,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 										{
 											Operator:  "AND",
 											Criterias: nil,
-											Criterions: []oracle.Criterion{
+											Criterions: []oval.Criterion{
 												{
 													Comment: "caching-nameserver is earlier than 30:9.3.3-8.el5",
 												},
@@ -148,14 +148,14 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 									Criterions: nil,
 								},
 							},
-							Criterions: []oracle.Criterion{
+							Criterions: []oval.Criterion{
 								{
 									Comment: "Oracle Linux 5 is installed",
 								},
 							},
 						},
 						Severity: "MODERATE",
-						Cves: []oracle.Cve{
+						Cves: []oval.Cve{
 							{
 								Impact: "",
 								Href:   "http://linux.oracle.com/cve/CVE-2007-0493.html",
@@ -179,7 +179,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			got := &oracle.Oval{}
+			got := &oval.Oval{}
 			err = xml.Unmarshal(xmlByte, got)
 			if err != nil {
 				require.NoError(t, err)
diff --git a/oval/redhat/redhat.go b/redhat/oval/redhat.go
similarity index 99%
rename from oval/redhat/redhat.go
rename to redhat/oval/redhat.go
index b6f89a0..a2a3c2e 100644
--- a/oval/redhat/redhat.go
+++ b/redhat/oval/redhat.go
@@ -1,4 +1,4 @@
-package redhat
+package oval
 
 import (
 	"bufio"
diff --git a/oval/redhat/redhat_test.go b/redhat/oval/redhat_test.go
similarity index 99%
rename from oval/redhat/redhat_test.go
rename to redhat/oval/redhat_test.go
index 93ea1ce..758b655 100644
--- a/oval/redhat/redhat_test.go
+++ b/redhat/oval/redhat_test.go
@@ -1,4 +1,4 @@
-package redhat
+package oval
 
 import (
 	"errors"
diff --git a/oval/redhat/testdata/PULP_MANIFEST b/redhat/oval/testdata/PULP_MANIFEST
similarity index 100%
rename from oval/redhat/testdata/PULP_MANIFEST
rename to redhat/oval/testdata/PULP_MANIFEST
diff --git a/oval/redhat/testdata/ansible-2-including-unpatched.oval.xml.bz2 b/redhat/oval/testdata/ansible-2-including-unpatched.oval.xml.bz2
similarity index 100%
rename from oval/redhat/testdata/ansible-2-including-unpatched.oval.xml.bz2
rename to redhat/oval/testdata/ansible-2-including-unpatched.oval.xml.bz2
diff --git a/oval/redhat/testdata/dotnet-3.1-including-unpatched.oval.xml.bz2 b/redhat/oval/testdata/dotnet-3.1-including-unpatched.oval.xml.bz2
similarity index 100%
rename from oval/redhat/testdata/dotnet-3.1-including-unpatched.oval.xml.bz2
rename to redhat/oval/testdata/dotnet-3.1-including-unpatched.oval.xml.bz2
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/CVE-2020-10744.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/CVE-2020-10744.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/CVE-2020-10744.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/CVE-2020-10744.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/CVE-2020-1734.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/CVE-2020-1734.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/CVE-2020-1734.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/CVE-2020-1734.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/CVE-2020-1738.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/CVE-2020-1738.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/CVE-2020-1738.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/CVE-2020-1738.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/RHSA-2019-3927.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/RHSA-2019-3927.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/RHSA-2019-3927.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/RHSA-2019-3927.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/RHSA-2020-0215.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/RHSA-2020-0215.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/RHSA-2020-0215.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/RHSA-2020-0215.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/objects.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/objects.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/objects.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/objects.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/states.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/states.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/states.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/states.json
diff --git a/oval/redhat/testdata/golden/ansible-2-including-unpatched/tests.json b/redhat/oval/testdata/golden/ansible-2-including-unpatched/tests.json
similarity index 100%
rename from oval/redhat/testdata/golden/ansible-2-including-unpatched/tests.json
rename to redhat/oval/testdata/golden/ansible-2-including-unpatched/tests.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0605.unaffected.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0605.unaffected.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0605.unaffected.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0605.unaffected.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0606.unaffected.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0606.unaffected.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0606.unaffected.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/CVE-2020-0606.unaffected.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-0134.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-0134.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-0134.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-0134.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-2249.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-2249.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-2249.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/RHSA-2020-2249.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/objects.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/objects.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/objects.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/objects.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/states.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/states.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/states.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/states.json
diff --git a/oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/tests.json b/redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/tests.json
similarity index 100%
rename from oval/redhat/testdata/golden/dotnet-3.1-including-unpatched/tests.json
rename to redhat/oval/testdata/golden/dotnet-3.1-including-unpatched/tests.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2014-3209.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2014-3209.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2014-3209.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2014-3209.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5361.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5361.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5361.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5361.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5391.unaffected.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5391.unaffected.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5391.unaffected.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2016-5391.unaffected.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2018-5389.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2018-5389.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2018-5389.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2018-5389.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2020-28935.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2020-28935.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/CVE-2020-28935.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/CVE-2020-28935.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/RHBA-2014-1396.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/RHBA-2014-1396.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/RHBA-2014-1396.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/RHBA-2014-1396.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/objects.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/objects.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/objects.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/objects.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/states.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/states.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/states.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/states.json
diff --git a/oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/tests.json b/redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/tests.json
similarity index 100%
rename from oval/redhat/testdata/golden/rhel-6-extras-including-unpatched/tests.json
rename to redhat/oval/testdata/golden/rhel-6-extras-including-unpatched/tests.json
diff --git a/oval/redhat/testdata/rhel-6-extras-including-unpatched-broken-XML.oval.xml.bz2 b/redhat/oval/testdata/rhel-6-extras-including-unpatched-broken-XML.oval.xml.bz2
similarity index 100%
rename from oval/redhat/testdata/rhel-6-extras-including-unpatched-broken-XML.oval.xml.bz2
rename to redhat/oval/testdata/rhel-6-extras-including-unpatched-broken-XML.oval.xml.bz2
diff --git a/oval/redhat/testdata/rhel-6-extras-including-unpatched.oval.xml.bz2 b/redhat/oval/testdata/rhel-6-extras-including-unpatched.oval.xml.bz2
similarity index 100%
rename from oval/redhat/testdata/rhel-6-extras-including-unpatched.oval.xml.bz2
rename to redhat/oval/testdata/rhel-6-extras-including-unpatched.oval.xml.bz2
diff --git a/oval/redhat/testdata/test.txt b/redhat/oval/testdata/test.txt
similarity index 100%
rename from oval/redhat/testdata/test.txt
rename to redhat/oval/testdata/test.txt
diff --git a/oval/redhat/types.go b/redhat/oval/types.go
similarity index 99%
rename from oval/redhat/types.go
rename to redhat/oval/types.go
index a72524d..02513fc 100644
--- a/oval/redhat/types.go
+++ b/redhat/oval/types.go
@@ -1,4 +1,4 @@
-package redhat
+package oval
 
 import (
 	"encoding/xml"
diff --git a/redhat/redhat.go b/redhat/securitydataapi/redhat.go
similarity index 99%
rename from redhat/redhat.go
rename to redhat/securitydataapi/redhat.go
index f5edb84..3963ba0 100644
--- a/redhat/redhat.go
+++ b/redhat/securitydataapi/redhat.go
@@ -1,4 +1,4 @@
-package redhat
+package securitydataapi
 
 import (
 	"encoding/json"
diff --git a/redhat/testdata/CVE-2009-2694.json b/redhat/securitydataapi/testdata/CVE-2009-2694.json
similarity index 100%
rename from redhat/testdata/CVE-2009-2694.json
rename to redhat/securitydataapi/testdata/CVE-2009-2694.json
diff --git a/redhat/testdata/CVE-2019-7614.json b/redhat/securitydataapi/testdata/CVE-2019-7614.json
similarity index 100%
rename from redhat/testdata/CVE-2019-7614.json
rename to redhat/securitydataapi/testdata/CVE-2019-7614.json
diff --git a/redhat/types.go b/redhat/securitydataapi/types.go
similarity index 99%
rename from redhat/types.go
rename to redhat/securitydataapi/types.go
index 446de18..dd9baa8 100644
--- a/redhat/types.go
+++ b/redhat/securitydataapi/types.go
@@ -1,4 +1,4 @@
-package redhat
+package securitydataapi
 
 import (
 	"encoding/json"
diff --git a/redhat/types_test.go b/redhat/securitydataapi/types_test.go
similarity index 86%
rename from redhat/types_test.go
rename to redhat/securitydataapi/types_test.go
index e41b314..bf916a0 100644
--- a/redhat/types_test.go
+++ b/redhat/securitydataapi/types_test.go
@@ -1,4 +1,4 @@
-package redhat_test
+package securitydataapi_test
 
 import (
 	"encoding/json"
@@ -6,33 +6,33 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/aquasecurity/vuln-list-update/redhat"
+	"github.com/aquasecurity/vuln-list-update/redhat/securitydataapi"
 	"github.com/kylelemons/godebug/pretty"
 )
 
 func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 	tests := map[string]struct {
 		in   string
-		want *redhat.RedhatCVEJSON
+		want *securitydataapi.RedhatCVEJSON
 	}{
 		"mitigation_string": {
 			in: "testdata/CVE-2019-7614.json",
-			want: &redhat.RedhatCVEJSON{
+			want: &securitydataapi.RedhatCVEJSON{
 				ThreatSeverity: "Low",
 				PublicDate:     "2019-07-31T00:00:00",
-				Bugzilla: redhat.RedhatBugzilla{
+				Bugzilla: securitydataapi.RedhatBugzilla{
 					RedhatCVEID: 0,
 					Description: "\nCVE-2019-7614 elasticsearch: Race condition in response headers on systems with multiple submitting requests\n    ",
 					BugzillaID:  "1747240",
 					URL:         "https://bugzilla.redhat.com/show_bug.cgi?id=1747240",
 				},
-				Cvss: redhat.RedhatCvss{
+				Cvss: securitydataapi.RedhatCvss{
 					RedhatCVEID:       0,
 					CvssBaseScore:     "",
 					CvssScoringVector: "",
 					Status:            "",
 				},
-				Cvss3: redhat.RedhatCvss3{
+				Cvss3: securitydataapi.RedhatCvss3{
 					RedhatCVEID:        0,
 					Cvss3BaseScore:     "2.0",
 					Cvss3ScoringVector: "CVSS:3.0/AV:A/AC:H/PR:H/UI:N/S:U/C:L/I:N/A:N",
@@ -43,7 +43,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 				Statement:       "\nRed Hat JBoss Fuse 6: \nThis vulnerability has been rated as having a security impact of Low. After evaluation and in accordance with the criteria noted in the product support life cycle, there are no plans to address this issue in an upcoming release. Please contact Red Hat Support for further information.\n    ",
 				Acknowledgement: "",
 				Mitigation:      "\nThere is no mitigation for this issue, the flaw can only be resolved by applying updates.\n    ",
-				PackageState: []redhat.RedhatPackageState{
+				PackageState: []securitydataapi.RedhatPackageState{
 					{
 						RedhatCVEID: 0,
 						ProductName: "Red Hat JBoss Fuse 6",
@@ -59,7 +59,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 						Cpe:         "cpe:/a:redhat:jboss_fuse:7",
 					},
 				},
-				//AffectedRelease:      []redhat.RedhatAffectedRelease{},
+				//AffectedRelease:      []securitydataapi.RedhatAffectedRelease{},
 				Name:                 "CVE-2019-7614",
 				DocumentDistribution: "",
 				Details: []string{
@@ -70,22 +70,22 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 		},
 		"mitigation_object": {
 			in: "testdata/CVE-2009-2694.json",
-			want: &redhat.RedhatCVEJSON{
+			want: &securitydataapi.RedhatCVEJSON{
 				ThreatSeverity: "Critical",
 				PublicDate:     "2009-08-18T00:00:00Z",
-				Bugzilla: redhat.RedhatBugzilla{
+				Bugzilla: securitydataapi.RedhatBugzilla{
 					RedhatCVEID: 0,
 					Description: "\nCVE-2009-2694 pidgin: insufficient input validation in msn_slplink_process_msg()\n    ",
 					BugzillaID:  "514957",
 					URL:         "https://bugzilla.redhat.com/show_bug.cgi?id=514957",
 				},
-				Cvss: redhat.RedhatCvss{
+				Cvss: securitydataapi.RedhatCvss{
 					RedhatCVEID:       0,
 					CvssBaseScore:     "7.5",
 					CvssScoringVector: "AV:N/AC:L/Au:N/C:P/I:P/A:P",
 					Status:            "verified",
 				},
-				Cvss3: redhat.RedhatCvss3{
+				Cvss3: securitydataapi.RedhatCvss3{
 					RedhatCVEID:        0,
 					Cvss3BaseScore:     "",
 					Cvss3ScoringVector: "",
@@ -96,8 +96,8 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 				Statement:       "",
 				Acknowledgement: "",
 				Mitigation:      "\nUsers can lower the impact of this flaw by making sure their privacy settings only allow Pidgin to accept messages from the users on their buddy list.  This will prevent exploitation of this flaw by other random MSN users.\n    ",
-				AffectedRelease: []redhat.RedhatAffectedRelease{
-					redhat.RedhatAffectedRelease{
+				AffectedRelease: []securitydataapi.RedhatAffectedRelease{
+					securitydataapi.RedhatAffectedRelease{
 						RedhatCVEID: 0,
 						ProductName: "Red Hat Enterprise Linux 3",
 						ReleaseDate: "2009-08-18T00:00:00Z",
@@ -121,7 +121,7 @@ func TestRedhatCVEJSON_UnmarshalJSON(t *testing.T) {
 				t.Fatalf("unknown error: %s", err)
 			}
 
-			got := &redhat.RedhatCVEJSON{}
+			got := &securitydataapi.RedhatCVEJSON{}
 			err = json.Unmarshal(jsonByte, got)
 			if err != nil {
 				t.Fatalf("unknown error: %s", err)
diff --git a/cvrf/suse/suse.go b/suse/cvrf/cvrf.go
similarity index 99%
rename from cvrf/suse/suse.go
rename to suse/cvrf/cvrf.go
index af8eeb4..6f09c3b 100644
--- a/cvrf/suse/suse.go
+++ b/suse/cvrf/cvrf.go
@@ -1,4 +1,4 @@
-package suse
+package cvrf
 
 import (
 	"bufio"
diff --git a/cvrf/suse/suse_test.go b/suse/cvrf/cvrf_test.go
similarity index 98%
rename from cvrf/suse/suse_test.go
rename to suse/cvrf/cvrf_test.go
index 26115b4..7d96173 100644
--- a/cvrf/suse/suse_test.go
+++ b/suse/cvrf/cvrf_test.go
@@ -1,4 +1,4 @@
-package suse_test
+package cvrf_test
 
 import (
 	"flag"
@@ -8,11 +8,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/aquasecurity/vuln-list-update/cvrf/suse"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/spf13/afero"
+
+	"github.com/aquasecurity/vuln-list-update/suse/cvrf"
 )
 
 var update = flag.Bool("update", false, "update golden files")
@@ -114,7 +115,7 @@ func TestConfig_Update(t *testing.T) {
 			}))
 			defer ts.Close()
 			url := ts.URL + "/pub/projects/security/cvrf/"
-			c := suse.Config{
+			c := cvrf.Config{
 				VulnListDir: "/tmp",
 				URL:         url,
 				AppFs:       tc.appFs,
diff --git a/oval/oracle/testdata/EOF.txt b/suse/cvrf/testdata/EOF.txt
similarity index 100%
rename from oval/oracle/testdata/EOF.txt
rename to suse/cvrf/testdata/EOF.txt
diff --git a/cvrf/suse/testdata/broken-cvrf-data.xml b/suse/cvrf/testdata/broken-cvrf-data.xml
similarity index 100%
rename from cvrf/suse/testdata/broken-cvrf-data.xml
rename to suse/cvrf/testdata/broken-cvrf-data.xml
diff --git a/cvrf/suse/testdata/cvrf-list.html b/suse/cvrf/testdata/cvrf-list.html
similarity index 100%
rename from cvrf/suse/testdata/cvrf-list.html
rename to suse/cvrf/testdata/cvrf-list.html
diff --git a/cvrf/suse/testdata/cvrf-opensuse-su-2015-0225-1.xml b/suse/cvrf/testdata/cvrf-opensuse-su-2015-0225-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-opensuse-su-2015-0225-1.xml
rename to suse/cvrf/testdata/cvrf-opensuse-su-2015-0225-1.xml
diff --git a/cvrf/suse/testdata/cvrf-opensuse-su-2015-0798-1.xml b/suse/cvrf/testdata/cvrf-opensuse-su-2015-0798-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-opensuse-su-2015-0798-1.xml
rename to suse/cvrf/testdata/cvrf-opensuse-su-2015-0798-1.xml
diff --git a/cvrf/suse/testdata/cvrf-opensuse-su-2015-1289-1.xml b/suse/cvrf/testdata/cvrf-opensuse-su-2015-1289-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-opensuse-su-2015-1289-1.xml
rename to suse/cvrf/testdata/cvrf-opensuse-su-2015-1289-1.xml
diff --git a/cvrf/suse/testdata/cvrf-opensuse-su-2016-0874-1.xml b/suse/cvrf/testdata/cvrf-opensuse-su-2016-0874-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-opensuse-su-2016-0874-1.xml
rename to suse/cvrf/testdata/cvrf-opensuse-su-2016-0874-1.xml
diff --git a/cvrf/suse/testdata/cvrf-opensuse-su-2016-3233-1.xml b/suse/cvrf/testdata/cvrf-opensuse-su-2016-3233-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-opensuse-su-2016-3233-1.xml
rename to suse/cvrf/testdata/cvrf-opensuse-su-2016-3233-1.xml
diff --git a/cvrf/suse/testdata/cvrf-opensuse-su-2018-1633-1.xml b/suse/cvrf/testdata/cvrf-opensuse-su-2018-1633-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-opensuse-su-2018-1633-1.xml
rename to suse/cvrf/testdata/cvrf-opensuse-su-2018-1633-1.xml
diff --git a/cvrf/suse/testdata/cvrf-suse-su-2018-1784-1.xml b/suse/cvrf/testdata/cvrf-suse-su-2018-1784-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-suse-su-2018-1784-1.xml
rename to suse/cvrf/testdata/cvrf-suse-su-2018-1784-1.xml
diff --git a/cvrf/suse/testdata/cvrf-suse-su-2019-14018-1.xml b/suse/cvrf/testdata/cvrf-suse-su-2019-14018-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-suse-su-2019-14018-1.xml
rename to suse/cvrf/testdata/cvrf-suse-su-2019-14018-1.xml
diff --git a/cvrf/suse/testdata/cvrf-suse-su-2019-1608-1.xml b/suse/cvrf/testdata/cvrf-suse-su-2019-1608-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-suse-su-2019-1608-1.xml
rename to suse/cvrf/testdata/cvrf-suse-su-2019-1608-1.xml
diff --git a/cvrf/suse/testdata/cvrf-suse-su-2019-3294-1.xml b/suse/cvrf/testdata/cvrf-suse-su-2019-3294-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-suse-su-2019-3294-1.xml
rename to suse/cvrf/testdata/cvrf-suse-su-2019-3294-1.xml
diff --git a/cvrf/suse/testdata/cvrf-suse-su-2019-3295-1.xml b/suse/cvrf/testdata/cvrf-suse-su-2019-3295-1.xml
similarity index 100%
rename from cvrf/suse/testdata/cvrf-suse-su-2019-3295-1.xml
rename to suse/cvrf/testdata/cvrf-suse-su-2019-3295-1.xml
diff --git a/cvrf/suse/testdata/golden/SUSE-SU-2018-1784-1.json b/suse/cvrf/testdata/golden/SUSE-SU-2018-1784-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/SUSE-SU-2018-1784-1.json
rename to suse/cvrf/testdata/golden/SUSE-SU-2018-1784-1.json
diff --git a/cvrf/suse/testdata/golden/SUSE-SU-2019-14018-1.json b/suse/cvrf/testdata/golden/SUSE-SU-2019-14018-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/SUSE-SU-2019-14018-1.json
rename to suse/cvrf/testdata/golden/SUSE-SU-2019-14018-1.json
diff --git a/cvrf/suse/testdata/golden/SUSE-SU-2019-1608-1.json b/suse/cvrf/testdata/golden/SUSE-SU-2019-1608-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/SUSE-SU-2019-1608-1.json
rename to suse/cvrf/testdata/golden/SUSE-SU-2019-1608-1.json
diff --git a/cvrf/suse/testdata/golden/SUSE-SU-2019-3294-1.json b/suse/cvrf/testdata/golden/SUSE-SU-2019-3294-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/SUSE-SU-2019-3294-1.json
rename to suse/cvrf/testdata/golden/SUSE-SU-2019-3294-1.json
diff --git a/cvrf/suse/testdata/golden/SUSE-SU-2019-3295-1.json b/suse/cvrf/testdata/golden/SUSE-SU-2019-3295-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/SUSE-SU-2019-3295-1.json
rename to suse/cvrf/testdata/golden/SUSE-SU-2019-3295-1.json
diff --git a/cvrf/suse/testdata/golden/openSUSE-SU-2015-0225-1.json b/suse/cvrf/testdata/golden/openSUSE-SU-2015-0225-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/openSUSE-SU-2015-0225-1.json
rename to suse/cvrf/testdata/golden/openSUSE-SU-2015-0225-1.json
diff --git a/cvrf/suse/testdata/golden/openSUSE-SU-2015-0798-1.json b/suse/cvrf/testdata/golden/openSUSE-SU-2015-0798-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/openSUSE-SU-2015-0798-1.json
rename to suse/cvrf/testdata/golden/openSUSE-SU-2015-0798-1.json
diff --git a/cvrf/suse/testdata/golden/openSUSE-SU-2015-1289-1.json b/suse/cvrf/testdata/golden/openSUSE-SU-2015-1289-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/openSUSE-SU-2015-1289-1.json
rename to suse/cvrf/testdata/golden/openSUSE-SU-2015-1289-1.json
diff --git a/cvrf/suse/testdata/golden/openSUSE-SU-2016-0874-1.json b/suse/cvrf/testdata/golden/openSUSE-SU-2016-0874-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/openSUSE-SU-2016-0874-1.json
rename to suse/cvrf/testdata/golden/openSUSE-SU-2016-0874-1.json
diff --git a/cvrf/suse/testdata/golden/openSUSE-SU-2016-3233-1.json b/suse/cvrf/testdata/golden/openSUSE-SU-2016-3233-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/openSUSE-SU-2016-3233-1.json
rename to suse/cvrf/testdata/golden/openSUSE-SU-2016-3233-1.json
diff --git a/cvrf/suse/testdata/golden/openSUSE-SU-2018-1633-1.json b/suse/cvrf/testdata/golden/openSUSE-SU-2018-1633-1.json
similarity index 100%
rename from cvrf/suse/testdata/golden/openSUSE-SU-2018-1633-1.json
rename to suse/cvrf/testdata/golden/openSUSE-SU-2018-1633-1.json
diff --git a/cvrf/suse/testdata/invalid-cvrf-list.html b/suse/cvrf/testdata/invalid-cvrf-list.html
similarity index 100%
rename from cvrf/suse/testdata/invalid-cvrf-list.html
rename to suse/cvrf/testdata/invalid-cvrf-list.html
diff --git a/cvrf/suse/testdata/invalid.txt b/suse/cvrf/testdata/invalid.txt
similarity index 100%
rename from cvrf/suse/testdata/invalid.txt
rename to suse/cvrf/testdata/invalid.txt
diff --git a/cvrf/suse/types.go b/suse/cvrf/types.go
similarity index 99%
rename from cvrf/suse/types.go
rename to suse/cvrf/types.go
index 7a24d60..7103b63 100644
--- a/cvrf/suse/types.go
+++ b/suse/cvrf/types.go
@@ -1,4 +1,4 @@
-package suse
+package cvrf
 
 type Cvrf struct {
 	Title           string           `xml:"DocumentTitle"`