diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py b/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py
index 776049d7..df32b204 100644
--- a/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py
+++ b/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py
@@ -7,7 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import DC3DForwardDriver
-from .inversion import DC3DInversionDriver
-from .options import DC3DForwardOptions, DC3DInversionOptions
diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/forward.py b/simpeg_drivers/electricals/direct_current/three_dimensions/forward.py
index 1eee19e1..c6f0b9e7 100644
--- a/simpeg_drivers/electricals/direct_current/three_dimensions/forward.py
+++ b/simpeg_drivers/electricals/direct_current/three_dimensions/forward.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import DC3DForwardOptions
+from simpeg_drivers.electricals.direct_current.three_dimensions.options import (
+    DC3DForwardOptions,
+)
 
 
 class DC3DForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/inversion.py b/simpeg_drivers/electricals/direct_current/three_dimensions/inversion.py
index 807c5abd..a112a699 100644
--- a/simpeg_drivers/electricals/direct_current/three_dimensions/inversion.py
+++ b/simpeg_drivers/electricals/direct_current/three_dimensions/inversion.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import DC3DInversionOptions
+from simpeg_drivers.electricals.direct_current.three_dimensions.options import (
+    DC3DInversionOptions,
+)
 
 
 class DC3DInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py b/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py
index 4f52f47e..df32b204 100644
--- a/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py
+++ b/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py
@@ -7,7 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import DC2DForwardDriver
-from .inversion import DC2DInversionDriver
-from .options import DC2DForwardOptions, DC2DInversionOptions
diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/forward.py b/simpeg_drivers/electricals/direct_current/two_dimensions/forward.py
index 0ebbe7a2..4dfacf04 100644
--- a/simpeg_drivers/electricals/direct_current/two_dimensions/forward.py
+++ b/simpeg_drivers/electricals/direct_current/two_dimensions/forward.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import DC2DForwardOptions
+from simpeg_drivers.electricals.direct_current.two_dimensions.options import (
+    DC2DForwardOptions,
+)
 
 
 class DC2DForwardDriver(ForwardDriver, Base2DDriver):
diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/inversion.py b/simpeg_drivers/electricals/direct_current/two_dimensions/inversion.py
index e6d339c7..e090c7d0 100644
--- a/simpeg_drivers/electricals/direct_current/two_dimensions/inversion.py
+++ b/simpeg_drivers/electricals/direct_current/two_dimensions/inversion.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import DC2DInversionOptions
+from simpeg_drivers.electricals.direct_current.two_dimensions.options import (
+    DC2DInversionOptions,
+)
 
 
 class DC2DInversionDriver(InversionDriver, Base2DDriver):
diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py
index 14c829d6..df32b204 100644
--- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py
+++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py
@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import IP3DForwardDriver
-from .inversion import IP3DInversionDriver
-from .options import (
-    IP3DForwardOptions,
-    IP3DInversionOptions,
-)
diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/forward.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/forward.py
index 57469334..ea19c962 100644
--- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/forward.py
+++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/forward.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import IP3DForwardOptions
+from simpeg_drivers.electricals.induced_polarization.three_dimensions.options import (
+    IP3DForwardOptions,
+)
 
 
 class IP3DForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/inversion.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/inversion.py
index bd6563d4..97c460b6 100644
--- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/inversion.py
+++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/inversion.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import IP3DInversionOptions
+from simpeg_drivers.electricals.induced_polarization.three_dimensions.options import (
+    IP3DInversionOptions,
+)
 
 
 class IP3DInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py
index aebc0e66..df32b204 100644
--- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py
+++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py
@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import IP2DForwardDriver
-from .inversion import IP2DInversionDriver
-from .options import (
-    IP2DForwardOptions,
-    IP2DInversionOptions,
-)
diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/forward.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/forward.py
index 97a540c8..c5cba460 100644
--- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/forward.py
+++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/forward.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import IP2DForwardOptions
+from simpeg_drivers.electricals.induced_polarization.two_dimensions.options import (
+    IP2DForwardOptions,
+)
 
 
 class IP2DForwardDriver(ForwardDriver, Base2DDriver):
diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/inversion.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/inversion.py
index baa40e49..2e61eb6b 100644
--- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/inversion.py
+++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/inversion.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electricals.base_2d import Base2DDriver
-
-from .options import IP2DInversionOptions
+from simpeg_drivers.electricals.induced_polarization.two_dimensions.options import (
+    IP2DInversionOptions,
+)
 
 
 class IP2DInversionDriver(InversionDriver, Base2DDriver):
diff --git a/simpeg_drivers/electromagnetics/frequency_domain/__init__.py b/simpeg_drivers/electromagnetics/frequency_domain/__init__.py
index ce3a31d1..df32b204 100644
--- a/simpeg_drivers/electromagnetics/frequency_domain/__init__.py
+++ b/simpeg_drivers/electromagnetics/frequency_domain/__init__.py
@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import FDEMForwardDriver
-from .inversion import FDEMInversionDriver
-from .options import (
-    FDEMForwardOptions,
-    FDEMInversionOptions,
-)
diff --git a/simpeg_drivers/electromagnetics/frequency_domain/forward.py b/simpeg_drivers/electromagnetics/frequency_domain/forward.py
index f5b07edb..dd539d7a 100644
--- a/simpeg_drivers/electromagnetics/frequency_domain/forward.py
+++ b/simpeg_drivers/electromagnetics/frequency_domain/forward.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import FDEMForwardOptions
+from simpeg_drivers.electromagnetics.frequency_domain.options import FDEMForwardOptions
 
 
 class FDEMForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/electromagnetics/frequency_domain/inversion.py b/simpeg_drivers/electromagnetics/frequency_domain/inversion.py
index 96ff4cf7..f83fd037 100644
--- a/simpeg_drivers/electromagnetics/frequency_domain/inversion.py
+++ b/simpeg_drivers/electromagnetics/frequency_domain/inversion.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import FDEMInversionOptions
+from simpeg_drivers.electromagnetics.frequency_domain.options import (
+    FDEMInversionOptions,
+)
 
 
 class FDEMInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/__init__.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/__init__.py
