diff --git a/examples/case_from_multiple_files/main.py b/examples/case_from_multiple_files/main.py
index 976c9f8b4..d5bd6bf79 100644
--- a/examples/case_from_multiple_files/main.py
+++ b/examples/case_from_multiple_files/main.py
@@ -1,7 +1,7 @@
 import os
 
-import flow360.component.v1 as fl
 import flow360.component.v1.units as u
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 here = os.path.dirname(os.path.abspath(__file__))
diff --git a/examples/case_from_yaml.py b/examples/case_from_yaml.py
index 4624409f3..e2931473e 100644
--- a/examples/case_from_yaml.py
+++ b/examples/case_from_yaml.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/case_params_with_units.py b/examples/case_params_with_units.py
index 5d7b53320..29ace249e 100644
--- a/examples/case_params_with_units.py
+++ b/examples/case_params_with_units.py
@@ -1,7 +1,7 @@
 import json
 from pprint import pprint
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360 import log
 from flow360.component.v1 import units as u
 from flow360.component.v1.services import validate_model
diff --git a/examples/change_account_and_submit.py b/examples/change_account_and_submit.py
index e2e2f7e2f..319b4312b 100644
--- a/examples/change_account_and_submit.py
+++ b/examples/change_account_and_submit.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 fl.Env.dev.active()
diff --git a/examples/dev/dev_run_case_from_files.py b/examples/dev/dev_run_case_from_files.py
index 1a923e9a6..6cda2fdc4 100644
--- a/examples/dev/dev_run_case_from_files.py
+++ b/examples/dev/dev_run_case_from_files.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 fl.Env.dev.active()
diff --git a/examples/dev/dev_run_case_from_files_no_validation.py b/examples/dev/dev_run_case_from_files_no_validation.py
index 671206ce9..fda7ae454 100644
--- a/examples/dev/dev_run_case_from_files_no_validation.py
+++ b/examples/dev/dev_run_case_from_files_no_validation.py
@@ -1,6 +1,6 @@
 import os
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 fl.UserConfig.disable_validation()
diff --git a/examples/dev/dev_use_unit_system.py b/examples/dev/dev_use_unit_system.py
index a40df63c3..9e748129c 100644
--- a/examples/dev/dev_use_unit_system.py
+++ b/examples/dev/dev_use_unit_system.py
@@ -6,8 +6,7 @@
 import pydantic.v1 as pd
 import unyt
 
-import flow360.component.v1 as fl
-from flow360.component.v1 import Geometry
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.unit_system import (
     AngularVelocityType,
@@ -23,6 +22,7 @@
     VelocityType,
     ViscosityType,
 )
+from flow360.v1 import Geometry
 
 
 class DataWithUnits(pd.BaseModel):
diff --git a/examples/dev/list_cases_all_params.py b/examples/dev/list_cases_all_params.py
index 62bf79927..67635dd81 100644
--- a/examples/dev/list_cases_all_params.py
+++ b/examples/dev/list_cases_all_params.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.exceptions import Flow360ValidationError
 
 for case in fl.MyCases(limit=10000):
diff --git a/examples/display_mesh_info.py b/examples/display_mesh_info.py
index f7cfb0b96..ba12291ea 100644
--- a/examples/display_mesh_info.py
+++ b/examples/display_mesh_info.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 
 meshes = fl.MyVolumeMeshes()
 mesh = meshes[0]
diff --git a/examples/geometry_id_surface_volume_case_airplane_v1_from_csm.py b/examples/geometry_id_surface_volume_case_airplane_v1_from_csm.py
deleted file mode 100644
index 20e34d494..000000000
--- a/examples/geometry_id_surface_volume_case_airplane_v1_from_csm.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import os
-
-import flow360.component.v1 as fl
-
-fl.Env.preprod.active()
-
-from flow360.component.geometry_v1 import Geometry
-from flow360.component.meshing.params import Farfield, Volume, VolumeMeshingParams
-from flow360.examples import Airplane
-
-# geometry
-geometry_draft = Geometry.from_file(Airplane.geometry, name="testing-airplane-csm-geometry")
-geometry = geometry_draft.submit()
-print(geometry)
-
-# surface mesh
-params = fl.SurfaceMeshingParams(max_edge_length=0.16)
-
-surface_mesh_draft = fl.SurfaceMesh.create(
-    geometry_id=geometry.id,
-    params=params,
-    name="airplane-surface-mesh-from-geometry-id-v1",
-    solver_version="mesher-24.2.2",
-)
-surface_mesh = surface_mesh_draft.submit()
-
-print(surface_mesh)
-
-# volume mesh
-params = fl.VolumeMeshingParams(
-    volume=Volume(
-        first_layer_thickness=1e-5,
-        growth_rate=1.2,
-    ),
-    farfield=Farfield(type="auto"),
-)
-
-volume_mesh_draft = fl.VolumeMesh.create(
-    surface_mesh_id=surface_mesh.id,
-    name="airplane-volume-mesh-from-geometry-id-v1",
-    params=params,
-    solver_version="mesher-24.2.2",
-)
-volume_mesh = volume_mesh_draft.submit()
-print(volume_mesh)
-
-# case
-params = fl.Flow360Params(Airplane.case_json)
-params.boundaries = {
-    "fluid/farfield": fl.FreestreamBoundary(),
-    "fluid/fuselage": fl.NoSlipWall(),
-    "fluid/leftWing": fl.NoSlipWall(),
-    "fluid/rightWing": fl.NoSlipWall(),
-}
-case_draft = volume_mesh.create_case("airplane-case-from-csm-geometry-id-v1", params)
-case = case_draft.submit()
diff --git a/examples/geometry_id_surface_volume_case_airplane_v1_from_egads.py b/examples/geometry_id_surface_volume_case_airplane_v1_from_egads.py
deleted file mode 100644
index 81202e845..000000000
--- a/examples/geometry_id_surface_volume_case_airplane_v1_from_egads.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import os
-
-import flow360.component.v1 as fl
-
-fl.Env.preprod.active()
-
-from flow360.component.geometry_v1 import Geometry
-from flow360.component.meshing.params import Farfield, Volume, VolumeMeshingParams
-from flow360.examples import Airplane
-
-# geometry
-geometry_draft = Geometry.from_file(
-    "data/airplane_geometry.egads", name="testing-airplane-egads-geometry"
-)
-geometry = geometry_draft.submit()
-print(geometry)
-
-# surface mesh
-params = fl.SurfaceMeshingParams(max_edge_length=0.16)
-
-surface_mesh_draft = fl.SurfaceMesh.create(
-    geometry_id=geometry.id,
-    params=params,
-    name="airplane-surface-mesh-from-geometry-id-v1",
-)
-surface_mesh = surface_mesh_draft.submit()
-
-print(surface_mesh)
-
-# volume mesh
-params = fl.VolumeMeshingParams(
-    volume=Volume(
-        first_layer_thickness=1e-5,
-        growth_rate=1.2,
-    ),
-    farfield=Farfield(type="auto"),
-)
-
-volume_mesh_draft = fl.VolumeMesh.create(
-    surface_mesh_id=surface_mesh.id,
-    name="airplane-volume-mesh-from-geometry-id-v1",
-    params=params,
-)
-volume_mesh = volume_mesh_draft.submit()
-print(volume_mesh)
-
-# case
-params = fl.Flow360Params(Airplane.case_json)
-params.boundaries = {
-    "fluid/farfield": fl.FreestreamBoundary(),
-    "fluid/fuselage": fl.NoSlipWall(),
-    "fluid/leftWing": fl.NoSlipWall(),
-    "fluid/rightWing": fl.NoSlipWall(),
-}
-case_draft = volume_mesh.create_case("airplane-case-from-egads-geometry-id-v1", params)
-case = case_draft.submit()
diff --git a/examples/list_cases.py b/examples/list_cases.py
index ff7f9851c..cc5660487 100644
--- a/examples/list_cases.py
+++ b/examples/list_cases.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 
 # get all cases:
 my_cases = fl.MyCases()
