diff --git a/geosx_mesh_doctor/mesh_doctor/__init__.py b/geosx_mesh_doctor/mesh_doctor/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/geosx_mesh_doctor/checks/__init__.py b/geosx_mesh_doctor/mesh_doctor/checks/__init__.py
similarity index 100%
rename from geosx_mesh_doctor/checks/__init__.py
rename to geosx_mesh_doctor/mesh_doctor/checks/__init__.py
diff --git a/geosx_mesh_doctor/checks/check_fractures.py b/geosx_mesh_doctor/mesh_doctor/checks/check_fractures.py
similarity index 100%
rename from geosx_mesh_doctor/checks/check_fractures.py
rename to geosx_mesh_doctor/mesh_doctor/checks/check_fractures.py
diff --git a/geosx_mesh_doctor/checks/collocated_nodes.py b/geosx_mesh_doctor/mesh_doctor/checks/collocated_nodes.py
similarity index 100%
rename from geosx_mesh_doctor/checks/collocated_nodes.py
rename to geosx_mesh_doctor/mesh_doctor/checks/collocated_nodes.py
diff --git a/geosx_mesh_doctor/checks/element_volumes.py b/geosx_mesh_doctor/mesh_doctor/checks/element_volumes.py
similarity index 100%
rename from geosx_mesh_doctor/checks/element_volumes.py
rename to geosx_mesh_doctor/mesh_doctor/checks/element_volumes.py
diff --git a/geosx_mesh_doctor/checks/fix_elements_orderings.py b/geosx_mesh_doctor/mesh_doctor/checks/fix_elements_orderings.py
similarity index 100%
rename from geosx_mesh_doctor/checks/fix_elements_orderings.py
rename to geosx_mesh_doctor/mesh_doctor/checks/fix_elements_orderings.py
diff --git a/geosx_mesh_doctor/checks/generate_cube.py b/geosx_mesh_doctor/mesh_doctor/checks/generate_cube.py
similarity index 100%
rename from geosx_mesh_doctor/checks/generate_cube.py
rename to geosx_mesh_doctor/mesh_doctor/checks/generate_cube.py
diff --git a/geosx_mesh_doctor/checks/generate_fractures.py b/geosx_mesh_doctor/mesh_doctor/checks/generate_fractures.py
similarity index 100%
rename from geosx_mesh_doctor/checks/generate_fractures.py
rename to geosx_mesh_doctor/mesh_doctor/checks/generate_fractures.py
diff --git a/geosx_mesh_doctor/checks/generate_global_ids.py b/geosx_mesh_doctor/mesh_doctor/checks/generate_global_ids.py
similarity index 100%
rename from geosx_mesh_doctor/checks/generate_global_ids.py
rename to geosx_mesh_doctor/mesh_doctor/checks/generate_global_ids.py
diff --git a/geosx_mesh_doctor/checks/non_conformal.py b/geosx_mesh_doctor/mesh_doctor/checks/non_conformal.py
similarity index 100%
rename from geosx_mesh_doctor/checks/non_conformal.py
rename to geosx_mesh_doctor/mesh_doctor/checks/non_conformal.py
diff --git a/geosx_mesh_doctor/checks/reorient_mesh.py b/geosx_mesh_doctor/mesh_doctor/checks/reorient_mesh.py
similarity index 100%
rename from geosx_mesh_doctor/checks/reorient_mesh.py
rename to geosx_mesh_doctor/mesh_doctor/checks/reorient_mesh.py
diff --git a/geosx_mesh_doctor/checks/self_intersecting_elements.py b/geosx_mesh_doctor/mesh_doctor/checks/self_intersecting_elements.py
similarity index 100%
rename from geosx_mesh_doctor/checks/self_intersecting_elements.py
rename to geosx_mesh_doctor/mesh_doctor/checks/self_intersecting_elements.py
diff --git a/geosx_mesh_doctor/checks/supported_elements.py b/geosx_mesh_doctor/mesh_doctor/checks/supported_elements.py
similarity index 100%
rename from geosx_mesh_doctor/checks/supported_elements.py
rename to geosx_mesh_doctor/mesh_doctor/checks/supported_elements.py
diff --git a/geosx_mesh_doctor/checks/triangle_distance.py b/geosx_mesh_doctor/mesh_doctor/checks/triangle_distance.py
similarity index 100%
rename from geosx_mesh_doctor/checks/triangle_distance.py
rename to geosx_mesh_doctor/mesh_doctor/checks/triangle_distance.py
diff --git a/geosx_mesh_doctor/checks/vtk_polyhedron.py b/geosx_mesh_doctor/mesh_doctor/checks/vtk_polyhedron.py
similarity index 100%
rename from geosx_mesh_doctor/checks/vtk_polyhedron.py
rename to geosx_mesh_doctor/mesh_doctor/checks/vtk_polyhedron.py
diff --git a/geosx_mesh_doctor/checks/vtk_utils.py b/geosx_mesh_doctor/mesh_doctor/checks/vtk_utils.py
similarity index 100%
rename from geosx_mesh_doctor/checks/vtk_utils.py
rename to geosx_mesh_doctor/mesh_doctor/checks/vtk_utils.py
diff --git a/geosx_mesh_doctor/mesh_doctor.py b/geosx_mesh_doctor/mesh_doctor/main.py
similarity index 87%
rename from geosx_mesh_doctor/mesh_doctor.py
rename to geosx_mesh_doctor/mesh_doctor/main.py
index 0e652ac..06b0f8c 100644
--- a/geosx_mesh_doctor/mesh_doctor.py
+++ b/geosx_mesh_doctor/mesh_doctor/main.py
@@ -9,10 +9,9 @@
 
 import logging
 