index 3165311d..df32b204 100644
--- a/simpeg_drivers/electromagnetics/frequency_domain_1d/__init__.py
+++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/__init__.py
@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import FDEM1DForwardDriver
-from .inversion import FDEM1DInversionDriver
-from .options import (
-    FDEM1DForwardOptions,
-    FDEM1DInversionOptions,
-)
diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/forward.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/forward.py
index 35c51ea3..4c7f6af6 100644
--- a/simpeg_drivers/electromagnetics/frequency_domain_1d/forward.py
+++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/forward.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import FDEM1DForwardOptions
+from simpeg_drivers.electromagnetics.frequency_domain_1d.options import (
+    FDEM1DForwardOptions,
+)
 
 
 class FDEM1DForwardDriver(ForwardDriver, Base1DDriver):
diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/inversion.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/inversion.py
index 4222f895..3bfdb636 100644
--- a/simpeg_drivers/electromagnetics/frequency_domain_1d/inversion.py
+++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/inversion.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import FDEM1DInversionOptions
+from simpeg_drivers.electromagnetics.frequency_domain_1d.options import (
+    FDEM1DInversionOptions,
+)
 
 
 class FDEM1DInversionDriver(InversionDriver, Base1DDriver):
diff --git a/simpeg_drivers/electromagnetics/time_domain/__init__.py b/simpeg_drivers/electromagnetics/time_domain/__init__.py
index b830c49c..df32b204 100644
--- a/simpeg_drivers/electromagnetics/time_domain/__init__.py
+++ b/simpeg_drivers/electromagnetics/time_domain/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import TDEMForwardDriver
-from .inversion import TDEMInversionDriver
-from .options import (
-    TDEMForwardOptions,
-    TDEMInversionOptions,
-)
diff --git a/simpeg_drivers/electromagnetics/time_domain/forward.py b/simpeg_drivers/electromagnetics/time_domain/forward.py
index f3376f29..1d2f7b14 100644
--- a/simpeg_drivers/electromagnetics/time_domain/forward.py
+++ b/simpeg_drivers/electromagnetics/time_domain/forward.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import TDEMForwardOptions
+from simpeg_drivers.electromagnetics.time_domain.options import TDEMForwardOptions
 
 
 class TDEMForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/electromagnetics/time_domain/inversion.py b/simpeg_drivers/electromagnetics/time_domain/inversion.py
index 4cf61a61..9b45cedd 100644
--- a/simpeg_drivers/electromagnetics/time_domain/inversion.py
+++ b/simpeg_drivers/electromagnetics/time_domain/inversion.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import TDEMInversionOptions
+from simpeg_drivers.electromagnetics.time_domain.options import TDEMInversionOptions
 
 
 class TDEMInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py b/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py
index b3a59549..df32b204 100644
--- a/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py
+++ b/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py
@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import TDEM1DForwardDriver
-from .inversion import TDEM1DInversionDriver
-from .options import (
-    TDEM1DForwardOptions,
-    TDEM1DInversionOptions,
-)
diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/forward.py b/simpeg_drivers/electromagnetics/time_domain_1d/forward.py
index 0c7b02b4..bf790bae 100644
--- a/simpeg_drivers/electromagnetics/time_domain_1d/forward.py
+++ b/simpeg_drivers/electromagnetics/time_domain_1d/forward.py
@@ -16,8 +16,7 @@
 
 from simpeg_drivers.driver import ForwardDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import TDEM1DForwardOptions
+from simpeg_drivers.electromagnetics.time_domain_1d.options import TDEM1DForwardOptions
 
 
 class TDEM1DForwardDriver(ForwardDriver, Base1DDriver):
diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/inversion.py b/simpeg_drivers/electromagnetics/time_domain_1d/inversion.py
index bbc7d518..6835d980 100644
--- a/simpeg_drivers/electromagnetics/time_domain_1d/inversion.py
+++ b/simpeg_drivers/electromagnetics/time_domain_1d/inversion.py
@@ -16,8 +16,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver
-
-from .options import TDEM1DInversionOptions
+from simpeg_drivers.electromagnetics.time_domain_1d.options import (
+    TDEM1DInversionOptions,
+)
 
 
 class TDEM1DInversionDriver(InversionDriver, Base1DDriver):
diff --git a/simpeg_drivers/joint/joint_cross_gradient/__init__.py b/simpeg_drivers/joint/joint_cross_gradient/__init__.py
index 51b7e774..df32b204 100644
--- a/simpeg_drivers/joint/joint_cross_gradient/__init__.py
+++ b/simpeg_drivers/joint/joint_cross_gradient/__init__.py
@@ -7,6 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .driver import JointCrossGradientDriver
-from .options import JointCrossGradientOptions
diff --git a/simpeg_drivers/joint/joint_cross_gradient/driver.py b/simpeg_drivers/joint/joint_cross_gradient/driver.py
index d002b270..7bb7c8e9 100644
--- a/simpeg_drivers/joint/joint_cross_gradient/driver.py
+++ b/simpeg_drivers/joint/joint_cross_gradient/driver.py
@@ -23,8 +23,7 @@
 from simpeg.regularization import CrossGradient
 
 from simpeg_drivers.joint.driver import BaseJointDriver
-
-from .options import JointCrossGradientOptions
+from simpeg_drivers.joint.joint_cross_gradient.options import JointCrossGradientOptions
 
 
 class JointCrossGradientDriver(BaseJointDriver):
diff --git a/simpeg_drivers/joint/joint_petrophysics/__init__.py b/simpeg_drivers/joint/joint_petrophysics/__init__.py
index 4eee21f4..df32b204 100644
--- a/simpeg_drivers/joint/joint_petrophysics/__init__.py
+++ b/simpeg_drivers/joint/joint_petrophysics/__init__.py
@@ -7,6 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .driver import JointPetrophysicsDriver
-from .options import JointPetrophysicsOptions
diff --git a/simpeg_drivers/joint/joint_petrophysics/driver.py b/simpeg_drivers/joint/joint_petrophysics/driver.py
index 67d4a547..0ce698e2 100644
--- a/simpeg_drivers/joint/joint_petrophysics/driver.py
+++ b/simpeg_drivers/joint/joint_petrophysics/driver.py
@@ -20,12 +20,8 @@
 from simpeg.objective_function import ComboObjectiveFunction
 from simpeg.regularization.pgi import PGIsmallness
 