diff --git a/examples/new_workbench_project_from_geometry.py b/examples/new_workbench_project_from_geometry.py
index 1bcf50870..c638b4dc0 100644
--- a/examples/new_workbench_project_from_geometry.py
+++ b/examples/new_workbench_project_from_geometry.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.geometry import Geometry
 from flow360.examples import Airplane
 
diff --git a/examples/new_workbench_project_from_volume_mesh.py b/examples/new_workbench_project_from_volume_mesh.py
index a0f02a25e..c4b7a8604 100644
--- a/examples/new_workbench_project_from_volume_mesh.py
+++ b/examples/new_workbench_project_from_volume_mesh.py
@@ -1,7 +1,7 @@
 import time
 
 import flow360.component.simulation.units as u
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.simulation.cloud import run_case
 from flow360.component.simulation.models.surface_models import (
     Freestream,
diff --git a/examples/project_from_file_geometry.py b/examples/project_from_file_geometry.py
index cfb5700c3..2272e8955 100644
--- a/examples/project_from_file_geometry.py
+++ b/examples/project_from_file_geometry.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.project import Project
 from flow360.component.simulation.meshing_param.params import (
     MeshingDefaults,
diff --git a/examples/project_from_file_geometry_multiple_runs.py b/examples/project_from_file_geometry_multiple_runs.py
index 5dec5b926..bec713e1d 100644
--- a/examples/project_from_file_geometry_multiple_runs.py
+++ b/examples/project_from_file_geometry_multiple_runs.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.project import Project
 from flow360.component.simulation.meshing_param.params import (
     MeshingDefaults,
diff --git a/examples/project_from_file_volume_mesh.py b/examples/project_from_file_volume_mesh.py
index ef80aed77..b1afe07af 100644
--- a/examples/project_from_file_volume_mesh.py
+++ b/examples/project_from_file_volume_mesh.py
@@ -1,7 +1,7 @@
 from matplotlib.pyplot import show
 
 import flow360.component.simulation.units as u
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.project import Project
 from flow360.component.simulation.models.surface_models import (
     Freestream,
diff --git a/examples/retrieve_results/actuator_disk.py b/examples/retrieve_results/actuator_disk.py
index 5f3345a20..7ccf1393e 100644
--- a/examples/retrieve_results/actuator_disk.py
+++ b/examples/retrieve_results/actuator_disk.py
@@ -1,7 +1,7 @@
 import os
 
-import flow360.component.v1 as fl
 import flow360.units as u
+import flow360.v1 as fl
 from flow360.examples import ActuatorDisk
 
 ActuatorDisk.get_files()
diff --git a/examples/retrieve_results/alpha_sweep.py b/examples/retrieve_results/alpha_sweep.py
index f0c4bbf0a..20e79ae9f 100644
--- a/examples/retrieve_results/alpha_sweep.py
+++ b/examples/retrieve_results/alpha_sweep.py
@@ -3,7 +3,7 @@
 
 from pylab import plot, show, xlabel, ylabel
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/retrieve_results/bet_disk.py b/examples/retrieve_results/bet_disk.py
index 8c775e1b3..e89c343d4 100644
--- a/examples/retrieve_results/bet_disk.py
+++ b/examples/retrieve_results/bet_disk.py
@@ -1,7 +1,7 @@
 import os
 
-import flow360.component.v1 as fl
 import flow360.component.v1.units as u
+import flow360.v1 as fl
 from flow360.examples import BETDisk
 
 BETDisk.get_files()
diff --git a/examples/retrieve_results/convergence.py b/examples/retrieve_results/convergence.py
index 7806e53f6..302a22b00 100644
--- a/examples/retrieve_results/convergence.py
+++ b/examples/retrieve_results/convergence.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import Convergence
 
 Convergence.get_files()
diff --git a/examples/retrieve_results/forces.py b/examples/retrieve_results/forces.py
index 20145dbc3..b6abcb5a2 100644
--- a/examples/retrieve_results/forces.py
+++ b/examples/retrieve_results/forces.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/retrieve_results/monitors.py b/examples/retrieve_results/monitors.py
index 055e63f0f..e12228e78 100644
--- a/examples/retrieve_results/monitors.py
+++ b/examples/retrieve_results/monitors.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import MonitorsAndSlices
 
 MonitorsAndSlices.get_files()
diff --git a/examples/retrieve_results/user_defined_dynamics.py b/examples/retrieve_results/user_defined_dynamics.py
index c6bd62717..08228abdd 100644
--- a/examples/retrieve_results/user_defined_dynamics.py
+++ b/examples/retrieve_results/user_defined_dynamics.py
@@ -1,6 +1,6 @@
 from pylab import show
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wingUserDefinedDynamics
 
 OM6wingUserDefinedDynamics.get_files()
diff --git a/examples/retrieve_results/volumetric_and_surface.py b/examples/retrieve_results/volumetric_and_surface.py
index bda7b7b49..f9eeec7c6 100644
--- a/examples/retrieve_results/volumetric_and_surface.py
+++ b/examples/retrieve_results/volumetric_and_surface.py
@@ -2,7 +2,7 @@
 import tarfile
 import tempfile
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import MonitorsAndSlices
 
 MonitorsAndSlices.get_files()
diff --git a/examples/run_case_from_example_mesh.py b/examples/run_case_from_example_mesh.py
index 44104e850..c7174d94d 100644
--- a/examples/run_case_from_example_mesh.py
+++ b/examples/run_case_from_example_mesh.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 vm = fl.VolumeMesh.copy_from_example("2ad77a88-1676-4f89-8652-13bd7e34f257")
diff --git a/examples/run_case_from_files.py b/examples/run_case_from_files.py
index a27099e44..fafdc747b 100644
--- a/examples/run_case_from_files.py
+++ b/examples/run_case_from_files.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/run_case_from_inputs.py b/examples/run_case_from_inputs.py
index 794edd04e..5455827b6 100644
--- a/examples/run_case_from_inputs.py
+++ b/examples/run_case_from_inputs.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/run_case_no_submit_warning.py b/examples/run_case_no_submit_warning.py
index 102d04cf8..6b140a69a 100644
--- a/examples/run_case_no_submit_warning.py
+++ b/examples/run_case_no_submit_warning.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/run_case_unsteady_from_files.py b/examples/run_case_unsteady_from_files.py
index a041533d2..8a14bc65b 100644
--- a/examples/run_case_unsteady_from_files.py
+++ b/examples/run_case_unsteady_from_files.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import Cylinder2D
 
 Cylinder2D.get_files()
diff --git a/examples/run_case_with_fork.py b/examples/run_case_with_fork.py
index 6527552e7..299c5072f 100644
--- a/examples/run_case_with_fork.py
+++ b/examples/run_case_with_fork.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/run_case_with_retry.py b/examples/run_case_with_retry.py
index bbb92d8db..66d8053e7 100644
--- a/examples/run_case_with_retry.py
+++ b/examples/run_case_with_retry.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()
diff --git a/examples/show_storage.py b/examples/show_storage.py
index 949304f85..98036432a 100644
--- a/examples/show_storage.py
+++ b/examples/show_storage.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 
 fl.Env.preprod.active()
 
diff --git a/examples/submit_case_to_folder.py b/examples/submit_case_to_folder.py
index 8cfef0bb5..eccf3c727 100644
--- a/examples/submit_case_to_folder.py
+++ b/examples/submit_case_to_folder.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 
 # create folder in ROOT level
diff --git a/examples/surface_mesh_airplane_from_files.py b/examples/surface_mesh_airplane_from_files.py
index 7447a6851..2fc538a53 100644
--- a/examples/surface_mesh_airplane_from_files.py
+++ b/examples/surface_mesh_airplane_from_files.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import Airplane
 
 params = fl.SurfaceMeshingParams(Airplane.surface_json)
diff --git a/examples/surface_mesh_airplane_from_inputs.py b/examples/surface_mesh_airplane_from_inputs.py
index 6ae9d4b17..fe1d20f29 100644
--- a/examples/surface_mesh_airplane_from_inputs.py
+++ b/examples/surface_mesh_airplane_from_inputs.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import Airplane
 
 params = fl.SurfaceMeshingParams(
diff --git a/examples/surface_mesh_list.py b/examples/surface_mesh_list.py
index 19aae559e..5e816001d 100644
--- a/examples/surface_mesh_list.py
+++ b/examples/surface_mesh_list.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 
 my_meshes = fl.MySurfaceMeshes()
 
diff --git a/examples/volume_mesh_from_surface_mesh_files.py b/examples/volume_mesh_from_surface_mesh_files.py
index 92a35f460..44e931dd3 100644
--- a/examples/volume_mesh_from_surface_mesh_files.py
+++ b/examples/volume_mesh_from_surface_mesh_files.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import Airplane
 
 params = fl.SurfaceMeshingParams(Airplane.surface_json)
diff --git a/examples/volume_mesh_from_surface_mesh_inputs.py b/examples/volume_mesh_from_surface_mesh_inputs.py
index 5ebe9f0ca..19427bef6 100644
--- a/examples/volume_mesh_from_surface_mesh_inputs.py
+++ b/examples/volume_mesh_from_surface_mesh_inputs.py
@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import Airplane
 
 params = fl.SurfaceMeshingParams(
diff --git a/flow360/__init__.py b/flow360/__init__.py
index 85a7d9138..1e739ab3d 100644
--- a/flow360/__init__.py
+++ b/flow360/__init__.py
@@ -2,6 +2,8 @@
 This module is flow360 for simulation based models
 """
 
+from flow360.accounts_utils import Accounts
+from flow360.component.project import Project
 from flow360.component.simulation import services
 from flow360.component.simulation import units as u
 from flow360.component.simulation.entity_info import GeometryEntityInfo
@@ -114,8 +116,15 @@
 from flow360.component.simulation.user_defined_dynamics.user_defined_dynamics import (
     UserDefinedDynamic,
 )
+from flow360.environment import Env
+from flow360.version import __solver_version__, __version__
 
 __all__ = [
+    "Env",
+    "__solver_version__",
+    "__version__",
+    "Accounts",
+    "Project",
     "u",
     "SimulationParams",
     "SI_unit_system",
diff --git a/flow360/component/project.py b/flow360/component/project.py
index 908d59609..cc9c2912f 100644
--- a/flow360/component/project.py
+++ b/flow360/component/project.py
@@ -57,7 +57,7 @@ class RootType(Enum):
     VOLUME_MESH = "VolumeMesh"
 
 
-class ProjectMeta(pd.BaseModel, extra=pd.Extra.allow):
+class ProjectMeta(pd.BaseModel, extra="allow"):
     """
     Metadata class for a project.
 
diff --git a/flow360/component/simulation/conversion.py b/flow360/component/simulation/conversion.py
index 79318a05c..448424843 100644
--- a/flow360/component/simulation/conversion.py
+++ b/flow360/component/simulation/conversion.py
@@ -118,7 +118,7 @@ def unit_converter(dimension, mesh_unit: u.unyt_quantity, params, required_by: L
     -------
     flow360_conversion_unit_system
         The conversion unit system for the specified dimension. This unit system allows for
-        .in_base(unit_system="flow360") conversion.
+        .in_base(unit_system="flow360_v2") conversion.
 
     Raises
     ------
diff --git a/flow360/component/simulation/framework/base_model.py b/flow360/component/simulation/framework/base_model.py
index b3f84bf35..f869fe6ef 100644
--- a/flow360/component/simulation/framework/base_model.py
+++ b/flow360/component/simulation/framework/base_model.py
@@ -676,7 +676,7 @@ def _convert_dimensions_to_solver(
                 )
                 # pylint: disable=no-member
                 value.units.registry = flow360_conv_system.registry
-                solver_values[property_name] = value.in_base(unit_system="flow360")
+                solver_values[property_name] = value.in_base(unit_system="flow360_v2")
                 log.debug(f"      converted to: {solver_values[property_name]}")
             elif isinstance(value, list) and property_name not in exclude:
                 new_value = []
@@ -690,7 +690,7 @@ def _convert_dimensions_to_solver(
                         )
                         # pylint: disable=no-member
                         item.units.registry = flow360_conv_system.registry
-                        new_value.append(item.in_base(unit_system="flow360"))
+                        new_value.append(item.in_base(unit_system="flow360_v2"))
                     else:
                         new_value.append(item)
                 solver_values[property_name] = new_value
@@ -759,6 +759,6 @@ def preprocess(
                             exclude=exclude,
                         )
                     elif isinstance(item, unyt_quantity):
-                        solver_values[property_name][i] = item.in_base(unit_system="flow360")
+                        solver_values[property_name][i] = item.in_base(unit_system="flow360_v2")
 
         return self.__class__(**solver_values)
diff --git a/flow360/component/simulation/unit_system.py b/flow360/component/simulation/unit_system.py
index e18d85b63..3c8fd0ff4 100644
--- a/flow360/component/simulation/unit_system.py
+++ b/flow360/component/simulation/unit_system.py
@@ -1512,7 +1512,7 @@ def __init__(self):
                     )
 
         conversion_system = u.UnitSystem(
-            "flow360",
+            "flow360_v2",
             "flow360_length_unit",
             "flow360_mass_unit",
             "flow360_time_unit",
diff --git a/flow360/component/v1/boundaries.py b/flow360/component/v1/boundaries.py
index 043e9dcf4..706b3dec4 100644
--- a/flow360/component/v1/boundaries.py
+++ b/flow360/component/v1/boundaries.py
@@ -10,13 +10,12 @@
 import pydantic.v1 as pd
 from pydantic.v1 import StrictStr
 
+from flow360.component.types import Axis, Vector
+from flow360.component.utils import process_expressions
+from flow360.component.v1.params_base import Flow360BaseModel
+from flow360.component.v1.turbulence_quantities import TurbulenceQuantitiesType
 from flow360.component.v1.unit_system import PressureType, VelocityType
 
-from ..types import Axis, Vector
-from ..utils import process_expressions
-from .params_base import Flow360BaseModel
-from .turbulence_quantities import TurbulenceQuantitiesType
-
 BoundaryVelocityType = Union[VelocityType.Vector, Tuple[StrictStr, StrictStr, StrictStr]]
 BoundaryAxisType = Union[Axis, Tuple[StrictStr, StrictStr, StrictStr]]
 
diff --git a/flow360/component/v1/conversions.py b/flow360/component/v1/conversions.py
index 885bdd9ea..756d6f321 100644
--- a/flow360/component/v1/conversions.py
+++ b/flow360/component/v1/conversions.py
@@ -13,8 +13,7 @@
     is_flow360_unit,
     u,
 )
-
-from ...exceptions import Flow360ConfigurationError
+from flow360.exceptions import Flow360ConfigurationError
 
 
 class ExtraDimensionedProperty(pd.BaseModel):
@@ -135,7 +134,7 @@ def unit_converter(dimension, params, required_by: List[str] = None):
     -------
     flow360_conversion_unit_system
         The conversion unit system for the specified dimension. This unit system allows for
-        .in_base(unit_system="flow360") conversion.
+        .in_base(unit_system="flow360_v1") conversion.
 
     Raises
     ------
diff --git a/flow360/component/v1/flow360_output.py b/flow360/component/v1/flow360_output.py
index 1a4710b0f..0071acb82 100644
--- a/flow360/component/v1/flow360_output.py
+++ b/flow360/component/v1/flow360_output.py
@@ -10,11 +10,9 @@
 import pydantic.v1 as pd
 from pydantic.v1 import conlist
 
-from flow360.component.v1.unit_system import Flow360UnitSystem, LengthType
-
-from ..types import Axis, Coordinate
-from ..utils import process_expressions
-from .flow360_fields import (
+from flow360.component.types import Axis, Coordinate
+from flow360.component.utils import process_expressions
+from flow360.component.v1.flow360_fields import (
     CommonFieldNames,
     IsoSurfaceFieldNames,
     SliceFieldNames,
@@ -23,12 +21,13 @@
     _distribute_shared_output_fields,
     get_field_values,
 )
-from .flow360_legacy import LegacyModel, get_output_fields
-from .params_base import (
+from flow360.component.v1.flow360_legacy import LegacyModel, get_output_fields
+from flow360.component.v1.params_base import (
     Flow360BaseModel,
     Flow360SortableBaseModel,
     _self_named_property_validator,
 )
+from flow360.component.v1.unit_system import Flow360UnitSystem, LengthType
 
 OutputFormat = Literal[
     "paraview", "tecplot", "both", "paraview,tecplot"
diff --git a/flow360/component/v1/flow360_params.py b/flow360/component/v1/flow360_params.py
index eafb3dc7d..165cc2381 100644
--- a/flow360/component/v1/flow360_params.py
+++ b/flow360/component/v1/flow360_params.py
@@ -13,40 +13,12 @@
 import pydantic.v1 as pd
 from typing_extensions import Literal
 
-from flow360.component.v1.unit_system import (
-    AngularVelocityType,
-    AreaType,
-    DensityType,
-    Flow360UnitSystem,
-    LengthType,
-    PressureType,
-    SIUnitSystem,
-    TemperatureType,
-    UnitSystem,
-    UnitSystemType,
-    VelocityType,
-    ViscosityType,
-    flow360_unit_system,
-    u,
-    unit_system_manager,
-)
-from flow360.flags import Flags
-
-from ...error_messages import unit_system_inconsistent_msg, use_unit_system_msg
-from ...exceptions import (
-    Flow360ConfigError,
-    Flow360NotImplementedError,
-    Flow360RuntimeError,
-)
-from ...log import log
-from ...user_config import UserConfig
-from ...version import __version__
-from ..types import Axis, Coordinate, Vector
-from ..utils import convert_legacy_names, process_expressions
-from . import units
-from .boundaries import BoundaryType
-from .conversions import ExtraDimensionedProperty
-from .flow360_legacy import (
+from flow360.component.types import Axis, Coordinate, Vector
+from flow360.component.utils import convert_legacy_names, process_expressions
+from flow360.component.v1 import units
+from flow360.component.v1.boundaries import BoundaryType
+from flow360.component.v1.conversions import ExtraDimensionedProperty
+from flow360.component.v1.flow360_legacy import (
     FreestreamInitialConditionLegacy,
     LegacyModel,
     try_add_discriminator,
@@ -54,7 +26,7 @@
     try_set,
     try_update,
 )
-from .flow360_output import (
+from flow360.component.v1.flow360_output import (
     AeroacousticOutput,
     IsoSurfaceOutput,
     IsoSurfaceOutputLegacy,
@@ -69,22 +41,22 @@
     VolumeOutput,
     VolumeOutputLegacy,
 )
-from .initial_condition import (
+from flow360.component.v1.initial_condition import (
     ExpressionInitialCondition,
     ExpressionInitialConditionLegacy,
     InitialConditions,
     ModifiedRestartSolution,
     ModifiedRestartSolutionLegacy,
 )
-from .params_base import (
+from flow360.component.v1.params_base import (
     Conflicts,
     Flow360BaseModel,
     Flow360SortableBaseModel,
     _self_named_property_validator,
     flow360_json_encoder,
 )
-from .physical_properties import _AirModel
-from .solvers import (
+from flow360.component.v1.physical_properties import _AirModel
+from flow360.component.v1.solvers import (
     HeatEquationSolver,
     HeatEquationSolverLegacy,
     NavierStokesSolver,
@@ -95,10 +67,34 @@
     TurbulenceModelSolverLegacy,
     TurbulenceModelSolverType,
 )
-from .time_stepping import BaseTimeStepping, SteadyTimeStepping, TimeStepping
-from .turbulence_quantities import TurbulenceQuantitiesType, TurbulentViscosityRatio
-from .updater import updater
-from .validations import (
+from flow360.component.v1.time_stepping import (
+    BaseTimeStepping,
+    SteadyTimeStepping,
+    TimeStepping,
+)
+from flow360.component.v1.turbulence_quantities import (
+    TurbulenceQuantitiesType,
+    TurbulentViscosityRatio,
+)
+from flow360.component.v1.unit_system import (
+    AngularVelocityType,
+    AreaType,
+    DensityType,
+    Flow360UnitSystem,
+    LengthType,
+    PressureType,
+    SIUnitSystem,
+    TemperatureType,
+    UnitSystem,
+    UnitSystemType,
+    VelocityType,
+    ViscosityType,
+    flow360_unit_system,
+    u,
+    unit_system_manager,
+)
+from flow360.component.v1.updater import updater
+from flow360.component.v1.validations import (
     _check_aero_acoustics,
     _check_bet_disks_3d_coefficients_in_polars,
     _check_bet_disks_alphas_in_order,
@@ -120,13 +116,23 @@
     _check_tri_quad_boundaries,
     _ignore_velocity_type_in_boundaries,
 )
-from .volume_zones import (
+from flow360.component.v1.volume_zones import (
     FluidDynamicsVolumeZone,
     HeatTransferVolumeZone,
     PorousMediumBase,
     ReferenceFrameType,
     VolumeZoneType,
 )
+from flow360.error_messages import unit_system_inconsistent_msg, use_unit_system_msg
+from flow360.exceptions import (
+    Flow360ConfigError,
+    Flow360NotImplementedError,
+    Flow360RuntimeError,
+)
+from flow360.flags import Flags
+from flow360.log import log
+from flow360.user_config import UserConfig
+from flow360.version import __version__
 
 
 # pylint: disable=invalid-name
diff --git a/flow360/component/v1/initial_condition.py b/flow360/component/v1/initial_condition.py
index 4d95add02..f023e79c8 100644
--- a/flow360/component/v1/initial_condition.py
+++ b/flow360/component/v1/initial_condition.py
@@ -9,9 +9,9 @@
 import pydantic.v1 as pd
 from typing_extensions import Literal
 
-from ..utils import process_expressions
-from .flow360_legacy import LegacyModel
-from .params_base import Flow360BaseModel
+from flow360.component.utils import process_expressions
+from flow360.component.v1.flow360_legacy import LegacyModel
+from flow360.component.v1.params_base import Flow360BaseModel
 
 
 class InitialCondition(Flow360BaseModel):
diff --git a/flow360/component/v1/meshing/params.py b/flow360/component/v1/meshing/params.py
index fbd1245ac..43dc30505 100644
--- a/flow360/component/v1/meshing/params.py
+++ b/flow360/component/v1/meshing/params.py
@@ -7,15 +7,14 @@
 import pydantic.v1 as pd
 from typing_extensions import Literal
 
-from flow360.flags import Flags
-
-from ...types import Axis, Coordinate
-from ..params_base import (
+from flow360.component.types import Axis, Coordinate
+from flow360.component.v1.params_base import (
     Flow360BaseModel,
     Flow360SortableBaseModel,
     _self_named_property_validator,
     flow360_json_encoder,
 )
+from flow360.flags import Flags
 
 
 class Aniso(Flow360BaseModel):
diff --git a/flow360/component/v1/params_base.py b/flow360/component/v1/params_base.py
index 5520ce601..0502c07b9 100644
--- a/flow360/component/v1/params_base.py
+++ b/flow360/component/v1/params_base.py
@@ -21,13 +21,12 @@
 from pydantic.v1.fields import ModelField
 from typing_extensions import Literal
 
+from flow360.component.types import COMMENTS, TYPE_TAG_STR
+from flow360.component.v1.conversions import need_conversion, require, unit_converter
 from flow360.component.v1.unit_system import DimensionedType, is_flow360_unit
-
-from ...error_messages import do_not_modify_file_manually_msg
-from ...exceptions import Flow360FileError, Flow360ValidationError
-from ...log import log
-from ..types import COMMENTS, TYPE_TAG_STR
-from .conversions import need_conversion, require, unit_converter
+from flow360.error_messages import do_not_modify_file_manually_msg
+from flow360.exceptions import Flow360FileError, Flow360ValidationError
+from flow360.log import log
 
 
 def json_dumps(value, *args, **kwargs):
@@ -710,7 +709,7 @@ def _convert_dimensions_to_solver(
                 )
                 # pylint: disable=no-member
                 value.units.registry = flow360_conv_system.registry
-                solver_values[property_name] = value.in_base(unit_system="flow360")
+                solver_values[property_name] = value.in_base(unit_system="flow360_v1")
                 log.debug(f"      converted to: {solver_values[property_name]}")
             else:
                 solver_values[property_name] = value
diff --git a/flow360/component/v1/services.py b/flow360/component/v1/services.py
index 28fcf726d..f017a1593 100644
--- a/flow360/component/v1/services.py
+++ b/flow360/component/v1/services.py
@@ -7,6 +7,7 @@
 
 import pydantic.v1 as pd
 
+from flow360.component.utils import remove_properties_with_prefix
 from flow360.component.v1.flow360_params import (
     Flow360Params,
     FreestreamFromVelocity,
@@ -29,8 +30,6 @@
 )
 from flow360.exceptions import Flow360ConfigurationError
 
-from ..utils import remove_properties_with_prefix
-
 unit_system_map = {
     "SI": SI_unit_system,
     "CGS": CGS_unit_system,
diff --git a/flow360/component/v1/solvers.py b/flow360/component/v1/solvers.py
index 5a2513b0e..f3070f0bf 100644
--- a/flow360/component/v1/solvers.py
+++ b/flow360/component/v1/solvers.py
@@ -11,18 +11,21 @@
 import pydantic.v1 as pd
 from typing_extensions import Literal
 
-from flow360.flags import Flags
-
-from ..types import Coordinate
-from .flow360_legacy import (
+from flow360.component.types import Coordinate
+from flow360.component.v1.flow360_legacy import (
     LegacyModel,
     LinearSolverLegacy,
     set_linear_solver_config_if_none,
     try_set,
     try_update,
 )
-from .params_base import Conflicts, DeprecatedAlias, Flow360BaseModel
-from .time_stepping import UnsteadyTimeStepping
+from flow360.component.v1.params_base import (
+    Conflicts,
+    DeprecatedAlias,
+    Flow360BaseModel,
+)
+from flow360.component.v1.time_stepping import UnsteadyTimeStepping
+from flow360.flags import Flags
 
 HEAT_EQUATION_EVAL_MAX_PER_PSEUDOSTEP_UNSTEADY = 40
 HEAT_EQUATION_EVAL_FREQUENCY_STEADY = 10
diff --git a/flow360/component/v1/time_stepping.py b/flow360/component/v1/time_stepping.py
index 55834a4a8..57b7b8bb7 100644
--- a/flow360/component/v1/time_stepping.py
+++ b/flow360/component/v1/time_stepping.py
@@ -12,10 +12,9 @@
 import pydantic.v1 as pd
 from typing_extensions import Literal
 
+from flow360.component.v1.params_base import DeprecatedAlias, Flow360BaseModel
 from flow360.component.v1.unit_system import TimeType
 
-from .params_base import DeprecatedAlias, Flow360BaseModel
-
 
 def _apply_default_to_none(original, default):
     for field_name in original.__fields__:
diff --git a/flow360/component/v1/turbulence_quantities.py b/flow360/component/v1/turbulence_quantities.py
index 129a56308..115dfb64a 100644
--- a/flow360/component/v1/turbulence_quantities.py
+++ b/flow360/component/v1/turbulence_quantities.py
@@ -8,7 +8,7 @@
 
 import pydantic.v1 as pd
 
-from .params_base import Flow360BaseModel
+from flow360.component.v1.params_base import Flow360BaseModel
 
 
 class TurbulentKineticEnergy(Flow360BaseModel):
diff --git a/flow360/component/v1/unit_system.py b/flow360/component/v1/unit_system.py
index be9116f1e..e70e4a675 100644
--- a/flow360/component/v1/unit_system.py
+++ b/flow360/component/v1/unit_system.py
@@ -1224,7 +1224,7 @@ def __init__(self):
                 )
 
         conversion_system = u.UnitSystem(
-            "flow360",
+            "flow360_v1",
             "flow360_length_unit",
             "flow360_mass_unit",
             "flow360_time_unit",
diff --git a/flow360/component/v1/updater.py b/flow360/component/v1/updater.py
index 0539ae948..fb682c851 100644
--- a/flow360/component/v1/updater.py
+++ b/flow360/component/v1/updater.py
@@ -4,7 +4,7 @@
 
 import re
 
-from ...exceptions import Flow360NotImplementedError, Flow360RuntimeError
+from flow360.exceptions import Flow360NotImplementedError, Flow360RuntimeError
 
 
 def _no_update(params_as_dict):
diff --git a/flow360/component/v1/validations.py b/flow360/component/v1/validations.py
index 86f8a6a4c..a19738a82 100644
--- a/flow360/component/v1/validations.py
+++ b/flow360/component/v1/validations.py
@@ -5,8 +5,7 @@
 from copy import deepcopy
 from typing import List, Literal, Optional, Tuple, Union, get_args, get_origin
 
-from ...log import log
-from .boundaries import (
+from flow360.component.v1.boundaries import (
     RotationallyPeriodic,
     SlipWall,
     SolidAdiabaticWall,
@@ -14,12 +13,13 @@
     TranslationallyPeriodic,
     WallFunction,
 )
-from .flow360_fields import _distribute_shared_output_fields
-from .initial_condition import ExpressionInitialCondition
-from .params_utils import get_all_output_fields
-from .solvers import IncompressibleNavierStokesSolver
-from .time_stepping import SteadyTimeStepping, UnsteadyTimeStepping
-from .volume_zones import HeatTransferVolumeZone
+from flow360.component.v1.flow360_fields import _distribute_shared_output_fields
+from flow360.component.v1.initial_condition import ExpressionInitialCondition
+from flow360.component.v1.params_utils import get_all_output_fields
+from flow360.component.v1.solvers import IncompressibleNavierStokesSolver
+from flow360.component.v1.time_stepping import SteadyTimeStepping, UnsteadyTimeStepping
+from flow360.component.v1.volume_zones import HeatTransferVolumeZone
+from flow360.log import log
 
 
 def _ignore_velocity_type_in_boundaries(values):
diff --git a/flow360/component/v1/volume_zones.py b/flow360/component/v1/volume_zones.py
index 7b57d1c2c..6cb0034e2 100644
--- a/flow360/component/v1/volume_zones.py
+++ b/flow360/component/v1/volume_zones.py
@@ -14,6 +14,10 @@
 from pydantic.v1 import StrictStr
 from typing_extensions import Literal
 
+from flow360.component.constants import NumericalConstants
+from flow360.component.types import Axis, List
+from flow360.component.utils import process_expressions
+from flow360.component.v1.params_base import Flow360BaseModel
 from flow360.component.v1.unit_system import (
     AngularVelocityType,
     HeatSourceType,
@@ -22,11 +26,6 @@
     LengthType,
 )
 
-from ..constants import NumericalConstants
-from ..types import Axis, List
-from ..utils import process_expressions
-from .params_base import Flow360BaseModel
-
 
 class ReferenceFrameBase(Flow360BaseModel):
     """Base reference frame class"""
diff --git a/flow360/component/v1/__init__.py b/flow360/v1.py
similarity index 80%
rename from flow360/component/v1/__init__.py
rename to flow360/v1.py
index 1f67643c4..74d857616 100644
--- a/flow360/component/v1/__init__.py
+++ b/flow360/v1.py
@@ -1,36 +1,21 @@
 """
-This module is flow360.
+Flow360 V1 (legacy) modules.
 """
 
 import os
 
 from numpy import pi
 
-from flow360.component.v1.unit_system import (
-    CGS_unit_system,
-    SI_unit_system,
-    UnitSystem,
-    flow360_unit_system,
-    imperial_unit_system,
-)
-
-from ... import global_exception_handler
-from ...accounts_utils import Accounts
-from ...cli import flow360
-from ...cloud.s3_utils import ProgressCallbackInterface
-from ...environment import Env
-from ...flags import Flags
-from ...user_config import UserConfig
-from ...version import __solver_version__, __version__
-from ..case import Case
-from ..case import CaseList as MyCases
-from ..folder import Folder
-from ..surface_mesh import SurfaceMesh
-from ..surface_mesh import SurfaceMeshList as MySurfaceMeshes
-from ..volume_mesh import VolumeMesh
-from ..volume_mesh import VolumeMeshList as MyVolumeMeshes
-from . import meshing, solvers, units
-from .boundaries import (
+from flow360 import global_exception_handler
+from flow360.cli import flow360
+from flow360.cloud.s3_utils import ProgressCallbackInterface
+from flow360.component.case import Case
+from flow360.component.case import CaseList as MyCases
+from flow360.component.folder import Folder
+from flow360.component.surface_mesh import SurfaceMesh
+from flow360.component.surface_mesh import SurfaceMeshList as MySurfaceMeshes
+from flow360.component.v1 import meshing, solvers, units
+from flow360.component.v1.boundaries import (
     FreestreamBoundary,
     HeatFluxWall,
     IsothermalWall,
@@ -53,7 +38,7 @@
     VelocityInflow,
     WallFunction,
 )
-from .flow360_output import (
+from flow360.component.v1.flow360_output import (
     IsoSurfaceOutput,
     IsoSurfaces,
     MonitorOutput,
@@ -66,7 +51,7 @@
     SurfaceOutput,
     Surfaces,
 )
-from .flow360_params import (
+from flow360.component.v1.flow360_params import (
     ActuatorDisk,
     AeroacousticOutput,
     AirDensityTemperature,
@@ -96,8 +81,11 @@
     ZeroFreestreamFromVelocity,
     air,
 )
-from .initial_condition import ExpressionInitialCondition, ModifiedRestartSolution
-from .meshing.params import (
+from flow360.component.v1.initial_condition import (
+    ExpressionInitialCondition,
+    ModifiedRestartSolution,
+)
+from flow360.component.v1.meshing.params import (
     Aniso,
     BoxRefinement,
     CylinderRefinement,
@@ -112,7 +100,7 @@
     Volume,
     VolumeMeshingParams,
 )
-from .solvers import (
+from flow360.component.v1.solvers import (
     IncompressibleNavierStokesSolver,
     KOmegaSST,
     KOmegaSSTModelConstants,
@@ -123,15 +111,22 @@
     SpalartAllmaras,
     SpalartAllmarasModelConstants,
 )
-from .time_stepping import (
+from flow360.component.v1.time_stepping import (
     AdaptiveCFL,
     RampCFL,
     SteadyTimeStepping,
     TimeStepping,
     UnsteadyTimeStepping,
 )
-from .turbulence_quantities import TurbulenceQuantities
-from .volume_zones import (
+from flow360.component.v1.turbulence_quantities import TurbulenceQuantities
+from flow360.component.v1.unit_system import (
+    CGS_unit_system,
+    SI_unit_system,
+    UnitSystem,
+    flow360_unit_system,
+    imperial_unit_system,
+)
+from flow360.component.v1.volume_zones import (
     FluidDynamicsVolumeZone,
     HeatTransferVolumeZone,
     InitialConditionHeatTransfer,
@@ -142,9 +137,12 @@
     ReferenceFrameOmegaDegrees,
     ReferenceFrameOmegaRadians,
 )
+from flow360.component.volume_mesh import VolumeMesh
+from flow360.component.volume_mesh import VolumeMeshList as MyVolumeMeshes
+from flow360.flags import Flags
+from flow360.user_config import UserConfig
 
 __all__ = [
-    "Accounts",
     "ActuatorDisk",
     "AdaptiveCFL",
     "AeroacousticOutput",
@@ -161,7 +159,6 @@
     "Case",
     "CylinderRefinement",
     "Edges",
-    "Env",
     "ExpressionInitialCondition",
     "Face",
     "Faces",
@@ -257,8 +254,6 @@
     "WallFunction",
     "ZeroFreestream",
     "ZeroFreestreamFromVelocity",
-    "__version__",
-    "__solver_version__",
     "air",
     "flow360",
     "flow360_unit_system",
diff --git a/tests/test_current_flow360_version.py b/tests/test_current_flow360_version.py
index e7eb64980..93bf5c471 100644
--- a/tests/test_current_flow360_version.py
+++ b/tests/test_current_flow360_version.py
@@ -1,4 +1,4 @@
-from flow360.component.v1 import __version__
+from flow360.version import __version__
 
 
 def test_version():
diff --git a/tests/test_environment.py b/tests/test_environment.py
index 60a823cc5..502d152c3 100644
--- a/tests/test_environment.py
+++ b/tests/test_environment.py
@@ -1,4 +1,4 @@
-from flow360.component.v1 import Env
+from flow360 import Env
 
 
 def test_version():
diff --git a/tests/test_results.py b/tests/test_results.py
index 711601d9e..a2a22c243 100644
--- a/tests/test_results.py
+++ b/tests/test_results.py
@@ -6,8 +6,8 @@
 import pandas
 import pytest
 
-import flow360.component.v1 as fl
 import flow360.component.v1.units as u1
+import flow360.v1 as fl
 from flow360 import log
 from flow360.component.simulation import units as u2
 from flow360.component.simulation.operating_condition.operating_condition import (
diff --git a/tests/test_shared_accounts.py b/tests/test_shared_accounts.py
index c43092473..14ab1921a 100644
--- a/tests/test_shared_accounts.py
+++ b/tests/test_shared_accounts.py
@@ -2,7 +2,8 @@
 
 import pytest
 
-from flow360.component.v1 import Accounts, Env
+from flow360.accounts_utils import Accounts
+from flow360.environment import Env
 
 
 def test_shared_account(mock_response, monkeypatch):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 3da5c8d9c..02febaa65 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from flow360.accounts_utils import Accounts
 from flow360.cli.dict_utils import merge_overwrite
 from flow360.component.utils import (
     CompressionFormat,
@@ -12,7 +13,6 @@
     shared_account_confirm_proceed,
     validate_type,
 )
-from flow360.component.v1 import Accounts
 from flow360.component.volume_mesh import VolumeMeshMeta
 from flow360.exceptions import Flow360TypeError, Flow360ValueError
 
diff --git a/tests/v1/_test_case.py b/tests/v1/_test_case.py
index fc9236bce..7319d80a9 100644
--- a/tests/v1/_test_case.py
+++ b/tests/v1/_test_case.py
@@ -1,6 +1,6 @@
 from flow360.component.case import Case
-from flow360.component.v1 import Env
 from flow360.component.v1.flow360_params import Flow360Params, UnsteadyTimeStepping
+from flow360.v1 import Env
 
 
 def test_from_cloud():
diff --git a/tests/v1/_test_case_submit_solver_version.py b/tests/v1/_test_case_submit_solver_version.py
index 90e66089e..9094fd1c7 100644
--- a/tests/v1/_test_case_submit_solver_version.py
+++ b/tests/v1/_test_case_submit_solver_version.py
@@ -1,6 +1,6 @@
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.examples import OM6wing
 from flow360.exceptions import Flow360RuntimeError, Flow360ValidationError
 from flow360.log import set_logging_level
diff --git a/tests/v1/_test_validate.py b/tests/v1/_test_validate.py
index 08c7a8d07..bb9503b14 100644
--- a/tests/v1/_test_validate.py
+++ b/tests/v1/_test_validate.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.validator import Validator
 
 assertions = unittest.TestCase("__init__")
diff --git a/tests/v1/params/test_freestream.py b/tests/v1/params/test_freestream.py
index 0d037d98e..c74f83035 100644
--- a/tests/v1/params/test_freestream.py
+++ b/tests/v1/params/test_freestream.py
@@ -4,7 +4,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.flow360_params import (
     FreestreamFromMach,
diff --git a/tests/v1/params/test_initial_condition.py b/tests/v1/params/test_initial_condition.py
index 4620f16a8..745e5bc72 100644
--- a/tests/v1/params/test_initial_condition.py
+++ b/tests/v1/params/test_initial_condition.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.initial_condition import ExpressionInitialCondition
 from tests.utils import to_file_from_file_test
 
diff --git a/tests/v1/params/test_outputs.py b/tests/v1/params/test_outputs.py
index 8e8eb2bc7..3bf0a0caa 100644
--- a/tests/v1/params/test_outputs.py
+++ b/tests/v1/params/test_outputs.py
@@ -5,8 +5,8 @@
 import pytest
 import unyt
 
-import flow360.component.v1 as v1
 import flow360.component.v1.units as u
+import flow360.v1 as v1
 from flow360.component.v1.flow360_output import (
     IsoSurface,
     IsoSurfaceOutput,
diff --git a/tests/v1/params/test_params_boundary.py b/tests/v1/params/test_params_boundary.py
index 0eb87ce50..8e08dd705 100644
--- a/tests/v1/params/test_params_boundary.py
+++ b/tests/v1/params/test_params_boundary.py
@@ -3,7 +3,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.boundaries import (
     FreestreamBoundary,
     HeatFluxWall,
diff --git a/tests/v1/params/test_porous_media.py b/tests/v1/params/test_porous_media.py
index d5fd557b6..27f5bcf95 100644
--- a/tests/v1/params/test_porous_media.py
+++ b/tests/v1/params/test_porous_media.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from flow360.component.v1 import SI_unit_system
 from flow360.component.v1.flow360_params import PorousMediumBox
+from flow360.v1 import SI_unit_system
 from tests.utils import to_file_from_file_test
 
 assertions = unittest.TestCase("__init__")
diff --git a/tests/v1/params/test_preconditioner.py b/tests/v1/params/test_preconditioner.py
index 26f00bd6f..618610540 100644
--- a/tests/v1/params/test_preconditioner.py
+++ b/tests/v1/params/test_preconditioner.py
@@ -4,7 +4,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.flow360_params import FreestreamFromVelocity
 
diff --git a/tests/v1/params/test_reference_frame.py b/tests/v1/params/test_reference_frame.py
index 87861a7f2..87c1c47b8 100644
--- a/tests/v1/params/test_reference_frame.py
+++ b/tests/v1/params/test_reference_frame.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 
 assertions = unittest.TestCase("__init__")
diff --git a/tests/v1/params/test_rotational_models.py b/tests/v1/params/test_rotational_models.py
index 3df57b8a2..cbe856433 100644
--- a/tests/v1/params/test_rotational_models.py
+++ b/tests/v1/params/test_rotational_models.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_params import (
     ActuatorDisk,
     BETDisk,
diff --git a/tests/v1/params/test_solvers.py b/tests/v1/params/test_solvers.py
index 8f30ab59b..296bd42ca 100644
--- a/tests/v1/params/test_solvers.py
+++ b/tests/v1/params/test_solvers.py
@@ -3,7 +3,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_params import (
     Flow360Params,
     HeatEquationSolver,
diff --git a/tests/v1/params/test_time_stepping.py b/tests/v1/params/test_time_stepping.py
index 60e493c34..baa1b6aa6 100644
--- a/tests/v1/params/test_time_stepping.py
+++ b/tests/v1/params/test_time_stepping.py
@@ -4,7 +4,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.flow360_params import (
     Flow360Params,
diff --git a/tests/v1/params/test_user_defined_dynamics.py b/tests/v1/params/test_user_defined_dynamics.py
index 6b201fde8..81a5b9818 100644
--- a/tests/v1/params/test_user_defined_dynamics.py
+++ b/tests/v1/params/test_user_defined_dynamics.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_params import UserDefinedDynamic
 from tests.utils import to_file_from_file_test
 
diff --git a/tests/v1/params/test_validator_aeroacoustics.py b/tests/v1/params/test_validator_aeroacoustics.py
index 845ec0abe..e01f570ff 100644
--- a/tests/v1/params/test_validator_aeroacoustics.py
+++ b/tests/v1/params/test_validator_aeroacoustics.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.boundaries import NoSlipWall, TranslationallyPeriodic
 from flow360.component.v1.flow360_output import AeroacousticOutput
 from flow360.component.v1.flow360_params import Flow360Params
diff --git a/tests/v1/params/test_validator_bet_disks.py b/tests/v1/params/test_validator_bet_disks.py
index b5643e9b7..6ddae217b 100644
--- a/tests/v1/params/test_validator_bet_disks.py
+++ b/tests/v1/params/test_validator_bet_disks.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_params import (
     BETDisk,
     BETDiskChord,
diff --git a/tests/v1/params/test_validator_boundary.py b/tests/v1/params/test_validator_boundary.py
index 4028b3a3d..13c90cbfb 100644
--- a/tests/v1/params/test_validator_boundary.py
+++ b/tests/v1/params/test_validator_boundary.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.boundaries import NoSlipWall
 from flow360.component.v1.flow360_params import Flow360Params
 
diff --git a/tests/v1/params/test_validator_cht_solver.py b/tests/v1/params/test_validator_cht_solver.py
index f0b9c0994..2b7bbc09e 100644
--- a/tests/v1/params/test_validator_cht_solver.py
+++ b/tests/v1/params/test_validator_cht_solver.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.boundaries import SolidAdiabaticWall, SolidIsothermalWall
 from flow360.component.v1.flow360_output import (
diff --git a/tests/v1/params/test_validator_consistency_ddes_unsteady.py b/tests/v1/params/test_validator_consistency_ddes_unsteady.py
index d268fcbb0..3e81e6ca2 100644
--- a/tests/v1/params/test_validator_consistency_ddes_unsteady.py
+++ b/tests/v1/params/test_validator_consistency_ddes_unsteady.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.flow360_params import Flow360Params, SteadyTimeStepping
 from flow360.component.v1.solvers import SpalartAllmaras
diff --git a/tests/v1/params/test_validator_equation_eval_frequency.py b/tests/v1/params/test_validator_equation_eval_frequency.py
index 06152ae89..ef4ea9576 100644
--- a/tests/v1/params/test_validator_equation_eval_frequency.py
+++ b/tests/v1/params/test_validator_equation_eval_frequency.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.flow360_params import Flow360Params, SteadyTimeStepping
 from flow360.component.v1.solvers import SpalartAllmaras, TransitionModelSolver
diff --git a/tests/v1/params/test_validator_output_consistency.py b/tests/v1/params/test_validator_output_consistency.py
index 57ae0d666..aa42c5dd6 100644
--- a/tests/v1/params/test_validator_output_consistency.py
+++ b/tests/v1/params/test_validator_output_consistency.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.boundaries import FreestreamBoundary, NoSlipWall, WallFunction
 from flow360.component.v1.flow360_output import SurfaceOutput
 from flow360.component.v1.flow360_params import Flow360Params
diff --git a/tests/v1/params/test_validator_periodic_mapping.py b/tests/v1/params/test_validator_periodic_mapping.py
index 9efdd6472..8a6330d65 100644
--- a/tests/v1/params/test_validator_periodic_mapping.py
+++ b/tests/v1/params/test_validator_periodic_mapping.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.boundaries import (
     NoSlipWall,
     RotationallyPeriodic,
diff --git a/tests/v1/params/test_volume_zones.py b/tests/v1/params/test_volume_zones.py
index ae6c5e129..d67101da6 100644
--- a/tests/v1/params/test_volume_zones.py
+++ b/tests/v1/params/test_volume_zones.py
@@ -4,7 +4,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_params import VolumeZones
 from flow360.component.v1.volume_zones import (
     FluidDynamicsVolumeZone,
diff --git a/tests/v1/test_case.py b/tests/v1/test_case.py
index 4b775a6a0..2627b6962 100644
--- a/tests/v1/test_case.py
+++ b/tests/v1/test_case.py
@@ -1,6 +1,8 @@
 import pytest
 
-from flow360.component.v1 import (
+from flow360.exceptions import Flow360RuntimeError, Flow360ValueError
+from flow360.log import set_logging_level
+from flow360.v1 import (
     Case,
     Flow360Params,
     FreestreamFromVelocity,
@@ -9,8 +11,6 @@
     VolumeMesh,
     air,
 )
-from flow360.exceptions import Flow360RuntimeError, Flow360ValueError
-from flow360.log import set_logging_level
 
 set_logging_level("DEBUG")
 
diff --git a/tests/v1/test_case_webapi.py b/tests/v1/test_case_webapi.py
index 9e633f4f8..b19457b5f 100644
--- a/tests/v1/test_case_webapi.py
+++ b/tests/v1/test_case_webapi.py
@@ -1,8 +1,8 @@
 import pytest
 
-from flow360.component.v1 import Case
 from flow360.exceptions import Flow360RuntimeError
 from flow360.log import Logger, log
+from flow360.v1 import Case
 
 Logger.log_to_file = False
 
diff --git a/tests/v1/test_dev_flow360_params.py b/tests/v1/test_dev_flow360_params.py
index 318212f8c..1b55c85de 100644
--- a/tests/v1/test_dev_flow360_params.py
+++ b/tests/v1/test_dev_flow360_params.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 
 from ..utils import compare_to_ref, to_file_from_file_test
 
diff --git a/tests/v1/test_flow360_params.py b/tests/v1/test_flow360_params.py
index d32535df8..9858730ce 100644
--- a/tests/v1/test_flow360_params.py
+++ b/tests/v1/test_flow360_params.py
@@ -5,7 +5,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.flow360_params import (
     Flow360MeshParams,
diff --git a/tests/v1/test_folders.py b/tests/v1/test_folders.py
index 08dea5218..7a60536ce 100644
--- a/tests/v1/test_folders.py
+++ b/tests/v1/test_folders.py
@@ -1,5 +1,5 @@
-from flow360.component.v1 import Case, Folder
 from flow360.log import set_logging_level
+from flow360.v1 import Case, Folder
 
 set_logging_level("DEBUG")
 
diff --git a/tests/v1/test_handle_version_and_unit_system.py b/tests/v1/test_handle_version_and_unit_system.py
index 92b7d3401..2144e2633 100644
--- a/tests/v1/test_handle_version_and_unit_system.py
+++ b/tests/v1/test_handle_version_and_unit_system.py
@@ -4,10 +4,11 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as v1
 import flow360.component.v1.units as u
-from flow360.component.v1 import Flow360Params
+import flow360.v1 as v1
 from flow360.exceptions import Flow360NotImplementedError, Flow360RuntimeError
+from flow360.v1 import Flow360Params
+from flow360.version import __version__
 
 params_old_version = {
     "version": "0.2.0b01",
@@ -277,7 +278,7 @@ def test_parse_with_version():
         json.dump(params_no_hash, temp_file)
 
     params = Flow360Params(temp_file.name)
-    assert params.version == v1.__version__
+    assert params.version == __version__
 
 
 def test_parse_no_version():
diff --git a/tests/v1/test_schema_generator.py b/tests/v1/test_schema_generator.py
index cbee1a825..37bddc50a 100644
--- a/tests/v1/test_schema_generator.py
+++ b/tests/v1/test_schema_generator.py
@@ -1,6 +1,6 @@
 import json
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 
 
 def test_schema_generators():
diff --git a/tests/v1/test_services_v1.py b/tests/v1/test_services_v1.py
index 38e28cf00..1da71c11f 100644
--- a/tests/v1/test_services_v1.py
+++ b/tests/v1/test_services_v1.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import services
 
 
diff --git a/tests/v1/test_unit_system_v1.py b/tests/v1/test_unit_system_v1.py
index 10b45c987..7a4a00ebe 100644
--- a/tests/v1/test_unit_system_v1.py
+++ b/tests/v1/test_unit_system_v1.py
@@ -4,7 +4,7 @@
 import pydantic.v1 as pd
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1 import units as u
 from flow360.component.v1.params_base import Flow360BaseModel
 from flow360.component.v1.unit_system import (
diff --git a/tests/v1/test_updater.py b/tests/v1/test_updater.py
index 1d781b9f2..27d5e8946 100644
--- a/tests/v1/test_updater.py
+++ b/tests/v1/test_updater.py
@@ -3,11 +3,12 @@
 
 import pytest
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_legacy import LinearSolverLegacy
 from flow360.component.v1.initial_condition import ExpressionInitialCondition
 from flow360.component.v1.updater import UPDATE_MAP, _find_update_path, _no_update
 from flow360.exceptions import Flow360NotImplementedError
+from flow360.version import __version__
 
 
 @pytest.fixture(autouse=True)
@@ -265,4 +266,4 @@ def test_updater_map():
     assert len(update_path) == 3
 
     update_path = _find_update_path(version_from=UPDATE_MAP[0][0], version_to=UPDATE_MAP[-1][1])
-    update_path = _find_update_path(version_from=UPDATE_MAP[0][0], version_to=fl.__version__)
+    update_path = _find_update_path(version_from=UPDATE_MAP[0][0], version_to=__version__)
diff --git a/tests/v1/test_validator_valid_output_fields.py b/tests/v1/test_validator_valid_output_fields.py
index 4c061874d..7f97c398f 100644
--- a/tests/v1/test_validator_valid_output_fields.py
+++ b/tests/v1/test_validator_valid_output_fields.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-import flow360.component.v1 as fl
 import flow360.component.v1.units as u
+import flow360.v1 as fl
 from flow360.component.v1.boundaries import FreestreamBoundary, NoSlipWall
 from flow360.component.v1.flow360_output import (
     IsoSurface,
diff --git a/tests/v1/test_volume_mesh.py b/tests/v1/test_volume_mesh.py
index 274a80a95..a937ecee5 100644
--- a/tests/v1/test_volume_mesh.py
+++ b/tests/v1/test_volume_mesh.py
@@ -1,6 +1,6 @@
 import pytest
 
-import flow360.component.v1 as v1
+import flow360.v1 as v1
 from flow360.component.utils import CompressionFormat, MeshFileFormat, UGRIDEndianness
 from flow360.component.v1.boundaries import NoSlipWall
 from flow360.component.v1.flow360_params import (
diff --git a/tools/integrations/schema_generation.py b/tools/integrations/schema_generation.py
index 75cb2c11b..0bb9c922f 100644
--- a/tools/integrations/schema_generation.py
+++ b/tools/integrations/schema_generation.py
@@ -4,7 +4,7 @@
 
 import pydantic.v1 as pd
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.flow360_params import (
     BETDiskChord,
     BETDiskSectionalPolar,
diff --git a/tools/integrations/tests/_test_webui_workbench_integration.py b/tools/integrations/tests/_test_webui_workbench_integration.py
index 8cc51c036..d8d383b2a 100644
--- a/tools/integrations/tests/_test_webui_workbench_integration.py
+++ b/tools/integrations/tests/_test_webui_workbench_integration.py
@@ -1,7 +1,7 @@
 import json
 import os
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.simulation.meshing_param.face_params import (
     BoundaryLayer,
     SurfaceRefinement,
diff --git a/tools/integrations/unit_defaults.py b/tools/integrations/unit_defaults.py
index 8e58f28f7..8ce5a8de6 100644
--- a/tools/integrations/unit_defaults.py
+++ b/tools/integrations/unit_defaults.py
@@ -3,7 +3,7 @@
 
 import pydantic.v1 as pd
 
-import flow360.component.v1 as fl
+import flow360.v1 as fl
 from flow360.component.v1.params_base import Flow360BaseModel