Remove indirect imports from __init__ from our code.

18 files changed, 38 insertions, 28 deletions

diff --git a/docs/quickstart.md b/docs/quickstart.md
index d916bc5a..1088e51a 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -6,7 +6,7 @@
 1. Install the latest version with `pip install -U sec-certs && python -m spacy download en_core_web_sm` (see [installation](installation.md)).
 2. In your Python interpreter, type
 ```python
-from sec_certs.dataset import CCDataset
+from sec_certs.dataset.cc import CCDataset
 
 dset = CCDataset.from_web_latest()
 ```
@@ -19,7 +19,7 @@ to obtain to obtain freshly processed dataset from [seccerts.org](https://seccer
 1. Install the latest version with `pip install -U sec-certs && python -m spacy download en_core_web_sm` (see [installation](installation.md)).
 2. In your Python interpreter, type
 ```python
-from sec_certs.dataset import FIPSDataset
+from sec_certs.dataset.fips import FIPSDataset
 
 dset = FIPSDataset.from_web_latest()
 ```
diff --git a/src/sec_certs/cli.py b/src/sec_certs/cli.py
index d1a1eb90..9bd74108 100644
--- a/src/sec_certs/cli.py
+++ b/src/sec_certs/cli.py
@@ -12,8 +12,9 @@ import click
 from pydantic import ValidationError
 
 from sec_certs.configuration import config
-from sec_certs.dataset import CCDataset, FIPSDataset
+from sec_certs.dataset.cc import CCDataset
 from sec_certs.dataset.dataset import Dataset
+from sec_certs.dataset.fips import FIPSDataset
 from sec_certs.utils.helpers import warn_if_missing_poppler, warn_if_missing_tesseract
 
 logger = logging.getLogger(__name__)
diff --git a/src/sec_certs/dataset/fips_algorithm.py b/src/sec_certs/dataset/fips_algorithm.py
index df113381..fbc8351a 100644
--- a/src/sec_certs/dataset/fips_algorithm.py
+++ b/src/sec_certs/dataset/fips_algorithm.py
@@ -12,7 +12,7 @@ from bs4 import BeautifulSoup
 
 from sec_certs import constants
 from sec_certs.dataset.json_path_dataset import JSONPathDataset
-from sec_certs.sample import FIPSAlgorithm
+from sec_certs.sample.fips_algorithm import FIPSAlgorithm
 from sec_certs.serialization.json import ComplexSerializableType
 from sec_certs.utils import helpers
 
diff --git a/src/sec_certs/model/cc_matching.py b/src/sec_certs/model/cc_matching.py
index 674548ff..9c081ed2 100644
--- a/src/sec_certs/model/cc_matching.py
+++ b/src/sec_certs/model/cc_matching.py
@@ -9,10 +9,10 @@ from rapidfuzz import fuzz
 from sec_certs.configuration import config
 
 if typing.TYPE_CHECKING:
-    from sec_certs.dataset import CCDataset
-    from sec_certs.sample import CCCertificate
+    from sec_certs.dataset.cc import CCDataset
+    from sec_certs.sample.cc import CCCertificate
 
-from sec_certs.sample import CertificateId
+from sec_certs.sample.cc_certificate_id import CertificateId
 from sec_certs.utils.strings import fully_sanitize_string
 
 
diff --git a/src/sec_certs/serialization/__init__.py b/src/sec_certs/serialization/__init__.py
index e69de29b..faa56704 100644
--- a/src/sec_certs/serialization/__init__.py
+++ b/src/sec_certs/serialization/__init__.py
@@ -0,0 +1 @@
+"""This package provides tols for serialization of datasets and certificates."""
diff --git a/src/sec_certs/utils/__init__.py b/src/sec_certs/utils/__init__.py
index e69de29b..45b35aea 100644
--- a/src/sec_certs/utils/__init__.py
+++ b/src/sec_certs/utils/__init__.py
@@ -0,0 +1 @@
+"""This package provides utilities used throught the framework."""
diff --git a/tests/cc/conftest.py b/tests/cc/conftest.py
index 844e8130..8d5d388a 100644
--- a/tests/cc/conftest.py
+++ b/tests/cc/conftest.py
@@ -7,8 +7,8 @@ import pytest
 import tests.data.cc.analysis
 import tests.data.cc.certificate
 import tests.data.cc.dataset
-from sec_certs.dataset import CCDataset
-from sec_certs.sample import CCCertificate, ProtectionProfile
+from sec_certs.dataset.cc import CCDataset
+from sec_certs.sample.cc import CCCertificate, ProtectionProfile
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/cc/test_cc_analysis.py b/tests/cc/test_cc_analysis.py
index 3c5f4fa5..45b4214e 100644
--- a/tests/cc/test_cc_analysis.py
+++ b/tests/cc/test_cc_analysis.py
@@ -8,7 +8,7 @@ from dateutil.parser import isoparse
 
 import tests.data.cc.analysis
 from sec_certs.cert_rules import SARS_IMPLIED_FROM_EAL
-from sec_certs.dataset import CCDataset
+from sec_certs.dataset.cc import CCDataset
 from sec_certs.dataset.cpe import CPEDataset
 from sec_certs.dataset.cve import CVEDataset
 from sec_certs.sample.cc import CCCertificate
diff --git a/tests/cc/test_cc_certificate.py b/tests/cc/test_cc_certificate.py
index 32d69d3b..35482e8a 100644
--- a/tests/cc/test_cc_certificate.py
+++ b/tests/cc/test_cc_certificate.py
@@ -1,7 +1,7 @@
 import json
 from pathlib import Path
 
-from sec_certs.sample import CCCertificate
+from sec_certs.sample.cc import CCCertificate
 
 
 def test_extract_metadata(vulnerable_certificate: CCCertificate):
diff --git a/tests/cc/test_cc_dataset.py b/tests/cc/test_cc_dataset.py
index 97050ebc..43749494 100644
--- a/tests/cc/test_cc_dataset.py
+++ b/tests/cc/test_cc_dataset.py
@@ -6,7 +6,7 @@ from tempfile import TemporaryDirectory
 import pytest
 
 from sec_certs import constants
-from sec_certs.dataset import CCDataset
+from sec_certs.dataset.cc import CCDataset
 from sec_certs.sample.cc import CCCertificate
 
 
diff --git a/tests/cc/test_cc_maintenance_updates.py b/tests/cc/test_cc_maintenance_updates.py
index 4d03df57..cf7a1644 100644
--- a/tests/cc/test_cc_maintenance_updates.py
+++ b/tests/cc/test_cc_maintenance_updates.py
@@ -3,7 +3,7 @@ from pathlib import Path
 
 import pytest
 
-from sec_certs.dataset import CCDatasetMaintenanceUpdates
+from sec_certs.dataset.cc import CCDatasetMaintenanceUpdates
 from sec_certs.sample.cc_maintenance_update import CCMaintenanceUpdate
 
 
diff --git a/tests/cc/test_cc_schemes.py b/tests/cc/test_cc_schemes.py
index 9b52fb13..d9fc7d82 100644
--- a/tests/cc/test_cc_schemes.py
+++ b/tests/cc/test_cc_schemes.py
@@ -4,9 +4,10 @@ from urllib.parse import urlparse
 import pytest
 from requests import RequestException
 
-from sec_certs.dataset import CCDataset, CCSchemeDataset
-from sec_certs.model import CCSchemeMatcher
-from sec_certs.sample import CCCertificate
+from sec_certs.dataset.cc import CCDataset
+from sec_certs.dataset.cc_scheme import CCSchemeDataset
+from sec_certs.model.cc_matching import CCSchemeMatcher
+from sec_certs.sample.cc import CCCertificate
 
 
 def absolute_urls(results):
diff --git a/tests/fips/conftest.py b/tests/fips/conftest.py
index f4482ece..3f4f4fda 100644
--- a/tests/fips/conftest.py
+++ b/tests/fips/conftest.py
@@ -9,7 +9,10 @@ from dateutil.parser import isoparse
 
 import tests.data.fips.certificate
 import tests.data.fips.dataset
-from sec_certs.dataset import CPEDataset, CVEDataset, FIPSAlgorithmDataset, FIPSDataset
+from sec_certs.dataset.cpe import CPEDataset
+from sec_certs.dataset.cve import CVEDataset
+from sec_certs.dataset.fips import FIPSDataset
+from sec_certs.dataset.fips_algorithm import FIPSAlgorithmDataset
 from sec_certs.sample.cpe import CPE, CPEConfiguration
 from sec_certs.sample.cve import CVE
 from sec_certs.sample.fips import FIPSCertificate
diff --git a/tests/fips/test_fips_analysis.py b/tests/fips/test_fips_analysis.py
index f0730079..8183a63e 100644
--- a/tests/fips/test_fips_analysis.py
+++ b/tests/fips/test_fips_analysis.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import pytest
 
-from sec_certs.dataset import CVEDataset
+from sec_certs.dataset.cve import CVEDataset
 from sec_certs.dataset.fips import FIPSDataset
 from sec_certs.sample.cpe import CPE
 from sec_certs.sample.cve import CVE
diff --git a/tests/fips/test_fips_iut.py b/tests/fips/test_fips_iut.py
index 0254a01e..a300f502 100644
--- a/tests/fips/test_fips_iut.py
+++ b/tests/fips/test_fips_iut.py
@@ -6,9 +6,10 @@ from pathlib import Path
 import pytest
 
 import tests.data.fips.iut
-from sec_certs.dataset import FIPSDataset, IUTDataset
-from sec_certs.model import FIPSProcessMatcher
-from sec_certs.sample import IUTEntry, IUTSnapshot
+from sec_certs.dataset.fips import FIPSDataset
+from sec_certs.dataset.fips_iut import IUTDataset
+from sec_certs.model.fips_matching import FIPSProcessMatcher
+from sec_certs.sample.fips_iut import IUTEntry, IUTSnapshot
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/fips/test_fips_mip.py b/tests/fips/test_fips_mip.py
index 6e5f3ba3..685bffee 100644
--- a/tests/fips/test_fips_mip.py
+++ b/tests/fips/test_fips_mip.py
@@ -6,9 +6,10 @@ from pathlib import Path
 import pytest
 
 import tests.data.fips.mip
-from sec_certs.dataset import FIPSDataset, MIPDataset
-from sec_certs.model import FIPSProcessMatcher
-from sec_certs.sample import MIPEntry, MIPSnapshot, MIPStatus
+from sec_certs.dataset.fips import FIPSDataset
+from sec_certs.dataset.fips_mip import MIPDataset
+from sec_certs.model.fips_matching import FIPSProcessMatcher
+from sec_certs.sample.fips_mip import MIPEntry, MIPSnapshot, MIPStatus
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/test_cpe.py b/tests/test_cpe.py
index 52b5acb0..6cb2ee31 100644
--- a/tests/test_cpe.py
+++ b/tests/test_cpe.py
@@ -7,8 +7,9 @@ import pytest
 
 import tests.data.cc.analysis.auxiliary_datasets
 from sec_certs import constants
-from sec_certs.dataset import CPEDataset, CVEDataset
-from sec_certs.sample import CPE, CPEConfiguration
+from sec_certs.dataset.cpe import CPEDataset
+from sec_certs.dataset.cve import CVEDataset
+from sec_certs.sample.cpe import CPE, CPEConfiguration
 from sec_certs.serialization.json import SerializationError
 
 
diff --git a/tests/test_cve.py b/tests/test_cve.py
index 7d21f2cd..db18e3f4 100644
--- a/tests/test_cve.py
+++ b/tests/test_cve.py
@@ -7,9 +7,9 @@ import pytest
 from dateutil.parser import isoparse
 
 import tests.data.cc.analysis.auxiliary_datasets
-from sec_certs.dataset import CVEDataset
-from sec_certs.sample import CVE
+from sec_certs.dataset.cve import CVEDataset
 from sec_certs.sample.cpe import CPE
+from sec_certs.sample.cve import CVE
 from sec_certs.serialization.json import SerializationError