-from simpeg_drivers.components.factories import (
-    DirectivesFactory,
-)
 from simpeg_drivers.joint.driver import BaseJointDriver
-
-from .options import JointPetrophysicsOptions
+from simpeg_drivers.joint.joint_petrophysics.options import JointPetrophysicsOptions
 
 
 class JointPetrophysicsDriver(BaseJointDriver):
diff --git a/simpeg_drivers/joint/joint_surveys/__init__.py b/simpeg_drivers/joint/joint_surveys/__init__.py
index 782d0ab7..df32b204 100644
--- a/simpeg_drivers/joint/joint_surveys/__init__.py
+++ b/simpeg_drivers/joint/joint_surveys/__init__.py
@@ -7,6 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .driver import JointSurveysDriver
-from .options import JointSurveysOptions
diff --git a/simpeg_drivers/joint/joint_surveys/driver.py b/simpeg_drivers/joint/joint_surveys/driver.py
index 25a2a8d7..0b6eb812 100644
--- a/simpeg_drivers/joint/joint_surveys/driver.py
+++ b/simpeg_drivers/joint/joint_surveys/driver.py
@@ -21,10 +21,9 @@
 
 from simpeg_drivers.driver import InversionDriver
 from simpeg_drivers.joint.driver import BaseJointDriver
+from simpeg_drivers.joint.joint_surveys.options import JointSurveysOptions
 from simpeg_drivers.options import ModelTypeEnum
 
-from .options import JointSurveysOptions
-
 
 logger = getLogger(__name__)
 
diff --git a/simpeg_drivers/natural_sources/__init__.py b/simpeg_drivers/natural_sources/__init__.py
index 8a6dc3b1..df32b204 100644
--- a/simpeg_drivers/natural_sources/__init__.py
+++ b/simpeg_drivers/natural_sources/__init__.py
@@ -7,13 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .magnetotellurics import (
-    MTForwardOptions,
-    MTInversionOptions,
-)
-from .tipper import TipperForwardOptions, TipperInversionOptions
-
-# pylint: disable=unused-import
-# flake8: noqa
diff --git a/simpeg_drivers/natural_sources/apparent_conductivity/__init__.py b/simpeg_drivers/natural_sources/apparent_conductivity/__init__.py
index 77c30777..df32b204 100644
--- a/simpeg_drivers/natural_sources/apparent_conductivity/__init__.py
+++ b/simpeg_drivers/natural_sources/apparent_conductivity/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import AppConForwardDriver
-from .inversion import AppConInversionDriver
-from .options import (
-    AppConForwardOptions,
-    AppConInversionOptions,
-)
diff --git a/simpeg_drivers/natural_sources/apparent_conductivity/forward.py b/simpeg_drivers/natural_sources/apparent_conductivity/forward.py
index b4550c72..2293e611 100644
--- a/simpeg_drivers/natural_sources/apparent_conductivity/forward.py
+++ b/simpeg_drivers/natural_sources/apparent_conductivity/forward.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import AppConForwardOptions
+from simpeg_drivers.natural_sources.apparent_conductivity.options import (
+    AppConForwardOptions,
+)
 
 
 class AppConForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/natural_sources/apparent_conductivity/inversion.py b/simpeg_drivers/natural_sources/apparent_conductivity/inversion.py
index 9fb1ff99..ec66ac41 100644
--- a/simpeg_drivers/natural_sources/apparent_conductivity/inversion.py
+++ b/simpeg_drivers/natural_sources/apparent_conductivity/inversion.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import AppConInversionOptions
+from simpeg_drivers.natural_sources.apparent_conductivity.options import (
+    AppConInversionOptions,
+)
 
 
 class AppConInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/natural_sources/magnetotellurics/__init__.py b/simpeg_drivers/natural_sources/magnetotellurics/__init__.py
index 30906b8f..df32b204 100644
--- a/simpeg_drivers/natural_sources/magnetotellurics/__init__.py
+++ b/simpeg_drivers/natural_sources/magnetotellurics/__init__.py
@@ -7,10 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-from .forward import MTForwardDriver
-from .inversion import MTInversionDriver
-from .options import (
-    MTForwardOptions,
-    MTInversionOptions,
-)
diff --git a/simpeg_drivers/natural_sources/magnetotellurics/forward.py b/simpeg_drivers/natural_sources/magnetotellurics/forward.py
index eec4117a..f4f9e847 100644
--- a/simpeg_drivers/natural_sources/magnetotellurics/forward.py
+++ b/simpeg_drivers/natural_sources/magnetotellurics/forward.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import MTForwardOptions
+from simpeg_drivers.natural_sources.magnetotellurics.options import MTForwardOptions
 
 
 class MTForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/natural_sources/magnetotellurics/inversion.py b/simpeg_drivers/natural_sources/magnetotellurics/inversion.py
index 9c438efe..3185993c 100644
--- a/simpeg_drivers/natural_sources/magnetotellurics/inversion.py
+++ b/simpeg_drivers/natural_sources/magnetotellurics/inversion.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import MTInversionOptions
+from simpeg_drivers.natural_sources.magnetotellurics.options import MTInversionOptions
 
 
 class MTInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/natural_sources/tipper/__init__.py b/simpeg_drivers/natural_sources/tipper/__init__.py