-from parsing import CheckHelper
-from parsing.cli_parsing import parse_and_set_verbosity
-import register
-
+from mesh_doctor.parsing import CheckHelper
+from mesh_doctor.parsing.cli_parsing import parse_and_set_verbosity
+from mesh_doctor import register as register
 
 def main():
     logging.basicConfig( format='[%(asctime)s][%(levelname)s] %(message)s' )
diff --git a/geosx_mesh_doctor/parsing/__init__.py b/geosx_mesh_doctor/mesh_doctor/parsing/__init__.py
similarity index 100%
rename from geosx_mesh_doctor/parsing/__init__.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/__init__.py
diff --git a/geosx_mesh_doctor/parsing/check_fractures_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/check_fractures_parsing.py
similarity index 100%
rename from geosx_mesh_doctor/parsing/check_fractures_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/check_fractures_parsing.py
diff --git a/geosx_mesh_doctor/parsing/cli_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/cli_parsing.py
similarity index 99%
rename from geosx_mesh_doctor/parsing/cli_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/cli_parsing.py
index a34010b..6129f53 100644
--- a/geosx_mesh_doctor/parsing/cli_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/cli_parsing.py
@@ -48,7 +48,7 @@ def init_parser() -> argparse.ArgumentParser:
         Increase verbosity (-{__VERBOSITY_FLAG}, -{__VERBOSITY_FLAG * 2}) to get full information.
         """
     formatter = lambda prog: argparse.RawTextHelpFormatter( prog, max_help_position=8 )
-    parser = argparse.ArgumentParser( description='Inspects meshes for GEOSX.',
+    parser = argparse.ArgumentParser( description='Inspects meshes for GEOS.',
                                       epilog=textwrap.dedent( epilog_msg ),
                                       formatter_class=formatter )
     # Nothing will be done with this verbosity/quiet input.
diff --git a/geosx_mesh_doctor/parsing/collocated_nodes_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/collocated_nodes_parsing.py
similarity index 96%
rename from geosx_mesh_doctor/parsing/collocated_nodes_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/collocated_nodes_parsing.py
index fd737a8..09f5ea8 100644
--- a/geosx_mesh_doctor/parsing/collocated_nodes_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/collocated_nodes_parsing.py
@@ -5,7 +5,7 @@
     List,
 )
 
-from checks.collocated_nodes import Options, Result
+from ..checks.collocated_nodes import Options, Result
 
 from . import COLLOCATES_NODES
 
diff --git a/geosx_mesh_doctor/parsing/element_volumes_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/element_volumes_parsing.py
similarity index 95%
rename from geosx_mesh_doctor/parsing/element_volumes_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/element_volumes_parsing.py
index 3c126cd..47e116a 100644
--- a/geosx_mesh_doctor/parsing/element_volumes_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/element_volumes_parsing.py
@@ -1,6 +1,6 @@
 import logging
 
-from checks.element_volumes import Options, Result
+from ..checks.element_volumes import Options, Result
 
 from . import ELEMENT_VOLUMES
 
diff --git a/geosx_mesh_doctor/parsing/fix_elements_orderings_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/fix_elements_orderings_parsing.py
similarity index 97%
rename from geosx_mesh_doctor/parsing/fix_elements_orderings_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/fix_elements_orderings_parsing.py
index 7a62006..5432b0f 100644
--- a/geosx_mesh_doctor/parsing/fix_elements_orderings_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/fix_elements_orderings_parsing.py
@@ -11,7 +11,7 @@
     VTK_WEDGE,
 )
 
-from checks.fix_elements_orderings import Options, Result
+from ..checks.fix_elements_orderings import Options, Result
 
 from . import vtk_output_parsing, FIX_ELEMENTS_ORDERINGS
 
diff --git a/geosx_mesh_doctor/parsing/generate_cube_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/generate_cube_parsing.py
similarity index 98%
rename from geosx_mesh_doctor/parsing/generate_cube_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/generate_cube_parsing.py
index 3c8a17d..e2573b6 100644
--- a/geosx_mesh_doctor/parsing/generate_cube_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/generate_cube_parsing.py
@@ -1,6 +1,6 @@
 import logging
 
-from checks.generate_cube import Options, Result, FieldInfo
+from ..checks.generate_cube import Options, Result, FieldInfo
 
 from . import vtk_output_parsing, generate_global_ids_parsing, GENERATE_CUBE
 from .generate_global_ids_parsing import GlobalIdsInfo
diff --git a/geosx_mesh_doctor/parsing/generate_fractures_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/generate_fractures_parsing.py
similarity index 97%
rename from geosx_mesh_doctor/parsing/generate_fractures_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/generate_fractures_parsing.py
index f384089..43eaf79 100644
--- a/geosx_mesh_doctor/parsing/generate_fractures_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/generate_fractures_parsing.py
@@ -1,6 +1,6 @@
 import logging
 
-from checks.generate_fractures import Options, Result, FracturePolicy
+from ..checks.generate_fractures import Options, Result, FracturePolicy
 
 from . import vtk_output_parsing, GENERATE_FRACTURES
 
diff --git a/geosx_mesh_doctor/parsing/generate_global_ids_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/generate_global_ids_parsing.py
similarity index 97%
rename from geosx_mesh_doctor/parsing/generate_global_ids_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/generate_global_ids_parsing.py
index 06efd43..bc1ffb8 100644
--- a/geosx_mesh_doctor/parsing/generate_global_ids_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/generate_global_ids_parsing.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 import logging
 
-from checks.generate_global_ids import Options, Result
+from ..checks.generate_global_ids import Options, Result
 
 from . import vtk_output_parsing, GENERATE_GLOBAL_IDS
 
diff --git a/geosx_mesh_doctor/parsing/non_conformal_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/non_conformal_parsing.py
similarity index 97%
rename from geosx_mesh_doctor/parsing/non_conformal_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/non_conformal_parsing.py
index 046c960..c8db4d1 100644
--- a/geosx_mesh_doctor/parsing/non_conformal_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/non_conformal_parsing.py
@@ -5,7 +5,7 @@
     List,
 )
 
-from checks.non_conformal import Options, Result
+from ..checks.non_conformal import Options, Result
 
 from . import NON_CONFORMAL
 
diff --git a/geosx_mesh_doctor/parsing/self_intersecting_elements_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/self_intersecting_elements_parsing.py
similarity index 95%
rename from geosx_mesh_doctor/parsing/self_intersecting_elements_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/self_intersecting_elements_parsing.py
index b5c2f54..4b93f0e 100644
--- a/geosx_mesh_doctor/parsing/self_intersecting_elements_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/self_intersecting_elements_parsing.py
@@ -2,7 +2,7 @@
 
 import numpy
 
-from checks.self_intersecting_elements import Options, Result
+from ..checks.self_intersecting_elements import Options, Result
 
 from . import SELF_INTERSECTING_ELEMENTS
 
diff --git a/geosx_mesh_doctor/parsing/supported_elements_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/supported_elements_parsing.py
similarity index 97%
rename from geosx_mesh_doctor/parsing/supported_elements_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/supported_elements_parsing.py
index b43ae04..9d699fa 100644
--- a/geosx_mesh_doctor/parsing/supported_elements_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/supported_elements_parsing.py
@@ -1,7 +1,7 @@
 import logging
 import multiprocessing
 
-from checks.supported_elements import Options, Result
+from ..checks.supported_elements import Options, Result
 
 from . import SUPPORTED_ELEMENTS
 
diff --git a/geosx_mesh_doctor/parsing/vtk_output_parsing.py b/geosx_mesh_doctor/mesh_doctor/parsing/vtk_output_parsing.py
similarity index 97%
rename from geosx_mesh_doctor/parsing/vtk_output_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/parsing/vtk_output_parsing.py
index be31037..873ea4f 100644
--- a/geosx_mesh_doctor/parsing/vtk_output_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/parsing/vtk_output_parsing.py
@@ -2,7 +2,7 @@
 import logging
 import textwrap
 
-from checks.vtk_utils import VtkOutput
+from ..checks.vtk_utils import VtkOutput
 
 __OUTPUT_FILE = "output"
 __OUTPUT_BINARY_MODE = "data-mode"
diff --git a/geosx_mesh_doctor/register.py b/geosx_mesh_doctor/mesh_doctor/register.py
similarity index 91%
rename from geosx_mesh_doctor/register.py
rename to geosx_mesh_doctor/mesh_doctor/register.py
index 1626053..f063dfe 100644
--- a/geosx_mesh_doctor/register.py
+++ b/geosx_mesh_doctor/mesh_doctor/register.py
@@ -3,20 +3,20 @@
 import logging
 from typing import Dict, Callable, Any, Tuple
 
-import parsing
-from parsing import CheckHelper, cli_parsing
+import mesh_doctor.parsing as parsing
+from .parsing import CheckHelper, cli_parsing
 
 __HELPERS: Dict[ str, Callable[ [ None ], CheckHelper ] ] = dict()
 __CHECKS: Dict[ str, Callable[ [ None ], Any ] ] = dict()
 
 
 def __load_module_check( module_name: str, check_fct="check" ):
-    module = importlib.import_module( "checks." + module_name )
+    module = importlib.import_module( "mesh_doctor.checks." + module_name )
     return getattr( module, check_fct )
 
 
 def __load_module_check_helper( module_name: str, parsing_fct_suffix="_parsing" ):
-    module = importlib.import_module( "parsing." + module_name + parsing_fct_suffix )
+    module = importlib.import_module( "mesh_doctor.parsing." + module_name + parsing_fct_suffix )
     return CheckHelper( fill_subparser=module.fill_subparser,
                         convert=module.convert,
                         display_results=module.display_results )
diff --git a/geosx_mesh_doctor/tests/test_cli_parsing.py b/geosx_mesh_doctor/mesh_doctor/tests/test_cli_parsing.py
similarity index 96%
rename from geosx_mesh_doctor/tests/test_cli_parsing.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_cli_parsing.py
index 1989e24..fe7fd56 100644
--- a/geosx_mesh_doctor/tests/test_cli_parsing.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_cli_parsing.py
@@ -8,10 +8,10 @@
 
 import pytest
 
-from checks.vtk_utils import (
+from ..checks.vtk_utils import (
     VtkOutput, )
 
-from checks.generate_fractures import (
+from ..checks.generate_fractures import (
     FracturePolicy,
     Options,
 )
diff --git a/geosx_mesh_doctor/tests/test_collocated_nodes.py b/geosx_mesh_doctor/mesh_doctor/tests/test_collocated_nodes.py
similarity index 97%
rename from geosx_mesh_doctor/tests/test_collocated_nodes.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_collocated_nodes.py
index d0b6645..a5849e3 100644
--- a/geosx_mesh_doctor/tests/test_collocated_nodes.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_collocated_nodes.py
@@ -11,7 +11,7 @@
     vtkUnstructuredGrid,
 )
 
-from checks.collocated_nodes import Options, __check
+from ..checks.collocated_nodes import Options, __check
 
 
 def get_points() -> Iterator[ Tuple[ vtkPoints, int ] ]:
diff --git a/geosx_mesh_doctor/tests/test_element_volumes.py b/geosx_mesh_doctor/mesh_doctor/tests/test_element_volumes.py
similarity index 95%
rename from geosx_mesh_doctor/tests/test_element_volumes.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_element_volumes.py
index 163300c..d2991a8 100644
--- a/geosx_mesh_doctor/tests/test_element_volumes.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_element_volumes.py
@@ -9,7 +9,7 @@
     vtkUnstructuredGrid,
 )
 
-from checks.element_volumes import Options, __check
+from ..checks.element_volumes import Options, __check
 
 
 def test_simple_tet():
diff --git a/geosx_mesh_doctor/tests/test_generate_cube.py b/geosx_mesh_doctor/mesh_doctor/tests/test_generate_cube.py
similarity index 92%
rename from geosx_mesh_doctor/tests/test_generate_cube.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_generate_cube.py
index 78713f8..e143921 100644
--- a/geosx_mesh_doctor/tests/test_generate_cube.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_generate_cube.py
@@ -1,4 +1,4 @@
-from checks.generate_cube import __build, Options, FieldInfo
+from ..checks.generate_cube import __build, Options, FieldInfo
 
 
 def test_generate_cube():
diff --git a/geosx_mesh_doctor/tests/test_generate_fractures.py b/geosx_mesh_doctor/mesh_doctor/tests/test_generate_fractures.py
similarity index 97%
rename from geosx_mesh_doctor/tests/test_generate_fractures.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_generate_fractures.py
index 077d9d7..bd3e312 100644
--- a/geosx_mesh_doctor/tests/test_generate_fractures.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_generate_fractures.py
@@ -20,12 +20,12 @@
 from vtkmodules.util.numpy_support import (
     numpy_to_vtk, )
 
-from checks.vtk_utils import (
+from ..checks.vtk_utils import (
     to_vtk_id_list, )
 
-from checks.check_fractures import format_collocated_nodes
-from checks.generate_cube import build_rectilinear_blocks_mesh, XYZ
-from checks.generate_fractures import __split_mesh_on_fracture, Options, FracturePolicy
+from ..checks.check_fractures import format_collocated_nodes
+from ..checks.generate_cube import build_rectilinear_blocks_mesh, XYZ
+from ..checks.generate_fractures import __split_mesh_on_fracture, Options, FracturePolicy
 
 
 @dataclass( frozen=True )
diff --git a/geosx_mesh_doctor/tests/test_generate_global_ids.py b/geosx_mesh_doctor/mesh_doctor/tests/test_generate_global_ids.py
similarity index 92%
rename from geosx_mesh_doctor/tests/test_generate_global_ids.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_generate_global_ids.py
index f2998d7..483b437 100644
--- a/geosx_mesh_doctor/tests/test_generate_global_ids.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_generate_global_ids.py
@@ -7,7 +7,7 @@
     vtkVertex,
 )
 
-from checks.generate_global_ids import __build_global_ids
+from ..checks.generate_global_ids import __build_global_ids
 
 
 def test_generate_global_ids():
diff --git a/geosx_mesh_doctor/tests/test_non_conformal.py b/geosx_mesh_doctor/mesh_doctor/tests/test_non_conformal.py
similarity index 96%
rename from geosx_mesh_doctor/tests/test_non_conformal.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_non_conformal.py
index 0351ae9..3be57fb 100644
--- a/geosx_mesh_doctor/tests/test_non_conformal.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_non_conformal.py
@@ -1,7 +1,7 @@
 import numpy
 
-from checks.non_conformal import Options, __check
-from checks.generate_cube import (
+from ..checks.non_conformal import Options, __check
+from ..checks.generate_cube import (
     build_rectilinear_blocks_mesh,
     XYZ,
 )
diff --git a/geosx_mesh_doctor/tests/test_reorient_mesh.py b/geosx_mesh_doctor/mesh_doctor/tests/test_reorient_mesh.py
similarity index 96%
rename from geosx_mesh_doctor/tests/test_reorient_mesh.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_reorient_mesh.py
index f0ffd29..987948d 100644
--- a/geosx_mesh_doctor/tests/test_reorient_mesh.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_reorient_mesh.py
@@ -14,9 +14,9 @@
 
 import numpy
 
-from checks.reorient_mesh import reorient_mesh
-from checks.vtk_polyhedron import FaceStream
-from checks.vtk_utils import (
+from ..checks.reorient_mesh import reorient_mesh
+from ..checks.vtk_polyhedron import FaceStream
+from ..checks.vtk_utils import (
     to_vtk_id_list,
     vtk_iter,
 )
diff --git a/geosx_mesh_doctor/tests/test_self_intersecting_elements.py b/geosx_mesh_doctor/mesh_doctor/tests/test_self_intersecting_elements.py
similarity index 95%
rename from geosx_mesh_doctor/tests/test_self_intersecting_elements.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_self_intersecting_elements.py
index 2b5455a..c194a0a 100644
--- a/geosx_mesh_doctor/tests/test_self_intersecting_elements.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_self_intersecting_elements.py
@@ -7,7 +7,7 @@
     vtkUnstructuredGrid,
 )
 
-from checks.self_intersecting_elements import Options, __check
+from ..checks.self_intersecting_elements import Options, __check
 
 
 def test_jumbled_hex():
diff --git a/geosx_mesh_doctor/tests/test_supported_elements.py b/geosx_mesh_doctor/mesh_doctor/tests/test_supported_elements.py
similarity index 94%
rename from geosx_mesh_doctor/tests/test_supported_elements.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_supported_elements.py
index 9d56932..68e2446 100644
--- a/geosx_mesh_doctor/tests/test_supported_elements.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_supported_elements.py
@@ -12,9 +12,9 @@
     vtkUnstructuredGrid,
 )
 
-from checks.supported_elements import Options, check, __check
-from checks.vtk_polyhedron import parse_face_stream, build_face_to_face_connectivity_through_edges, FaceStream
-from checks.vtk_utils import (
+from ..checks.supported_elements import Options, check, __check
+from ..checks.vtk_polyhedron import parse_face_stream, build_face_to_face_connectivity_through_edges, FaceStream
+from ..checks.vtk_utils import (
     to_vtk_id_list, )
 
 
diff --git a/geosx_mesh_doctor/tests/test_triangle_distance.py b/geosx_mesh_doctor/mesh_doctor/tests/test_triangle_distance.py
similarity index 98%
rename from geosx_mesh_doctor/tests/test_triangle_distance.py
rename to geosx_mesh_doctor/mesh_doctor/tests/test_triangle_distance.py
index f44b5e8..8e32245 100644
--- a/geosx_mesh_doctor/tests/test_triangle_distance.py
+++ b/geosx_mesh_doctor/mesh_doctor/tests/test_triangle_distance.py
@@ -4,7 +4,7 @@
 from numpy.linalg import norm
 import pytest
 
-from checks.triangle_distance import distance_between_two_segments, distance_between_two_triangles
+from ..checks.triangle_distance import distance_between_two_segments, distance_between_two_triangles
 
 
 @dataclass( frozen=True )
diff --git a/geosx_mesh_doctor/requirements.txt b/geosx_mesh_doctor/requirements.txt
deleted file mode 100644
index 4c9b176..0000000
--- a/geosx_mesh_doctor/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-vtk >= 9.1
-networkx >= 2.4
-tqdm
-numpy
\ No newline at end of file
diff --git a/geosx_mesh_doctor/setup.cfg b/geosx_mesh_doctor/setup.cfg
new file mode 100644
index 0000000..c6f04c2
--- /dev/null
+++ b/geosx_mesh_doctor/setup.cfg
@@ -0,0 +1,24 @@
+[metadata]
+name = mesh_doctor
+version = 0.1.0
+description = Mesh doctor
+author = Gazzolab
+author_email = thomas.gazzola@totalenergies.com
+license = LGPL-2.1
+
+[options]
+packages =
+    mesh_doctor
+    mesh_doctor.checks
+    mesh_doctor.parsing
+    mesh_doctor.tests
+install_requires =
+    vtk >= 9.1
+    networkx >= 2.4
+    tqdm
+    numpy
+python_requires = >=3.7
+
+[options.entry_points]
+console_scripts =
+    mesh_doctor = mesh_doctor.main:main
diff --git a/geosx_mesh_doctor/setup.py b/geosx_mesh_doctor/setup.py
deleted file mode 100644
index dc03ac1..0000000
--- a/geosx_mesh_doctor/setup.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from setuptools import setup, find_packages
-
-setup( name='mesh_doctor', version='0.0.1', packages=find_packages() )