diff --git a/documentation/scripts/plotting_scripts/2nd_gen_rebco_critical_surface.py b/documentation/scripts/plotting_scripts/2nd_gen_rebco_critical_surface.py
index 89d45279de..f07d5db50b 100644
--- a/documentation/scripts/plotting_scripts/2nd_gen_rebco_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/2nd_gen_rebco_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 temp_c0max = 90.0  # Critical temperature (K) at zero field and strain
 b_c20max = (
diff --git a/documentation/scripts/plotting_scripts/bi_2212_critical_surface.py b/documentation/scripts/plotting_scripts/bi_2212_critical_surface.py
index fba4635c4f..4750274323 100644
--- a/documentation/scripts/plotting_scripts/bi_2212_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/bi_2212_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(1, 11.0, 50)  # Temperature range (K)
diff --git a/documentation/scripts/plotting_scripts/durham_nbti_critical_surface.py b/documentation/scripts/plotting_scripts/durham_nbti_critical_surface.py
index 728dc5d5be..b4749e5392 100644
--- a/documentation/scripts/plotting_scripts/durham_nbti_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/durham_nbti_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(1, 8.0, 50)  # Temperature range (K)
diff --git a/documentation/scripts/plotting_scripts/durham_rebco_critical_surface.py b/documentation/scripts/plotting_scripts/durham_rebco_critical_surface.py
index 9b1f69b0d5..aa78d7ce9c 100644
--- a/documentation/scripts/plotting_scripts/durham_rebco_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/durham_rebco_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(4.2, 30.0, 50)  # Temperature range (K)
diff --git a/documentation/scripts/plotting_scripts/eutf4_nb3sn_critical_surface.py b/documentation/scripts/plotting_scripts/eutf4_nb3sn_critical_surface.py
index 8f2b9ad199..80cd2455a2 100644
--- a/documentation/scripts/plotting_scripts/eutf4_nb3sn_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/eutf4_nb3sn_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 temp_c0max = 16.06  # Critical temperature (K) at zero field and strain
 b_c20max = (
diff --git a/documentation/scripts/plotting_scripts/hazelton_zhai_rebco_critical_surface.py b/documentation/scripts/plotting_scripts/hazelton_zhai_rebco_critical_surface.py
index 65851f46af..deeef3e80c 100644
--- a/documentation/scripts/plotting_scripts/hazelton_zhai_rebco_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/hazelton_zhai_rebco_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(4.2, 40.0, 50)  # Temperature range (K)
diff --git a/documentation/scripts/plotting_scripts/old_empirical_nbti_critical_surface.py b/documentation/scripts/plotting_scripts/old_empirical_nbti_critical_surface.py
index 4d029acc2c..1490149a84 100644
--- a/documentation/scripts/plotting_scripts/old_empirical_nbti_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/old_empirical_nbti_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 # Create a grid of temperature and field values
 temp_conductor = np.linspace(1, 10.0, 50)  # Temperature range (K)
diff --git a/documentation/scripts/plotting_scripts/western_nb3sn_critical_surface.py b/documentation/scripts/plotting_scripts/western_nb3sn_critical_surface.py
index 3844e95887..22558745b2 100644
--- a/documentation/scripts/plotting_scripts/western_nb3sn_critical_surface.py
+++ b/documentation/scripts/plotting_scripts/western_nb3sn_critical_surface.py
@@ -2,7 +2,7 @@
 import numpy as np
 import plotly.graph_objects as go
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 temp_c0max = 16.34  # Critical temperature (K) at zero field and strain
 b_c20max = (
diff --git a/process/init.py b/process/init.py
index 58be94e8af..0db06f1a00 100644
--- a/process/init.py
+++ b/process/init.py
@@ -59,7 +59,7 @@
 from process.exceptions import ProcessValidationError
 from process.input import parse_input_file
 from process.log import logging_model_handler
-from process.stellarator.initialization import st_init
+from process.models.stellarator.initialization import st_init
 
 
 def init_process():
diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py
index c1a37ea178..d97d0bbcb5 100644
--- a/process/io/plot_proc.py
+++ b/process/io/plot_proc.py
@@ -28,41 +28,41 @@
 from matplotlib.path import Path
 from scipy.interpolate import interp1d
 
-import process.confinement_time as confine
 import process.constants as constants
 import process.data_structure.pfcoil_variables as pfcoil_variables
 import process.io.mfile as mf
-import process.superconducting_tf_coil as sctf
-from process.build import Build
-from process.current_drive import ElectronBernstein, ElectronCyclotron
+import process.models.physics.confinement_time as confine
+import process.models.tfcoil.superconducting as sctf
 from process.data_structure import impurity_radiation_module, physics_variables
-from process.geometry.blanket_geometry import (
+from process.io.mfile import MFileErrorClass
+from process.models.build import Build
+from process.models.geometry.blanket import (
     blanket_geometry_double_null,
     blanket_geometry_single_null,
 )
-from process.geometry.cryostat_geometry import cryostat_geometry
-from process.geometry.firstwall_geometry import (
+from process.models.geometry.cryostat import cryostat_geometry
+from process.models.geometry.firstwall import (
     first_wall_geometry_double_null,
     first_wall_geometry_single_null,
 )
-from process.geometry.pfcoil_geometry import pfcoil_geometry
-from process.geometry.plasma_geometry import plasma_geometry
-from process.geometry.shield_geometry import (
+from process.models.geometry.pfcoil import pfcoil_geometry
+from process.models.geometry.plasma import plasma_geometry
+from process.models.geometry.shield import (
     shield_geometry_double_null,
     shield_geometry_single_null,
 )
-from process.geometry.tfcoil_geometry import (
+from process.models.geometry.tfcoil import (
     tfcoil_geometry_d_shape,
     tfcoil_geometry_rectangular_shape,
 )
-from process.geometry.vacuum_vessel_geometry import (
+from process.models.geometry.vacuum_vessel import (
     vacuum_vessel_geometry_double_null,
     vacuum_vessel_geometry_single_null,
 )
-from process.impurity_radiation import read_impurity_file
-from process.io.mfile import MFileErrorClass
+from process.models.physics.current_drive import ElectronBernstein, ElectronCyclotron
+from process.models.physics.impurity_radiation import read_impurity_file
+from process.models.tfcoil.superconducting import SUPERCONDUCTING_TF_TYPES
 from process.objectives import OBJECTIVE_NAMES
-from process.superconducting_tf_coil import SUPERCONDUCTING_TF_TYPES
 
 mpl.rcParams["figure.max_open_warning"] = 40
 
diff --git a/process/main.py b/process/main.py
index 59a3c0d336..8276732ef6 100644
--- a/process/main.py
+++ b/process/main.py
@@ -49,28 +49,6 @@
 import process.data_structure as data_structure
 import process.init as init
 from process import constants
-from process.availability import Availability
-from process.blanket_library import BlanketLibrary
-from process.build import Build
-from process.buildings import Buildings
-from process.costs import Costs
-from process.costs_2015 import Costs2015
-from process.cryostat import Cryostat
-from process.cs_fatigue import CsFatigue
-from process.current_drive import (
-    CurrentDrive,
-    ElectronBernstein,
-    ElectronCyclotron,
-    IonCyclotron,
-    LowerHybrid,
-    NeutralBeam,
-)
-from process.dcll import DCLL
-from process.divertor import Divertor
-from process.fw import FirstWall
-from process.hcpb import CCFE_HCPB
-from process.ife import IFE
-from process.impurity_radiation import initialise_imprad
 from process.io import (
     mfile,
     plot_plotly_sankey,
@@ -90,23 +68,54 @@
     vary_iteration_variables,
 )
 from process.log import logging_model_handler, show_errors
-from process.pfcoil import PFCoil
-from process.physics import DetailedPhysics, Physics, PlasmaBeta, PlasmaInductance
-from process.plasma_geometry import PlasmaGeom
-from process.plasma_profiles import PlasmaProfile
-from process.power import Power
+from process.models.availability import Availability
+from process.models.blankets.blanket_library import BlanketLibrary
+from process.models.blankets.dcll import DCLL
+from process.models.blankets.hcpb import CCFE_HCPB
+from process.models.build import Build
+from process.models.buildings import Buildings
+from process.models.costs.costs import Costs
+from process.models.costs.costs_2015 import Costs2015
+from process.models.cryostat import Cryostat
+from process.models.cs_fatigue import CsFatigue
+from process.models.divertor import Divertor
+from process.models.fw import FirstWall
+from process.models.ife import IFE
+from process.models.pfcoil import PFCoil
+from process.models.physics.current_drive import (
+    CurrentDrive,
+    ElectronBernstein,
+    ElectronCyclotron,
+    IonCyclotron,
+    LowerHybrid,
+    NeutralBeam,
+)
+from process.models.physics.impurity_radiation import initialise_imprad
+from process.models.physics.physics import (
+    DetailedPhysics,
+    Physics,
+    PlasmaBeta,
+    PlasmaInductance,
+)
+from process.models.physics.plasma_geometry import PlasmaGeom
+from process.models.physics.plasma_profiles import PlasmaProfile
+from process.models.power import Power
+from process.models.pulse import Pulse
+from process.models.shield import Shield
+from process.models.stellarator.neoclassics import Neoclassics
+from process.models.stellarator.stellarator import Stellarator
+from process.models.structure import Structure
+from process.models.tfcoil.base import TFCoil
+from process.models.tfcoil.resistive import (
+    AluminiumTFCoil,
+    CopperTFCoil,
+    ResistiveTFCoil,
+)
+from process.models.tfcoil.superconducting import SuperconductingTFCoil
+from process.models.vacuum import Vacuum, VacuumVessel
+from process.models.water_use import WaterUse
 from process.process_output import OutputFileManager, oheadr
-from process.pulse import Pulse
-from process.resistive_tf_coil import AluminiumTFCoil, CopperTFCoil, ResistiveTFCoil
 from process.scan import Scan
-from process.shield import Shield
-from process.stellarator.neoclassics import Neoclassics
-from process.stellarator.stellarator import Stellarator
-from process.structure import Structure
-from process.superconducting_tf_coil import SuperconductingTFCoil
-from process.tf_coil import TFCoil
-from process.vacuum import Vacuum, VacuumVessel
-from process.water_use import WaterUse
 
 os.environ["PYTHON_PROCESS_ROOT"] = os.path.join(os.path.dirname(__file__))
 
diff --git a/process/geometry/__init__.py b/process/models/__init__.py
similarity index 100%
rename from process/geometry/__init__.py
rename to process/models/__init__.py
diff --git a/process/availability.py b/process/models/availability.py
similarity index 100%
rename from process/availability.py
rename to process/models/availability.py
diff --git a/process/stellarator/__init__.py b/process/models/blankets/__init__.py
similarity index 100%
rename from process/stellarator/__init__.py
rename to process/models/blankets/__init__.py
diff --git a/process/blanket_library.py b/process/models/blankets/blanket_library.py
similarity index 100%
rename from process/blanket_library.py
rename to process/models/blankets/blanket_library.py
diff --git a/process/dcll.py b/process/models/blankets/dcll.py
similarity index 99%
rename from process/dcll.py
rename to process/models/blankets/dcll.py
index 23904296a5..f54f962dcf 100644
--- a/process/dcll.py
+++ b/process/models/blankets/dcll.py
@@ -1,9 +1,8 @@
-import process.blanket_library as blanket_library
+import process.models.blankets.blanket_library as blanket_library
 from process import constants
 from process import (
     process_output as po,
 )
-from process.blanket_library import InboardBlanket, OutboardBlanket
 from process.data_structure import (
     build_variables,
     current_drive_variables,
@@ -15,6 +14,7 @@
     physics_variables,
     primary_pumping_variables,
 )
+from process.models.blankets.blanket_library import InboardBlanket, OutboardBlanket
 
 
 class DCLL(InboardBlanket, OutboardBlanket):
diff --git a/process/hcpb.py b/process/models/blankets/hcpb.py
similarity index 99%
rename from process/hcpb.py
rename to process/models/blankets/hcpb.py
index 598f2f3e18..818d19e8ee 100644
--- a/process/hcpb.py
+++ b/process/models/blankets/hcpb.py
@@ -2,13 +2,12 @@
 
 import numpy as np
 
-import process.blanket_library as blanket_library
 import process.data_structure.blanket_library as blanket_vars
+import process.models.blankets.blanket_library as blanket_library
 from process import constants
 from process import (
     process_output as po,
 )
-from process.blanket_library import InboardBlanket, OutboardBlanket
 from process.coolprop_interface import FluidProperties
 from process.data_structure import (
     build_variables,
@@ -24,6 +23,7 @@
     tfcoil_variables,
 )
 from process.exceptions import ProcessValueError
+from process.models.blankets.blanket_library import InboardBlanket, OutboardBlanket
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/build.py b/process/models/build.py
similarity index 100%
rename from process/build.py
rename to process/models/build.py
diff --git a/process/buildings.py b/process/models/buildings.py
similarity index 100%
rename from process/buildings.py
rename to process/models/buildings.py
diff --git a/process/stellarator/coils/__init__.py b/process/models/costs/__init__.py
similarity index 100%
rename from process/stellarator/coils/__init__.py
rename to process/models/costs/__init__.py
diff --git a/process/costs.py b/process/models/costs/costs.py
similarity index 100%
rename from process/costs.py
rename to process/models/costs/costs.py
diff --git a/process/costs_2015.py b/process/models/costs/costs_2015.py
similarity index 100%
rename from process/costs_2015.py
rename to process/models/costs/costs_2015.py
diff --git a/process/cryostat.py b/process/models/cryostat.py
similarity index 100%
rename from process/cryostat.py
rename to process/models/cryostat.py
diff --git a/process/cs_fatigue.py b/process/models/cs_fatigue.py
similarity index 100%
rename from process/cs_fatigue.py
rename to process/models/cs_fatigue.py
diff --git a/process/divertor.py b/process/models/divertor.py
similarity index 100%
rename from process/divertor.py
rename to process/models/divertor.py
diff --git a/process/fw.py b/process/models/fw.py
similarity index 99%
rename from process/fw.py
rename to process/models/fw.py
index 807d9e815b..342e842b35 100644
--- a/process/fw.py
+++ b/process/models/fw.py
@@ -4,7 +4,6 @@
 
 from process import constants
 from process import process_output as po
-from process.blanket_library import BlanketLibrary, dshellarea, eshellarea
 from process.coolprop_interface import FluidProperties
 from process.data_structure import (
     blanket_library,
@@ -15,6 +14,11 @@
     physics_variables,
 )
 from process.exceptions import ProcessValueError
+from process.models.blankets.blanket_library import (
+    BlanketLibrary,
+    dshellarea,
+    eshellarea,
+)
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/models/geometry/__init__.py b/process/models/geometry/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/process/geometry/blanket_geometry.py b/process/models/geometry/blanket.py
similarity index 97%
rename from process/geometry/blanket_geometry.py
rename to process/models/geometry/blanket.py
index 3bdf42c889..51440b2388 100644
--- a/process/geometry/blanket_geometry.py
+++ b/process/models/geometry/blanket.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices, dhgap_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices, dhgap_vertices
 
 
 def blanket_geometry_single_null(
diff --git a/process/geometry/cryostat_geometry.py b/process/models/geometry/cryostat.py
similarity index 95%
rename from process/geometry/cryostat_geometry.py
rename to process/models/geometry/cryostat.py
index 8687cf0c26..9660abb7e6 100644
--- a/process/geometry/cryostat_geometry.py
+++ b/process/models/geometry/cryostat.py
@@ -2,7 +2,7 @@
 Calculate cryostat geometries
 """
 
-from process.geometry.geometry_parameterisations import RectangleGeometry
+from process.models.geometry.parameterisations import RectangleGeometry
 
 
 def cryostat_geometry(
diff --git a/process/geometry/firstwall_geometry.py b/process/models/geometry/firstwall.py
similarity index 97%
rename from process/geometry/firstwall_geometry.py
rename to process/models/geometry/firstwall.py
index cbcce86b9a..31f25f141e 100644
--- a/process/geometry/firstwall_geometry.py
+++ b/process/models/geometry/firstwall.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices, dhgap_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices, dhgap_vertices
 
 
 def first_wall_geometry_single_null(
diff --git a/process/geometry/geometry_parameterisations.py b/process/models/geometry/parameterisations.py
similarity index 100%
rename from process/geometry/geometry_parameterisations.py
rename to process/models/geometry/parameterisations.py
diff --git a/process/geometry/pfcoil_geometry.py b/process/models/geometry/pfcoil.py
similarity index 95%
rename from process/geometry/pfcoil_geometry.py
rename to process/models/geometry/pfcoil.py
index 3e39ac2ddd..f6298eebed 100644
--- a/process/geometry/pfcoil_geometry.py
+++ b/process/models/geometry/pfcoil.py
@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import RectangleGeometry
+from process.models.geometry.parameterisations import RectangleGeometry
 
 
 def pfcoil_geometry(
diff --git a/process/geometry/plasma_geometry.py b/process/models/geometry/plasma.py
similarity index 100%
rename from process/geometry/plasma_geometry.py
rename to process/models/geometry/plasma.py
diff --git a/process/geometry/shield_geometry.py b/process/models/geometry/shield.py
similarity index 97%
rename from process/geometry/shield_geometry.py
rename to process/models/geometry/shield.py
index 99a83839a7..7efaaffd4f 100644
--- a/process/geometry/shield_geometry.py
+++ b/process/models/geometry/shield.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices
 
 
 def shield_geometry_single_null(
diff --git a/process/geometry/tfcoil_geometry.py b/process/models/geometry/tfcoil.py
similarity index 97%
rename from process/geometry/tfcoil_geometry.py
rename to process/models/geometry/tfcoil.py
index efa062d59c..af1779e192 100644
--- a/process/geometry/tfcoil_geometry.py
+++ b/process/models/geometry/tfcoil.py
@@ -2,8 +2,8 @@
 Calculate radial and vertical coordinates for the geometry of the tf coils
 """
 
-from process.geometry.geometry_parameterisations import RectangleGeometry
-from process.geometry.utils import ellips_fill_vertices
+from process.models.geometry.parameterisations import RectangleGeometry
+from process.models.geometry.utils import ellips_fill_vertices
 
 
 def tfcoil_geometry_rectangular_shape(
diff --git a/process/geometry/utils.py b/process/models/geometry/utils.py
similarity index 100%
rename from process/geometry/utils.py
rename to process/models/geometry/utils.py
diff --git a/process/geometry/vacuum_vessel_geometry.py b/process/models/geometry/vacuum_vessel.py
similarity index 97%
rename from process/geometry/vacuum_vessel_geometry.py
rename to process/models/geometry/vacuum_vessel.py
index 78d6a5e89d..500dae9504 100644
--- a/process/geometry/vacuum_vessel_geometry.py
+++ b/process/models/geometry/vacuum_vessel.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from process.geometry.geometry_parameterisations import ArbitraryGeometry
-from process.geometry.utils import dh_vertices
+from process.models.geometry.parameterisations import ArbitraryGeometry
+from process.models.geometry.utils import dh_vertices
 
 
 def vacuum_vessel_geometry_single_null(
diff --git a/process/ife.py b/process/models/ife.py
similarity index 100%
rename from process/ife.py
rename to process/models/ife.py
diff --git a/process/pfcoil.py b/process/models/pfcoil.py
similarity index 99%
rename from process/pfcoil.py
rename to process/models/pfcoil.py
index 8d298c17e3..efe82eba9b 100644
--- a/process/pfcoil.py
+++ b/process/models/pfcoil.py
@@ -7,7 +7,7 @@
 from scipy.linalg import svd
 from scipy.special import ellipe, ellipk
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 from process import constants
 from process import process_output as op
 from process.data_structure import build_variables as bv
diff --git a/process/models/physics/__init__.py b/process/models/physics/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/process/confinement_time.py b/process/models/physics/confinement_time.py
similarity index 100%
rename from process/confinement_time.py
rename to process/models/physics/confinement_time.py
diff --git a/process/current_drive.py b/process/models/physics/current_drive.py
similarity index 99%
rename from process/current_drive.py
rename to process/models/physics/current_drive.py
index 402eb4b810..c071a0474a 100644
--- a/process/current_drive.py
+++ b/process/models/physics/current_drive.py
@@ -12,7 +12,7 @@
     physics_variables,
 )
 from process.exceptions import ProcessError, ProcessValueError
-from process.plasma_profiles import PlasmaProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/fusion_reactions.py b/process/models/physics/fusion_reactions.py
similarity index 99%
rename from process/fusion_reactions.py
rename to process/models/physics/fusion_reactions.py
index 6627b38317..045a328270 100644
--- a/process/fusion_reactions.py
+++ b/process/models/physics/fusion_reactions.py
@@ -6,7 +6,7 @@
 
 from process import constants
 from process.data_structure import physics_variables
-from process.plasma_profiles import PlasmaProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/impurity_radiation.py b/process/models/physics/impurity_radiation.py
similarity index 100%
rename from process/impurity_radiation.py
rename to process/models/physics/impurity_radiation.py
diff --git a/process/l_h_transition.py b/process/models/physics/l_h_transition.py
similarity index 100%
rename from process/l_h_transition.py
rename to process/models/physics/l_h_transition.py
diff --git a/process/physics.py b/process/models/physics/physics.py
similarity index 99%
rename from process/physics.py
rename to process/models/physics/physics.py
index ba51114262..91dd3bef05 100644
--- a/process/physics.py
+++ b/process/models/physics/physics.py
@@ -8,11 +8,11 @@
 import scipy.integrate as integrate
 from scipy.optimize import root_scalar
 
-import process.confinement_time as confinement
-import process.fusion_reactions as reactions
-import process.impurity_radiation as impurity_radiation
-import process.l_h_transition as transition
-import process.physics_functions as physics_funcs
+import process.models.physics.confinement_time as confinement
+import process.models.physics.fusion_reactions as reactions
+import process.models.physics.impurity_radiation as impurity_radiation
+import process.models.physics.l_h_transition as transition
+import process.models.physics.radiation_power as physics_funcs
 from process import constants
 from process import process_output as po
 from process.data_structure import (
diff --git a/process/plasma_geometry.py b/process/models/physics/plasma_geometry.py
similarity index 100%
rename from process/plasma_geometry.py
rename to process/models/physics/plasma_geometry.py
diff --git a/process/plasma_profiles.py b/process/models/physics/plasma_profiles.py
similarity index 99%
rename from process/plasma_profiles.py
rename to process/models/physics/plasma_profiles.py
index 3ccc54acf3..00e96e46c1 100644
--- a/process/plasma_profiles.py
+++ b/process/models/physics/plasma_profiles.py
@@ -3,7 +3,7 @@
 import numpy as np
 import scipy as sp
 
-import process.profiles as profiles
+import process.models.physics.profiles as profiles
 from process import constants
 from process.data_structure import divertor_variables, physics_variables
 from process.exceptions import ProcessValueError
diff --git a/process/profiles.py b/process/models/physics/profiles.py
similarity index 100%
rename from process/profiles.py
rename to process/models/physics/profiles.py
diff --git a/process/physics_functions.py b/process/models/physics/radiation_power.py
similarity index 98%
rename from process/physics_functions.py
rename to process/models/physics/radiation_power.py
index 003ecb63f2..dd2e6d3fbd 100644
--- a/process/physics_functions.py
+++ b/process/models/physics/radiation_power.py
@@ -3,8 +3,8 @@
 
 import numpy as np
 
-import process.impurity_radiation as impurity
-from process.plasma_profiles import PlasmaProfile
+import process.models.physics.impurity_radiation as impurity
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/power.py b/process/models/power.py
similarity index 100%
rename from process/power.py
rename to process/models/power.py
diff --git a/process/pulse.py b/process/models/pulse.py
similarity index 100%
rename from process/pulse.py
rename to process/models/pulse.py
diff --git a/process/shield.py b/process/models/shield.py
similarity index 99%
rename from process/shield.py
rename to process/models/shield.py
index fc505acfd3..8660d2c1a8 100644
--- a/process/shield.py
+++ b/process/models/shield.py
@@ -2,13 +2,18 @@
 
 from process import constants
 from process import process_output as po
-from process.blanket_library import dshellarea, dshellvol, eshellarea, eshellvol
 from process.data_structure import blanket_library as blanket_library
 from process.data_structure import build_variables as build_variables
 from process.data_structure import ccfe_hcpb_module as ccfe_hcpb_module
 from process.data_structure import divertor_variables as divertor_variables
 from process.data_structure import fwbs_variables as fwbs_variables
 from process.data_structure import physics_variables as physics_variables
+from process.models.blankets.blanket_library import (
+    dshellarea,
+    dshellvol,
+    eshellarea,
+    eshellvol,
+)
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/models/stellarator/__init__.py b/process/models/stellarator/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/process/stellarator/build.py b/process/models/stellarator/build.py
similarity index 100%
rename from process/stellarator/build.py
rename to process/models/stellarator/build.py
diff --git a/process/models/stellarator/coils/__init__.py b/process/models/stellarator/coils/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/process/stellarator/coils/calculate.py b/process/models/stellarator/coils/calculate.py
similarity index 98%
rename from process/stellarator/coils/calculate.py
rename to process/models/stellarator/coils/calculate.py
index 66fc774b6f..6767e02513 100644
--- a/process/stellarator/coils/calculate.py
+++ b/process/models/stellarator/coils/calculate.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-import process.stellarator.coils.forces as forces
+import process.models.stellarator.coils.forces as forces
 from process.data_structure import (
     build_variables,
     constraint_variables,
@@ -11,10 +11,14 @@
     stellarator_variables,
     tfcoil_variables,
 )
-from process.stellarator.coils.coils import bmax_from_awp, intersect, jcrit_from_material
-from process.stellarator.coils.mass import calculate_coils_mass
-from process.stellarator.coils.output import write
-from process.stellarator.coils.quench import calculate_quench_protection
+from process.models.stellarator.coils.coils import (
+    bmax_from_awp,
+    intersect,
+    jcrit_from_material,
+)
+from process.models.stellarator.coils.mass import calculate_coils_mass
+from process.models.stellarator.coils.output import write
+from process.models.stellarator.coils.quench import calculate_quench_protection
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/stellarator/coils/coils.py b/process/models/stellarator/coils/coils.py
similarity index 99%
rename from process/stellarator/coils/coils.py
rename to process/models/stellarator/coils/coils.py
index 0511adc94b..017f9236c7 100644
--- a/process/stellarator/coils/coils.py
+++ b/process/models/stellarator/coils/coils.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 from process.data_structure import (
     stellarator_configuration,
 )
diff --git a/process/stellarator/coils/forces.py b/process/models/stellarator/coils/forces.py
similarity index 100%
rename from process/stellarator/coils/forces.py
rename to process/models/stellarator/coils/forces.py
diff --git a/process/stellarator/coils/mass.py b/process/models/stellarator/coils/mass.py
similarity index 100%
rename from process/stellarator/coils/mass.py
rename to process/models/stellarator/coils/mass.py
diff --git a/process/stellarator/coils/output.py b/process/models/stellarator/coils/output.py
similarity index 100%
rename from process/stellarator/coils/output.py
rename to process/models/stellarator/coils/output.py
diff --git a/process/stellarator/coils/quench.py b/process/models/stellarator/coils/quench.py
similarity index 100%
rename from process/stellarator/coils/quench.py
rename to process/models/stellarator/coils/quench.py
diff --git a/process/stellarator/denisty_limits.py b/process/models/stellarator/denisty_limits.py
similarity index 100%
rename from process/stellarator/denisty_limits.py
rename to process/models/stellarator/denisty_limits.py
diff --git a/process/stellarator/divertor.py b/process/models/stellarator/divertor.py
similarity index 100%
rename from process/stellarator/divertor.py
rename to process/models/stellarator/divertor.py
diff --git a/process/stellarator/heating.py b/process/models/stellarator/heating.py
similarity index 100%
rename from process/stellarator/heating.py
rename to process/models/stellarator/heating.py
diff --git a/process/stellarator/initialization.py b/process/models/stellarator/initialization.py
similarity index 100%
rename from process/stellarator/initialization.py
rename to process/models/stellarator/initialization.py
diff --git a/process/stellarator/neoclassics.py b/process/models/stellarator/neoclassics.py
similarity index 99%
rename from process/stellarator/neoclassics.py
rename to process/models/stellarator/neoclassics.py
index 9967701037..aa7e81241f 100644
--- a/process/stellarator/neoclassics.py
+++ b/process/models/stellarator/neoclassics.py
@@ -10,7 +10,7 @@
     stellarator_configuration,
     stellarator_variables,
 )
-from process.stellarator.stellarator import KEV
+from process.models.stellarator.stellarator import KEV
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/stellarator/preset_config.py b/process/models/stellarator/preset_config.py
similarity index 100%
rename from process/stellarator/preset_config.py
rename to process/models/stellarator/preset_config.py
diff --git a/process/stellarator/stellarator.py b/process/models/stellarator/stellarator.py
similarity index 98%
rename from process/stellarator/stellarator.py
rename to process/models/stellarator/stellarator.py
index da36ef709c..790f67597d 100644
--- a/process/stellarator/stellarator.py
+++ b/process/models/stellarator/stellarator.py
@@ -6,8 +6,8 @@
 
 import numpy as np
 
-import process.fusion_reactions as reactions
-import process.physics_functions as physics_funcs
+import process.models.physics.fusion_reactions as reactions
+import process.models.physics.radiation_power as physics_funcs
 from process import constants
 from process import process_output as po
 from process.coolprop_interface import FluidProperties
@@ -29,23 +29,26 @@
     tfcoil_variables,
 )
 from process.exceptions import ProcessValueError
-from process.physics import Physics, rether
-from process.stellarator.build import st_build
-from process.stellarator.coils.calculate import st_coil
-from process.stellarator.denisty_limits import power_at_ignition_point, st_denisty_limits
-from process.stellarator.divertor import st_div
-from process.stellarator.heating import st_heat
-from process.stellarator.preset_config import load_stellarator_config
+from process.models.physics.physics import Physics, rether
+from process.models.stellarator.build import st_build
+from process.models.stellarator.coils.calculate import st_coil
+from process.models.stellarator.denisty_limits import (
+    power_at_ignition_point,
+    st_denisty_limits,
+)
+from process.models.stellarator.divertor import st_div
+from process.models.stellarator.heating import st_heat
+from process.models.stellarator.preset_config import load_stellarator_config
 
 if TYPE_CHECKING:
-    from process.availability import Availability
-    from process.buildings import Buildings
-    from process.costs import Costs
-    from process.current_drive import CurrentDrive
-    from process.hcpb import CCFE_HCPB
-    from process.plasma_profiles import PlasmaProfile
-    from process.stellarator.neoclassics import Neoclassics
-    from process.vacuum import Vacuum
+    from process.models.availability import Availability
+    from process.models.blankets.hcpb import CCFE_HCPB
+    from process.models.buildings import Buildings
+    from process.models.costs.costs import Costs
+    from process.models.physics.current_drive import CurrentDrive
+    from process.models.physics.plasma_profiles import PlasmaProfile
+    from process.models.stellarator.neoclassics import Neoclassics
+    from process.models.vacuum import Vacuum
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/structure.py b/process/models/structure.py
similarity index 100%
rename from process/structure.py
rename to process/models/structure.py
diff --git a/process/superconductors.py b/process/models/superconductors.py
similarity index 100%
rename from process/superconductors.py
rename to process/models/superconductors.py
diff --git a/process/models/tfcoil/__init__.py b/process/models/tfcoil/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/process/tf_coil.py b/process/models/tfcoil/base.py
similarity index 99%
rename from process/tf_coil.py
rename to process/models/tfcoil/base.py
index 2867fc9fce..3645cd7c8a 100644
--- a/process/tf_coil.py
+++ b/process/models/tfcoil/base.py
@@ -7,7 +7,6 @@
 
 from process import constants
 from process import process_output as po
-from process.build import Build
 from process.data_structure import (
     build_variables,
     fwbs_variables,
@@ -20,6 +19,7 @@
 )
 from process.data_structure import build_variables as bv
 from process.exceptions import ProcessValueError
+from process.models.build import Build
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/quench.py b/process/models/tfcoil/quench.py
similarity index 100%
rename from process/quench.py
rename to process/models/tfcoil/quench.py
diff --git a/process/resistive_tf_coil.py b/process/models/tfcoil/resistive.py
similarity index 99%
rename from process/resistive_tf_coil.py
rename to process/models/tfcoil/resistive.py
index 73576f8341..310ffcc4a6 100644
--- a/process/resistive_tf_coil.py
+++ b/process/models/tfcoil/resistive.py
@@ -12,7 +12,7 @@
     superconducting_tf_coil_variables,
     tfcoil_variables,
 )
-from process.tf_coil import TFCoil
+from process.models.tfcoil.base import TFCoil
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/superconducting_tf_coil.py b/process/models/tfcoil/superconducting.py
similarity index 99%
rename from process/superconducting_tf_coil.py
rename to process/models/tfcoil/superconducting.py
index 977d0cb7cc..5bd7e533e4 100644
--- a/process/superconducting_tf_coil.py
+++ b/process/models/tfcoil/superconducting.py
@@ -4,8 +4,8 @@
 import numpy as np
 from scipy import optimize
 
-import process.quench as quench
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
+import process.models.tfcoil.quench as quench
 from process import constants
 from process import process_output as po
 from process.data_structure import (
@@ -21,7 +21,7 @@
     tfcoil_variables,
 )
 from process.exceptions import ProcessValueError
-from process.tf_coil import TFCoil
+from process.models.tfcoil.base import TFCoil
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/vacuum.py b/process/models/vacuum.py
similarity index 99%
rename from process/vacuum.py
rename to process/models/vacuum.py
index 45f210b50c..1d3e876749 100644
--- a/process/vacuum.py
+++ b/process/models/vacuum.py
@@ -5,7 +5,6 @@
 
 from process import constants, process_output
 from process import process_output as po
-from process.blanket_library import dshellvol, eshellvol
 from process.data_structure import (
     blanket_library,
     build_variables,
@@ -16,6 +15,7 @@
     times_variables,
     vacuum_variables,
 )
+from process.models.blankets.blanket_library import dshellvol, eshellvol
 
 logger = logging.getLogger(__name__)
 
diff --git a/process/water_use.py b/process/models/water_use.py
similarity index 100%
rename from process/water_use.py
rename to process/models/water_use.py
diff --git a/tests/integration/test_blanket_library_int.py b/tests/integration/test_blanket_library_int.py
index 7266b3ff27..09793307a9 100644
--- a/tests/integration/test_blanket_library_int.py
+++ b/tests/integration/test_blanket_library_int.py
@@ -1,11 +1,11 @@
 import pytest
 
-from process.blanket_library import BlanketLibrary
 from process.data_structure import build_variables as bv
 from process.data_structure import fwbs_variables as fwbs
 from process.data_structure import physics_variables as pv
-from process.fw import FirstWall
 from process.init import init_all_module_vars
+from process.models.blankets.blanket_library import BlanketLibrary
+from process.models.fw import FirstWall
 
 init_all_module_vars()
 
diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py
index 72b1bedc43..6c1662fdeb 100644
--- a/tests/integration/test_pfcoil_int.py
+++ b/tests/integration/test_pfcoil_int.py
@@ -14,7 +14,6 @@
 from numpy.testing import assert_array_almost_equal
 
 from process import constants
-from process.cs_fatigue import CsFatigue
 from process.data_structure import build_variables as bv
 from process.data_structure import fwbs_variables as fwbsv
 from process.data_structure import pfcoil_variables, superconducting_tf_coil_variables
@@ -22,7 +21,8 @@
 from process.data_structure import tfcoil_variables as tfv
 from process.data_structure import times_variables as tv
 from process.init import init_all_module_vars
-from process.pfcoil import (
+from process.models.cs_fatigue import CsFatigue
+from process.models.pfcoil import (
     CSCoil,
     PFCoil,
     fixb,
diff --git a/tests/unit/test_availability.py b/tests/unit/test_availability.py
index c0dcc121c5..b60ea2e6d5 100644
--- a/tests/unit/test_availability.py
+++ b/tests/unit/test_availability.py
@@ -4,7 +4,6 @@
 from pytest import approx
 
 from process import data_structure
-from process.availability import Availability
 from process.data_structure import constraint_variables as ctv
 from process.data_structure import cost_variables as cv
 from process.data_structure import divertor_variables as dv
@@ -14,6 +13,7 @@
 from process.data_structure import tfcoil_variables as tfv
 from process.data_structure import times_variables as tv
 from process.init import init_all_module_vars
+from process.models.availability import Availability
 
 
 @pytest.fixture
diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py
index 68d93d3f6d..118e01b775 100644
--- a/tests/unit/test_blanket_library.py
+++ b/tests/unit/test_blanket_library.py
@@ -3,7 +3,6 @@
 import numpy as np
 import pytest
 
-from process.blanket_library import BlanketLibrary
 from process.data_structure import (
     blanket_library,
     build_variables,
@@ -11,7 +10,8 @@
     fwbs_variables,
     physics_variables,
 )
-from process.fw import FirstWall
+from process.models.blankets.blanket_library import BlanketLibrary
+from process.models.fw import FirstWall
 
 
 @pytest.fixture
diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py
index 4ec96d2069..1a8be90600 100644
--- a/tests/unit/test_build.py
+++ b/tests/unit/test_build.py
@@ -2,12 +2,12 @@
 
 import pytest
 
-from process.build import Build
 from process.data_structure import (
     build_variables,
     divertor_variables,
     physics_variables,
 )
+from process.models.build import Build
 
 
 @pytest.fixture
diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py
index f91d3954ba..d567052ea7 100644
--- a/tests/unit/test_buildings.py
+++ b/tests/unit/test_buildings.py
@@ -2,7 +2,6 @@
 
 import pytest
 
-from process.buildings import Buildings
 from process.data_structure import (
     build_variables,
     buildings_variables,
@@ -14,6 +13,7 @@
     physics_variables,
     tfcoil_variables,
 )
+from process.models.buildings import Buildings
 
 
 @pytest.fixture
diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py
index 74a33afc1c..40aea4ccaf 100644
--- a/tests/unit/test_ccfe_hcpb.py
+++ b/tests/unit/test_ccfe_hcpb.py
@@ -15,8 +15,8 @@
     primary_pumping_variables,
     tfcoil_variables,
 )
-from process.fw import FirstWall
-from process.hcpb import CCFE_HCPB
+from process.models.blankets.hcpb import CCFE_HCPB
+from process.models.fw import FirstWall
 
 
 @pytest.fixture
diff --git a/tests/unit/test_confinement_time.py b/tests/unit/test_confinement_time.py
index 825d033c6a..5a36dbd592 100644
--- a/tests/unit/test_confinement_time.py
+++ b/tests/unit/test_confinement_time.py
@@ -1,6 +1,6 @@
 import pytest
 
-from process import confinement_time as conf
+from process.models.physics import confinement_time as conf
 
 
 @pytest.mark.parametrize(
diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py
index cd6614923d..1843269b92 100644
--- a/tests/unit/test_costs_1990.py
+++ b/tests/unit/test_costs_1990.py
@@ -7,7 +7,6 @@
 from pytest import approx
 
 from process import data_structure
-from process.costs import Costs
 from process.data_structure import (
     build_variables,
     buildings_variables,
@@ -27,6 +26,7 @@
     times_variables,
     vacuum_variables,
 )
+from process.models.costs.costs import Costs
 
 
 @pytest.fixture
diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py
index 865062f541..9f6c4aad59 100644
--- a/tests/unit/test_costs_2015.py
+++ b/tests/unit/test_costs_2015.py
@@ -5,7 +5,6 @@
 import numpy as np
 import pytest
 
-from process.costs_2015 import Costs2015
 from process.data_structure import (
     build_variables,
     cost_2015_variables,
@@ -18,6 +17,7 @@
     physics_variables,
     tfcoil_variables,
 )
+from process.models.costs.costs_2015 import Costs2015
 
 
 @pytest.fixture
diff --git a/tests/unit/test_cryostat.py b/tests/unit/test_cryostat.py
index a23cb9c300..ef0fe27719 100644
--- a/tests/unit/test_cryostat.py
+++ b/tests/unit/test_cryostat.py
@@ -3,7 +3,6 @@
 import numpy as np
 import pytest
 
-from process.cryostat import Cryostat
 from process.data_structure import (
     blanket_library,
     build_variables,
@@ -11,6 +10,7 @@
     fwbs_variables,
     pfcoil_variables,
 )
+from process.models.cryostat import Cryostat
 
 
 @pytest.fixture
diff --git a/tests/unit/test_cs_fatigue.py b/tests/unit/test_cs_fatigue.py
index 1f7bf01259..a2441f3143 100644
--- a/tests/unit/test_cs_fatigue.py
+++ b/tests/unit/test_cs_fatigue.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from process.cs_fatigue import CsFatigue
+from process.models.cs_fatigue import CsFatigue
 
 
 @pytest.fixture
diff --git a/tests/unit/test_current_drive.py b/tests/unit/test_current_drive.py
index 2d6cc7cd90..1bc26b0507 100644
--- a/tests/unit/test_current_drive.py
+++ b/tests/unit/test_current_drive.py
@@ -1,7 +1,12 @@
 import pytest
 
 from process import constants
-from process.current_drive import (
+from process.data_structure import (
+    current_drive_variables,
+    heat_transport_variables,
+    physics_variables,
+)
+from process.models.physics.current_drive import (
     CurrentDrive,
     ElectronBernstein,
     ElectronCyclotron,
@@ -9,12 +14,7 @@
     LowerHybrid,
     NeutralBeam,
 )
-from process.data_structure import (
-    current_drive_variables,
-    heat_transport_variables,
-    physics_variables,
-)
-from process.plasma_profiles import PlasmaProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 
 @pytest.fixture
diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py
index 7ab1d71e01..a1f7d4849c 100644
--- a/tests/unit/test_dcll.py
+++ b/tests/unit/test_dcll.py
@@ -11,8 +11,8 @@
     fwbs_variables,
     physics_variables,
 )
-from process.dcll import DCLL
-from process.fw import FirstWall
+from process.models.blankets.dcll import DCLL
+from process.models.fw import FirstWall
 
 
 @pytest.fixture
diff --git a/tests/unit/test_divertor.py b/tests/unit/test_divertor.py
index 1e8c905d0e..68836d4e2e 100644
--- a/tests/unit/test_divertor.py
+++ b/tests/unit/test_divertor.py
@@ -4,7 +4,7 @@
 
 from process.data_structure import divertor_variables as dv
 from process.data_structure import tfcoil_variables as tfv
-from process.divertor import Divertor
+from process.models.divertor import Divertor
 
 
 @pytest.fixture
diff --git a/tests/unit/test_fusion_reactions.py b/tests/unit/test_fusion_reactions.py
index d41a7f6806..21bca7c523 100644
--- a/tests/unit/test_fusion_reactions.py
+++ b/tests/unit/test_fusion_reactions.py
@@ -6,8 +6,8 @@
 import pytest
 from pytest import approx
 
-from process import fusion_reactions as reactions
 from process.data_structure import physics_variables as pv
+from process.models.physics import fusion_reactions as reactions
 
 
 class SetFusionPowersParam(NamedTuple):
diff --git a/tests/unit/test_fw.py b/tests/unit/test_fw.py
index 5cbb23143a..33fee23e63 100644
--- a/tests/unit/test_fw.py
+++ b/tests/unit/test_fw.py
@@ -3,7 +3,7 @@
 import pytest
 
 from process.data_structure import fwbs_variables
-from process.fw import FirstWall
+from process.models.fw import FirstWall
 
 
 @pytest.fixture
diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py
index 4c8d9f2453..66879372a6 100644
--- a/tests/unit/test_ife.py
+++ b/tests/unit/test_ife.py
@@ -5,8 +5,6 @@
 import numpy as np
 import pytest
 
-from process.availability import Availability
-from process.costs import Costs
 from process.data_structure import (
     buildings_variables,
     cost_variables,
@@ -16,7 +14,9 @@
     ife_variables,
     physics_variables,
 )
-from process.ife import IFE
+from process.models.availability import Availability
+from process.models.costs.costs import Costs
+from process.models.ife import IFE
 
 
 @pytest.fixture
diff --git a/tests/unit/test_impurity_radiation.py b/tests/unit/test_impurity_radiation.py
index d7984f6d16..04cf87c857 100644
--- a/tests/unit/test_impurity_radiation.py
+++ b/tests/unit/test_impurity_radiation.py
@@ -5,7 +5,7 @@
 import numpy as np
 import pytest
 
-import process.impurity_radiation as impurity_radiation
+import process.models.physics.impurity_radiation as impurity_radiation
 from process.data_structure import impurity_radiation_module
 
 
diff --git a/tests/unit/test_l_h_transition.py b/tests/unit/test_l_h_transition.py
index d66f0b9c62..970c85497f 100644
--- a/tests/unit/test_l_h_transition.py
+++ b/tests/unit/test_l_h_transition.py
@@ -1,6 +1,6 @@
 import pytest
 
-from process.l_h_transition import (
+from process.models.physics.l_h_transition import (
     calculate_hubbard2012_lower,
     calculate_hubbard2012_nominal,
     calculate_hubbard2012_upper,
diff --git a/tests/unit/test_neoclassics.py b/tests/unit/test_neoclassics.py
index f220216d95..46dd6350f8 100644
--- a/tests/unit/test_neoclassics.py
+++ b/tests/unit/test_neoclassics.py
@@ -4,7 +4,7 @@
 import pytest
 
 from process.data_structure import neoclassics_variables, physics_variables
-from process.stellarator.neoclassics import Neoclassics
+from process.models.stellarator.neoclassics import Neoclassics
 
 
 @pytest.fixture
diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py
index 498869cfed..18f013f240 100644
--- a/tests/unit/test_pfcoil.py
+++ b/tests/unit/test_pfcoil.py
@@ -6,11 +6,11 @@
 import pytest
 from numpy.testing import assert_array_almost_equal
 
-from process.cs_fatigue import CsFatigue
 from process.data_structure import build_variables as bv
 from process.data_structure import pfcoil_variables
 from process.data_structure import tfcoil_variables as tfv
-from process.pfcoil import CSCoil, PFCoil, calculate_b_field_at_point, rsid
+from process.models.cs_fatigue import CsFatigue
+from process.models.pfcoil import CSCoil, PFCoil, calculate_b_field_at_point, rsid
 
 
 @pytest.fixture
diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py
index 9992a24a7e..93273518bd 100644
--- a/tests/unit/test_physics.py
+++ b/tests/unit/test_physics.py
@@ -6,7 +6,12 @@
 import pytest
 
 from process import constants
-from process.current_drive import (
+from process.data_structure import (
+    current_drive_variables,
+    impurity_radiation_module,
+    physics_variables,
+)
+from process.models.physics.current_drive import (
     CurrentDrive,
     ElectronBernstein,
     ElectronCyclotron,
@@ -14,13 +19,8 @@
     LowerHybrid,
     NeutralBeam,
 )
-from process.data_structure import (
-    current_drive_variables,
-    impurity_radiation_module,
-    physics_variables,
-)
-from process.impurity_radiation import initialise_imprad
-from process.physics import (
+from process.models.physics.impurity_radiation import initialise_imprad
+from process.models.physics.physics import (
     DetailedPhysics,
     Physics,
     PlasmaBeta,
@@ -34,7 +34,7 @@
     res_diff_time,
     rether,
 )
-from process.plasma_profiles import PlasmaProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
 
 
 @pytest.fixture
diff --git a/tests/unit/test_plasma_geom.py b/tests/unit/test_plasma_geom.py
index eeef55a4da..eeb109da68 100644
--- a/tests/unit/test_plasma_geom.py
+++ b/tests/unit/test_plasma_geom.py
@@ -4,8 +4,8 @@
 
 import pytest
 
-import process.plasma_geometry as pg
-from process.plasma_geometry import PlasmaGeom
+import process.models.physics.plasma_geometry as pg
+from process.models.physics.plasma_geometry import PlasmaGeom
 
 
 @pytest.fixture
diff --git a/tests/unit/test_plasma_profiles.py b/tests/unit/test_plasma_profiles.py
index 0b23bbc3bb..3c6f9abc7d 100644
--- a/tests/unit/test_plasma_profiles.py
+++ b/tests/unit/test_plasma_profiles.py
@@ -4,8 +4,8 @@
 import pytest
 
 from process.data_structure import divertor_variables, physics_variables
-from process.plasma_profiles import PlasmaProfile
-from process.profiles import NeProfile, TeProfile
+from process.models.physics.plasma_profiles import PlasmaProfile
+from process.models.physics.profiles import NeProfile, TeProfile
 
 
 class ProfileParam(NamedTuple):
diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py
index ba98fc562d..8ad3c1aead 100644
--- a/tests/unit/test_power.py
+++ b/tests/unit/test_power.py
@@ -21,7 +21,7 @@
     times_variables,
 )
 from process.data_structure import primary_pumping_variables as ppv
-from process.power import Power
+from process.models.power import Power
 
 
 @pytest.fixture
diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py
index a73fe0044e..a958098cd4 100644
--- a/tests/unit/test_pulse.py
+++ b/tests/unit/test_pulse.py
@@ -11,7 +11,7 @@
     physics_variables,
     pulse_variables,
 )
-from process.pulse import Pulse
+from process.models.pulse import Pulse
 
 
 @pytest.fixture
diff --git a/tests/unit/test_quench.py b/tests/unit/test_quench.py
index e8afc36a00..77fa7a3271 100644
--- a/tests/unit/test_quench.py
+++ b/tests/unit/test_quench.py
@@ -2,7 +2,7 @@
 import pytest
 from scipy.optimize import approx_fprime
 
-from process.quench import (
+from process.models.tfcoil.quench import (
     _copper_irradiation_resistivity,
     _copper_magneto_resistivity,
     _copper_rrr_resistivity,
diff --git a/tests/unit/test_resistive_tf_coil.py b/tests/unit/test_resistive_tf_coil.py
index 12a88496cb..aec8558924 100644
--- a/tests/unit/test_resistive_tf_coil.py
+++ b/tests/unit/test_resistive_tf_coil.py
@@ -8,7 +8,7 @@
     superconducting_tf_coil_variables,
     tfcoil_variables,
 )
-from process.resistive_tf_coil import ResistiveTFCoil
+from process.models.tfcoil.resistive import ResistiveTFCoil
 
 
 @pytest.fixture
diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py
index eeff158314..52d4a95b71 100644
--- a/tests/unit/test_sctfcoil.py
+++ b/tests/unit/test_sctfcoil.py
@@ -3,7 +3,6 @@
 import numpy as np
 import pytest
 
-from process import superconducting_tf_coil as sctf
 from process.data_structure import (
     build_variables,
     constraint_variables,
@@ -14,7 +13,8 @@
     superconducting_tf_coil_variables,
     tfcoil_variables,
 )
-from process.superconducting_tf_coil import SuperconductingTFCoil
+from process.models.tfcoil import superconducting as sctf
+from process.models.tfcoil.superconducting import SuperconductingTFCoil
 
 
 @pytest.fixture
diff --git a/tests/unit/test_shield.py b/tests/unit/test_shield.py
index 8c67048691..37d1c6e3d7 100644
--- a/tests/unit/test_shield.py
+++ b/tests/unit/test_shield.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from process.shield import Shield
+from process.models.shield import Shield
 
 
 @pytest.fixture
diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py
index 4f49d922f8..268a94b67f 100644
--- a/tests/unit/test_stellarator.py
+++ b/tests/unit/test_stellarator.py
@@ -3,17 +3,6 @@
 import numpy as np
 import pytest
 
-from process.availability import Availability
-from process.buildings import Buildings
-from process.costs import Costs
-from process.current_drive import (
-    CurrentDrive,
-    ElectronBernstein,
-    ElectronCyclotron,
-    IonCyclotron,
-    LowerHybrid,
-    NeutralBeam,
-)
 from process.data_structure import (
     build_variables,
     cost_variables,
@@ -27,21 +16,35 @@
     structure_variables,
     tfcoil_variables,
 )
-from process.fw import FirstWall
-from process.hcpb import CCFE_HCPB
-from process.physics import Physics, PlasmaBeta, PlasmaInductance
-from process.plasma_profiles import PlasmaProfile
-from process.power import Power
-from process.stellarator.build import st_build
-from process.stellarator.coils.coils import bmax_from_awp, intersect
-from process.stellarator.coils.quench import (
+from process.models.availability import Availability
+from process.models.blankets.hcpb import CCFE_HCPB
+from process.models.buildings import Buildings
+from process.models.costs.costs import Costs
+from process.models.fw import FirstWall
+from process.models.physics.current_drive import (
+    CurrentDrive,
+    ElectronBernstein,
+    ElectronCyclotron,
+    IonCyclotron,
+    LowerHybrid,
+    NeutralBeam,
+)
+from process.models.physics.physics import Physics, PlasmaBeta, PlasmaInductance
+from process.models.physics.plasma_profiles import PlasmaProfile
+from process.models.power import Power
+from process.models.stellarator.build import st_build
+from process.models.stellarator.coils.coils import bmax_from_awp, intersect
+from process.models.stellarator.coils.quench import (
     calculate_quench_protection_current_density,
     max_dump_voltage,
 )
-from process.stellarator.denisty_limits import st_d_limit_ecrh, st_sudo_density_limit
-from process.stellarator.neoclassics import Neoclassics
-from process.stellarator.stellarator import Stellarator
-from process.vacuum import Vacuum
+from process.models.stellarator.denisty_limits import (
+    st_d_limit_ecrh,
+    st_sudo_density_limit,
+)
+from process.models.stellarator.neoclassics import Neoclassics
+from process.models.stellarator.stellarator import Stellarator
+from process.models.vacuum import Vacuum
 
 
 @pytest.fixture
diff --git a/tests/unit/test_structure.py b/tests/unit/test_structure.py
index 17b224db20..8b83731ca2 100644
--- a/tests/unit/test_structure.py
+++ b/tests/unit/test_structure.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from process.structure import Structure
+from process.models.structure import Structure
 
 
 @pytest.fixture
diff --git a/tests/unit/test_superconductors.py b/tests/unit/test_superconductors.py
index a982a63811..b7c412c935 100644
--- a/tests/unit/test_superconductors.py
+++ b/tests/unit/test_superconductors.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import process.superconductors as superconductors
+import process.models.superconductors as superconductors
 
 
 class IterscParam(NamedTuple):
diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py
index 68044b75e1..e52b3a6f8d 100644
--- a/tests/unit/test_tfcoil.py
+++ b/tests/unit/test_tfcoil.py
@@ -9,15 +9,15 @@
 import numpy as np
 import pytest
 
-import process.tf_coil as tfcoil_module
-from process.build import Build
+import process.models.tfcoil.base as tfcoil_module
 from process.data_structure import (
     build_variables,
     fwbs_variables,
     superconducting_tf_coil_variables,
     tfcoil_variables,
 )
-from process.tf_coil import TFCoil
+from process.models.build import Build
+from process.models.tfcoil.base import TFCoil
 
 
 @pytest.fixture
diff --git a/tests/unit/test_vacuum.py b/tests/unit/test_vacuum.py
index 63298880a8..a20ef5a1e8 100644
--- a/tests/unit/test_vacuum.py
+++ b/tests/unit/test_vacuum.py
@@ -6,7 +6,7 @@
 from process.data_structure import tfcoil_variables as tfv
 from process.data_structure import times_variables as tv
 from process.data_structure import vacuum_variables as vacv
-from process.vacuum import Vacuum, VacuumVessel
+from process.models.vacuum import Vacuum, VacuumVessel
 
 
 @pytest.fixture
diff --git a/tests/unit/test_water_usage.py b/tests/unit/test_water_usage.py
index 27a5a6b4a1..bb28a18c93 100644
--- a/tests/unit/test_water_usage.py
+++ b/tests/unit/test_water_usage.py
@@ -3,7 +3,7 @@
 import pytest
 
 from process.data_structure import water_usage_variables
-from process.water_use import WaterUse
+from process.models.water_use import WaterUse
 
 
 @pytest.fixture