index 3bc188ce..df32b204 100644
--- a/simpeg_drivers/natural_sources/tipper/__init__.py
+++ b/simpeg_drivers/natural_sources/tipper/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import TipperForwardDriver
-from .inversion import TipperInversionDriver
-from .options import (
-    TipperForwardOptions,
-    TipperInversionOptions,
-)
diff --git a/simpeg_drivers/natural_sources/tipper/forward.py b/simpeg_drivers/natural_sources/tipper/forward.py
index 3040c357..14280e39 100644
--- a/simpeg_drivers/natural_sources/tipper/forward.py
+++ b/simpeg_drivers/natural_sources/tipper/forward.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import TipperForwardOptions
+from simpeg_drivers.natural_sources.tipper.options import TipperForwardOptions
 
 
 class TipperForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/natural_sources/tipper/inversion.py b/simpeg_drivers/natural_sources/tipper/inversion.py
index 9127918a..81230255 100644
--- a/simpeg_drivers/natural_sources/tipper/inversion.py
+++ b/simpeg_drivers/natural_sources/tipper/inversion.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import TipperInversionOptions
+from simpeg_drivers.natural_sources.tipper.options import TipperInversionOptions
 
 
 class TipperInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/potential_fields/gravity/__init__.py b/simpeg_drivers/potential_fields/gravity/__init__.py
index 2714925c..df32b204 100644
--- a/simpeg_drivers/potential_fields/gravity/__init__.py
+++ b/simpeg_drivers/potential_fields/gravity/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import GravityForwardDriver
-from .inversion import GravityInversionDriver
-from .options import (
-    GravityForwardOptions,
-    GravityInversionOptions,
-)
diff --git a/simpeg_drivers/potential_fields/gravity/forward.py b/simpeg_drivers/potential_fields/gravity/forward.py
index cfcf33af..31e3ece3 100644
--- a/simpeg_drivers/potential_fields/gravity/forward.py
+++ b/simpeg_drivers/potential_fields/gravity/forward.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import GravityForwardOptions
+from simpeg_drivers.potential_fields.gravity.options import GravityForwardOptions
 
 
 class GravityForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/potential_fields/gravity/inversion.py b/simpeg_drivers/potential_fields/gravity/inversion.py
index 2c381f37..e3ab1227 100644
--- a/simpeg_drivers/potential_fields/gravity/inversion.py
+++ b/simpeg_drivers/potential_fields/gravity/inversion.py
@@ -15,8 +15,7 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import GravityInversionOptions
+from simpeg_drivers.potential_fields.gravity.options import GravityInversionOptions
 
 
 class GravityInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py b/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py
index 37ba59bf..df32b204 100644
--- a/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py
+++ b/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import MagneticForwardDriver
-from .inversion import MagneticInversionDriver
-from .options import (
-    MagneticForwardOptions,
-    MagneticInversionOptions,
-)
diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/forward.py b/simpeg_drivers/potential_fields/magnetic_scalar/forward.py
index 40930f83..a4ae22af 100644
--- a/simpeg_drivers/potential_fields/magnetic_scalar/forward.py
+++ b/simpeg_drivers/potential_fields/magnetic_scalar/forward.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import MagneticForwardOptions
+from simpeg_drivers.potential_fields.magnetic_scalar.options import (
+    MagneticForwardOptions,
+)
 
 
 class MagneticForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/inversion.py b/simpeg_drivers/potential_fields/magnetic_scalar/inversion.py
index 4c9e45a1..02fdab99 100644
--- a/simpeg_drivers/potential_fields/magnetic_scalar/inversion.py
+++ b/simpeg_drivers/potential_fields/magnetic_scalar/inversion.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import MagneticInversionOptions
+from simpeg_drivers.potential_fields.magnetic_scalar.options import (
+    MagneticInversionOptions,
+)
 
 
 class MagneticInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/potential_fields/magnetic_vector/__init__.py b/simpeg_drivers/potential_fields/magnetic_vector/__init__.py
index d4724a89..df32b204 100644
--- a/simpeg_drivers/potential_fields/magnetic_vector/__init__.py
+++ b/simpeg_drivers/potential_fields/magnetic_vector/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import MagneticVectorForwardDriver
-from .inversion import MagneticVectorInversionDriver
-from .options import (
-    MagneticVectorForwardOptions,
-    MagneticVectorInversionOptions,
-)
diff --git a/simpeg_drivers/potential_fields/magnetic_vector/forward.py b/simpeg_drivers/potential_fields/magnetic_vector/forward.py
index 7bffaeb6..e7eeaeed 100644
--- a/simpeg_drivers/potential_fields/magnetic_vector/forward.py
+++ b/simpeg_drivers/potential_fields/magnetic_vector/forward.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import MagneticVectorForwardOptions
+from simpeg_drivers.potential_fields.magnetic_vector.options import (
+    MagneticVectorForwardOptions,
+)
 
 
 class MagneticVectorForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/potential_fields/magnetic_vector/inversion.py b/simpeg_drivers/potential_fields/magnetic_vector/inversion.py
index bb106219..c94bc783 100644
--- a/simpeg_drivers/potential_fields/magnetic_vector/inversion.py
+++ b/simpeg_drivers/potential_fields/magnetic_vector/inversion.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import MagneticVectorInversionOptions
+from simpeg_drivers.potential_fields.magnetic_vector.options import (
+    MagneticVectorInversionOptions,
+)
 
 
 class MagneticVectorInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/potential_fields/magnetic_vector_pde/__init__.py b/simpeg_drivers/potential_fields/magnetic_vector_pde/__init__.py
index e742cbb3..df32b204 100644
--- a/simpeg_drivers/potential_fields/magnetic_vector_pde/__init__.py
+++ b/simpeg_drivers/potential_fields/magnetic_vector_pde/__init__.py
@@ -7,11 +7,3 @@
 #  (see LICENSE file at the root of this source code package).                      '
 #                                                                                   '
 # '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-
-from .forward import MagneticVectorPDEForwardDriver
-from .inversion import MagneticVectorPDEInversionDriver
-from .options import (
-    MagneticVectorPDEForwardOptions,
-    MagneticVectorPDEInversionOptions,
-)
diff --git a/simpeg_drivers/potential_fields/magnetic_vector_pde/forward.py b/simpeg_drivers/potential_fields/magnetic_vector_pde/forward.py
index 2b0afeb0..3257af32 100644
--- a/simpeg_drivers/potential_fields/magnetic_vector_pde/forward.py
+++ b/simpeg_drivers/potential_fields/magnetic_vector_pde/forward.py
@@ -15,8 +15,9 @@
 from pathlib import Path
 
 from simpeg_drivers.driver import ForwardDriver
-
-from .options import MagneticVectorPDEForwardOptions
+from simpeg_drivers.potential_fields.magnetic_vector_pde.options import (
+    MagneticVectorPDEForwardOptions,
+)
 
 
 class MagneticVectorPDEForwardDriver(ForwardDriver):
diff --git a/simpeg_drivers/potential_fields/magnetic_vector_pde/inversion.py b/simpeg_drivers/potential_fields/magnetic_vector_pde/inversion.py
index 96917069..63cc4eab 100644
--- a/simpeg_drivers/potential_fields/magnetic_vector_pde/inversion.py
+++ b/simpeg_drivers/potential_fields/magnetic_vector_pde/inversion.py
@@ -20,8 +20,9 @@
 from simpeg.regularization import BaseRegularization, VectorAmplitude
 
 from simpeg_drivers.driver import InversionDriver
-
-from .options import MagneticVectorPDEInversionOptions
+from simpeg_drivers.potential_fields.magnetic_vector_pde.options import (
+    MagneticVectorPDEInversionOptions,
+)
 
 
 class MagneticVectorPDEInversionDriver(InversionDriver):
diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py
index bb488316..d26e324c 100644
--- a/simpeg_drivers/utils/utils.py
+++ b/simpeg_drivers/utils/utils.py
@@ -769,9 +769,17 @@ def driver_class_from_name(name: str, forward_only: bool = False) -> type[Driver
         raise NotImplementedError(msg)
 
     mod_name, classes = DRIVER_MAP.get(name)
-    class_name = classes.get("inversion")
+
     if forward_only:
-        class_name = classes.get("forward", class_name)
+        mod_name += ".forward"
+        class_name = classes.get("forward")
+    else:
+        class_name = classes.get("inversion")
+
+        if "joint" in mod_name:
+            mod_name += ".driver"
+        else:
+            mod_name += ".inversion"
 
     module = __import__(mod_name, fromlist=[class_name])
     return getattr(module, class_name)
diff --git a/tests/data_test.py b/tests/data_test.py
index 2098f984..9e7cd880 100644
--- a/tests/data_test.py
+++ b/tests/data_test.py
@@ -25,7 +25,7 @@
     DC3DForwardOptions,
 )
 from simpeg_drivers.options import ActiveCellsOptions
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionDriver,
     MagneticVectorInversionOptions,
 )
diff --git a/tests/driver_test.py b/tests/driver_test.py
index 736da5b7..b428ec2c 100644
--- a/tests/driver_test.py
+++ b/tests/driver_test.py
@@ -12,7 +12,7 @@
 
 import numpy as np
 
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
diff --git a/tests/locations_test.py b/tests/locations_test.py
index b1c5ef80..f0490171 100644
--- a/tests/locations_test.py
+++ b/tests/locations_test.py
@@ -18,7 +18,7 @@
 from geoh5py.objects import Curve, Grid2D, Points
 
 from simpeg_drivers.components.locations import InversionLocations
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionOptions,
 )
 from simpeg_drivers.utils.nested import tile_locations
diff --git a/tests/meshes_test.py b/tests/meshes_test.py
index f2a39511..3bb7b0f2 100644
--- a/tests/meshes_test.py
+++ b/tests/meshes_test.py
@@ -20,7 +20,7 @@
 from grid_apps.utils import treemesh_2_octree
 
 from simpeg_drivers.components import InversionMesh
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionDriver,
     MagneticVectorInversionOptions,
 )
diff --git a/tests/models_test.py b/tests/models_test.py
index ee7597da..971c5377 100644
--- a/tests/models_test.py
+++ b/tests/models_test.py
@@ -22,14 +22,14 @@
     InversionModel,
     InversionModelCollection,
 )
-from simpeg_drivers.electricals.direct_current.three_dimensions import (
+from simpeg_drivers.electricals.direct_current.three_dimensions.forward import (
     DC3DForwardDriver,
 )
 from simpeg_drivers.electricals.direct_current.three_dimensions.options import (
     DC3DForwardOptions,
 )
 from simpeg_drivers.options import ActiveCellsOptions
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionDriver,
     MagneticVectorInversionOptions,
 )
diff --git a/tests/plate_simulation/runtest/match_test.py b/tests/plate_simulation/runtest/match_test.py
index 2a6770ae..d336164c 100644
--- a/tests/plate_simulation/runtest/match_test.py
+++ b/tests/plate_simulation/runtest/match_test.py
@@ -23,7 +23,7 @@
 from scipy import signal
 
 from simpeg_drivers import assets_path
-from simpeg_drivers.electromagnetics.time_domain import (
+from simpeg_drivers.electromagnetics.time_domain.forward import (
     TDEMForwardDriver,
     TDEMForwardOptions,
 )
diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py
index 687d3096..7ae16f76 100644
--- a/tests/run_tests/driver_airborne_fem_1d_test.py
+++ b/tests/run_tests/driver_airborne_fem_1d_test.py
@@ -17,9 +17,11 @@
 import numpy as np
 from geoh5py import Workspace
 
-from simpeg_drivers.electromagnetics.frequency_domain_1d import (
+from simpeg_drivers.electromagnetics.frequency_domain_1d.forward import (
     FDEM1DForwardDriver,
     FDEM1DForwardOptions,
+)
+from simpeg_drivers.electromagnetics.frequency_domain_1d.inversion import (
     FDEM1DInversionDriver,
     FDEM1DInversionOptions,
 )
diff --git a/tests/run_tests/driver_airborne_fem_test.py b/tests/run_tests/driver_airborne_fem_test.py
index 2da0a56c..e2faef63 100644
--- a/tests/run_tests/driver_airborne_fem_test.py
+++ b/tests/run_tests/driver_airborne_fem_test.py
@@ -19,9 +19,11 @@
 from geoapps_utils.modelling.plates import PlateModel
 from geoh5py import Workspace
 
-from simpeg_drivers.electromagnetics.frequency_domain import (
+from simpeg_drivers.electromagnetics.frequency_domain.forward import (
     FDEMForwardDriver,
     FDEMForwardOptions,
+)
+from simpeg_drivers.electromagnetics.frequency_domain.inversion import (
     FDEMInversionDriver,
     FDEMInversionOptions,
 )
diff --git a/tests/run_tests/driver_airborne_tem_1d_test.py b/tests/run_tests/driver_airborne_tem_1d_test.py
index bdb56da8..f1537069 100644
--- a/tests/run_tests/driver_airborne_tem_1d_test.py
+++ b/tests/run_tests/driver_airborne_tem_1d_test.py
@@ -15,9 +15,11 @@
 import numpy as np
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.electromagnetics.time_domain_1d import (
+from simpeg_drivers.electromagnetics.time_domain_1d.forward import (
     TDEM1DForwardDriver,
     TDEM1DForwardOptions,
+)
+from simpeg_drivers.electromagnetics.time_domain_1d.inversion import (
     TDEM1DInversionDriver,
     TDEM1DInversionOptions,
 )
diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py
index 5e415d3d..dada12ad 100644
--- a/tests/run_tests/driver_airborne_tem_test.py
+++ b/tests/run_tests/driver_airborne_tem_test.py
@@ -17,9 +17,11 @@
 from geoh5py.workspace import Workspace
 from pytest import raises
 
-from simpeg_drivers.electromagnetics.time_domain import (
+from simpeg_drivers.electromagnetics.time_domain.forward import (
     TDEMForwardDriver,
     TDEMForwardOptions,
+)
+from simpeg_drivers.electromagnetics.time_domain.inversion import (
     TDEMInversionDriver,
     TDEMInversionOptions,
 )
diff --git a/tests/run_tests/driver_app_con_test.py b/tests/run_tests/driver_app_con_test.py
index 311a1326..81c946d6 100644
--- a/tests/run_tests/driver_app_con_test.py
+++ b/tests/run_tests/driver_app_con_test.py
@@ -16,9 +16,11 @@
 from geoapps_utils.modelling.plates import PlateModel
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.natural_sources.apparent_conductivity import (
+from simpeg_drivers.natural_sources.apparent_conductivity.forward import (
     AppConForwardDriver,
     AppConForwardOptions,
+)
+from simpeg_drivers.natural_sources.apparent_conductivity.inversion import (
     AppConInversionDriver,
     AppConInversionOptions,
 )
diff --git a/tests/run_tests/driver_dc_2d_rotated_gradients_test.py b/tests/run_tests/driver_dc_2d_rotated_gradients_test.py
index 45549693..8804fee9 100644
--- a/tests/run_tests/driver_dc_2d_rotated_gradients_test.py
+++ b/tests/run_tests/driver_dc_2d_rotated_gradients_test.py
@@ -18,9 +18,11 @@
 from geoh5py.groups import PropertyGroup
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.electricals.direct_current.two_dimensions import (
+from simpeg_drivers.electricals.direct_current.two_dimensions.forward import (
     DC2DForwardDriver,
     DC2DForwardOptions,
+)
+from simpeg_drivers.electricals.direct_current.two_dimensions.inversion import (
     DC2DInversionDriver,
     DC2DInversionOptions,
 )
diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py
index dc61b528..bc2d7d78 100644
--- a/tests/run_tests/driver_dc_2d_test.py
+++ b/tests/run_tests/driver_dc_2d_test.py
@@ -17,9 +17,11 @@
 from geoapps_utils.modelling.plates import PlateModel
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.electricals.direct_current.two_dimensions import (
+from simpeg_drivers.electricals.direct_current.two_dimensions.forward import (
     DC2DForwardDriver,
     DC2DForwardOptions,
+)
+from simpeg_drivers.electricals.direct_current.two_dimensions.inversion import (
     DC2DInversionDriver,
     DC2DInversionOptions,
 )
diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py
index 680db140..9e40ca8d 100644
--- a/tests/run_tests/driver_dc_test.py
+++ b/tests/run_tests/driver_dc_test.py
@@ -15,9 +15,11 @@
 import numpy as np
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.electricals.direct_current.three_dimensions import (
+from simpeg_drivers.electricals.direct_current.three_dimensions.forward import (
     DC3DForwardDriver,
     DC3DForwardOptions,
+)
+from simpeg_drivers.electricals.direct_current.three_dimensions.inversion import (
     DC3DInversionDriver,
     DC3DInversionOptions,
 )
diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py
index ed1c1159..3fa65ba0 100644
--- a/tests/run_tests/driver_grav_test.py
+++ b/tests/run_tests/driver_grav_test.py
@@ -18,9 +18,11 @@
 from geoh5py.workspace import Workspace
 from pytest import raises
 
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.forward import (
     GravityForwardDriver,
     GravityForwardOptions,
+)
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py
index 592f2578..c5570b19 100644
--- a/tests/run_tests/driver_ground_tem_test.py
+++ b/tests/run_tests/driver_ground_tem_test.py
@@ -19,9 +19,11 @@
 from geoh5py.workspace import Workspace
 from pymatsolver.direct import Mumps
 
-from simpeg_drivers.electromagnetics.time_domain import (
+from simpeg_drivers.electromagnetics.time_domain.forward import (
     TDEMForwardDriver,
     TDEMForwardOptions,
+)
+from simpeg_drivers.electromagnetics.time_domain.inversion import (
     TDEMInversionDriver,
     TDEMInversionOptions,
 )
diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py
index 10a752a4..02394521 100644
--- a/tests/run_tests/driver_ip_2d_test.py
+++ b/tests/run_tests/driver_ip_2d_test.py
@@ -16,9 +16,11 @@
 from geoapps_utils.modelling.plates import PlateModel
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.electricals.induced_polarization.two_dimensions import (
+from simpeg_drivers.electricals.induced_polarization.two_dimensions.forward import (
     IP2DForwardDriver,
     IP2DForwardOptions,
+)
+from simpeg_drivers.electricals.induced_polarization.two_dimensions.inversion import (
     IP2DInversionDriver,
     IP2DInversionOptions,
 )
diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py
index c83f75ff..5a292507 100644
--- a/tests/run_tests/driver_ip_test.py
+++ b/tests/run_tests/driver_ip_test.py
@@ -14,9 +14,11 @@
 
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.electricals.induced_polarization.three_dimensions import (
+from simpeg_drivers.electricals.induced_polarization.three_dimensions.forward import (
     IP3DForwardDriver,
     IP3DForwardOptions,
+)
+from simpeg_drivers.electricals.induced_polarization.three_dimensions.inversion import (
     IP3DInversionDriver,
     IP3DInversionOptions,
 )
diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py
index 3fbc085e..ae3e815f 100644
--- a/tests/run_tests/driver_joint_cross_gradient_test.py
+++ b/tests/run_tests/driver_joint_cross_gradient_test.py
@@ -17,27 +17,33 @@
 from geoh5py.workspace import Workspace
 from simpeg.directives import UpdateIRLS
 
-from simpeg_drivers.electricals.direct_current.three_dimensions import (
+from simpeg_drivers.electricals.direct_current.three_dimensions.forward import (
     DC3DForwardDriver,
     DC3DForwardOptions,
+)
+from simpeg_drivers.electricals.direct_current.three_dimensions.inversion import (
     DC3DInversionDriver,
     DC3DInversionOptions,
 )
 from simpeg_drivers.joint.joint_cross_gradient.driver import JointCrossGradientDriver
 from simpeg_drivers.joint.joint_cross_gradient.options import JointCrossGradientOptions
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.forward import (
     GravityForwardDriver,
     GravityForwardOptions,
+)
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.forward import (
     MagneticVectorForwardDriver,
     MagneticVectorForwardOptions,
+)
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionDriver,
     MagneticVectorInversionOptions,
 )
-from simpeg_drivers.potential_fields.magnetic_vector_pde import (
+from simpeg_drivers.potential_fields.magnetic_vector_pde.inversion import (
     MagneticVectorPDEInversionDriver,
     MagneticVectorPDEInversionOptions,
 )
diff --git a/tests/run_tests/driver_joint_pgi_homogeneous_test.py b/tests/run_tests/driver_joint_pgi_homogeneous_test.py
index 67649450..bd6afd9a 100644
--- a/tests/run_tests/driver_joint_pgi_homogeneous_test.py
+++ b/tests/run_tests/driver_joint_pgi_homogeneous_test.py
@@ -21,17 +21,19 @@
 
 from simpeg_drivers.joint.joint_petrophysics.driver import JointPetrophysicsDriver
 from simpeg_drivers.joint.joint_petrophysics.options import JointPetrophysicsOptions
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.forward import (
     GravityForwardDriver,
     GravityForwardOptions,
+)
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
-from simpeg_drivers.potential_fields.magnetic_scalar import (
+from simpeg_drivers.potential_fields.magnetic_scalar.inversion import (
     MagneticInversionDriver,
     MagneticInversionOptions,
 )
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.forward import (
     MagneticVectorForwardDriver,
     MagneticVectorForwardOptions,
 )
diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py
index aad8878d..76f31f6f 100644
--- a/tests/run_tests/driver_joint_surveys_test.py
+++ b/tests/run_tests/driver_joint_surveys_test.py
@@ -22,22 +22,24 @@
 from simpeg_drivers.electricals.direct_current.three_dimensions.options import (
     DC3DInversionOptions,
 )
-from simpeg_drivers.electromagnetics.time_domain import TDEMInversionDriver
+from simpeg_drivers.electromagnetics.time_domain.inversion import TDEMInversionDriver
 from simpeg_drivers.electromagnetics.time_domain.options import TDEMInversionOptions
 from simpeg_drivers.joint.joint_surveys.driver import JointSurveysDriver
 from simpeg_drivers.joint.joint_surveys.options import JointSurveysOptions
 from simpeg_drivers.options import ActiveCellsOptions
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.forward import (
     GravityForwardDriver,
     GravityForwardOptions,
+)
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionDriver,
     MagneticVectorInversionOptions,
 )
-from simpeg_drivers.potential_fields.magnetic_vector_pde import (
+from simpeg_drivers.potential_fields.magnetic_vector_pde.inversion import (
     MagneticVectorPDEInversionDriver,
     MagneticVectorPDEInversionOptions,
 )
diff --git a/tests/run_tests/driver_mag_automesh_test.py b/tests/run_tests/driver_mag_automesh_test.py
index 796746f5..1769d2cb 100644
--- a/tests/run_tests/driver_mag_automesh_test.py
+++ b/tests/run_tests/driver_mag_automesh_test.py
@@ -15,7 +15,7 @@
 import numpy as np
 from geoh5py import Workspace
 
-from simpeg_drivers.potential_fields.magnetic_scalar import (
+from simpeg_drivers.potential_fields.magnetic_scalar.forward import (
     MagneticForwardDriver,
     MagneticForwardOptions,
 )
diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py
index 66544988..ea10bb7e 100644
--- a/tests/run_tests/driver_mag_test.py
+++ b/tests/run_tests/driver_mag_test.py
@@ -16,9 +16,11 @@
 from dask.distributed import LocalCluster, performance_report
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.potential_fields.magnetic_scalar import (
+from simpeg_drivers.potential_fields.magnetic_scalar.forward import (
     MagneticForwardDriver,
     MagneticForwardOptions,
+)
+from simpeg_drivers.potential_fields.magnetic_scalar.inversion import (
     MagneticInversionDriver,
     MagneticInversionOptions,
 )
diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py
index 01414f3e..ac54d509 100644
--- a/tests/run_tests/driver_mt_test.py
+++ b/tests/run_tests/driver_mt_test.py
@@ -19,9 +19,11 @@
 from geoh5py.workspace import Workspace
 from pytest import raises
 
-from simpeg_drivers.natural_sources.magnetotellurics import (
+from simpeg_drivers.natural_sources.magnetotellurics.forward import (
     MTForwardDriver,
     MTForwardOptions,
+)
+from simpeg_drivers.natural_sources.magnetotellurics.inversion import (
     MTInversionDriver,
     MTInversionOptions,
 )
diff --git a/tests/run_tests/driver_mvi_pde_test.py b/tests/run_tests/driver_mvi_pde_test.py
index 4befa952..e5c6621d 100644
--- a/tests/run_tests/driver_mvi_pde_test.py
+++ b/tests/run_tests/driver_mvi_pde_test.py
@@ -16,12 +16,13 @@
 from dask.distributed import LocalCluster, performance_report
 from geoh5py.groups import PropertyGroup
 from geoh5py.groups.property_group import GroupTypeEnum
-from geoh5py.objects import Curve
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.potential_fields.magnetic_vector_pde import (
+from simpeg_drivers.potential_fields.magnetic_vector_pde.forward import (
     MagneticVectorPDEForwardDriver,
     MagneticVectorPDEForwardOptions,
+)
+from simpeg_drivers.potential_fields.magnetic_vector_pde.inversion import (
     MagneticVectorPDEInversionDriver,
     MagneticVectorPDEInversionOptions,
 )
diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py
index 709f5bac..0591590c 100644
--- a/tests/run_tests/driver_mvi_test.py
+++ b/tests/run_tests/driver_mvi_test.py
@@ -23,9 +23,11 @@
 from simpeg.utils.mat_utils import cartesian2amplitude_dip_azimuth
 
 from simpeg_drivers.components.factories import DirectivesFactory
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.forward import (
     MagneticVectorForwardDriver,
     MagneticVectorForwardOptions,
+)
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionDriver,
     MagneticVectorInversionOptions,
 )
diff --git a/tests/run_tests/driver_rotated_gradients_test.py b/tests/run_tests/driver_rotated_gradients_test.py
index dca72fa6..c8752ef2 100644
--- a/tests/run_tests/driver_rotated_gradients_test.py
+++ b/tests/run_tests/driver_rotated_gradients_test.py
@@ -18,9 +18,11 @@
 from geoh5py.groups.property_group import PropertyGroup
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.forward import (
     GravityForwardDriver,
     GravityForwardOptions,
+)
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
diff --git a/tests/run_tests/driver_tile_estimator_test.py b/tests/run_tests/driver_tile_estimator_test.py
index 17c2284c..211ec844 100644
--- a/tests/run_tests/driver_tile_estimator_test.py
+++ b/tests/run_tests/driver_tile_estimator_test.py
@@ -14,7 +14,7 @@
 
 import numpy as np
 
-from simpeg_drivers.potential_fields.magnetic_scalar import (
+from simpeg_drivers.potential_fields.magnetic_scalar.inversion import (
     MagneticInversionDriver,
     MagneticInversionOptions,
 )
diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py
index 193eb208..79058554 100644
--- a/tests/run_tests/driver_tipper_test.py
+++ b/tests/run_tests/driver_tipper_test.py
@@ -15,9 +15,11 @@
 import numpy as np
 from geoh5py.workspace import Workspace
 
-from simpeg_drivers.natural_sources.tipper import (
+from simpeg_drivers.natural_sources.tipper.forward import (
     TipperForwardDriver,
     TipperForwardOptions,
+)
+from simpeg_drivers.natural_sources.tipper.inversion import (
     TipperInversionDriver,
     TipperInversionOptions,
 )
diff --git a/tests/run_tests/oriented_airborne_fem_receiver_test.py b/tests/run_tests/oriented_airborne_fem_receiver_test.py
index e3b4995c..6026968f 100644
--- a/tests/run_tests/oriented_airborne_fem_receiver_test.py
+++ b/tests/run_tests/oriented_airborne_fem_receiver_test.py
@@ -22,7 +22,7 @@
 from geoh5py.objects import AirborneFEMReceivers
 from geoh5py.shared.utils import fetch_active_workspace
 
-from simpeg_drivers.electromagnetics.frequency_domain import (
+from simpeg_drivers.electromagnetics.frequency_domain.forward import (
     FDEMForwardDriver,
     FDEMForwardOptions,
 )
diff --git a/tests/run_tests/oriented_airborne_tem_receiver_test.py b/tests/run_tests/oriented_airborne_tem_receiver_test.py
index 4979feea..d2b20515 100644
--- a/tests/run_tests/oriented_airborne_tem_receiver_test.py
+++ b/tests/run_tests/oriented_airborne_tem_receiver_test.py
@@ -22,7 +22,7 @@
 from geoh5py.objects import AirborneTEMReceivers
 from geoh5py.shared.utils import fetch_active_workspace
 
-from simpeg_drivers.electromagnetics.time_domain import (
+from simpeg_drivers.electromagnetics.time_domain.forward import (
     TDEMForwardDriver,
     TDEMForwardOptions,
 )
diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py
index ad1af5ce..94379a42 100644
--- a/tests/run_tests/sensitivity_cutoff_test.py
+++ b/tests/run_tests/sensitivity_cutoff_test.py
@@ -22,7 +22,7 @@
 from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.options import (
     SensitivityCutoffOptions,
 )
-from simpeg_drivers.potential_fields.gravity import (
+from simpeg_drivers.potential_fields.gravity.inversion import (
     GravityInversionDriver,
     GravityInversionOptions,
 )
diff --git a/tests/topography_test.py b/tests/topography_test.py
index 8243eb3f..55a0ce06 100644
--- a/tests/topography_test.py
+++ b/tests/topography_test.py
@@ -17,7 +17,7 @@
 
 from simpeg_drivers.components import InversionData, InversionMesh, InversionTopography
 from simpeg_drivers.options import ActiveCellsOptions
-from simpeg_drivers.potential_fields.magnetic_vector import (
+from simpeg_drivers.potential_fields.magnetic_vector.inversion import (
     MagneticVectorInversionOptions,
 )
 from simpeg_drivers.utils.synthetics.driver import SyntheticsComponents