diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/communication.f90 b/src/LIB/tensorproductmultigrid_Source/communication.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/communication.f90
rename to src/LIB/tensorproductmultigrid_Source/communication.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/compile_tensor b/src/LIB/tensorproductmultigrid_Source/compile_tensor
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/compile_tensor
rename to src/LIB/tensorproductmultigrid_Source/compile_tensor
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/conjugategradient.f90 b/src/LIB/tensorproductmultigrid_Source/conjugategradient.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/conjugategradient.f90
rename to src/LIB/tensorproductmultigrid_Source/conjugategradient.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/datatypes.f90 b/src/LIB/tensorproductmultigrid_Source/datatypes.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/datatypes.f90
rename to src/LIB/tensorproductmultigrid_Source/datatypes.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/dblas.f90 b/src/LIB/tensorproductmultigrid_Source/dblas.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/dblas.f90
rename to src/LIB/tensorproductmultigrid_Source/dblas.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/discretisation.f90 b/src/LIB/tensorproductmultigrid_Source/discretisation.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/discretisation.f90
rename to src/LIB/tensorproductmultigrid_Source/discretisation.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/messages.f90 b/src/LIB/tensorproductmultigrid_Source/messages.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/messages.f90
rename to src/LIB/tensorproductmultigrid_Source/messages.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/mg_main.f90 b/src/LIB/tensorproductmultigrid_Source/mg_main.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/mg_main.f90
rename to src/LIB/tensorproductmultigrid_Source/mg_main.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/mg_main_mnh.f90 b/src/LIB/tensorproductmultigrid_Source/mg_main_mnh.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/mg_main_mnh.f90
rename to src/LIB/tensorproductmultigrid_Source/mg_main_mnh.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/modd_mpif.f90 b/src/LIB/tensorproductmultigrid_Source/modd_mpif.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/modd_mpif.f90
rename to src/LIB/tensorproductmultigrid_Source/modd_mpif.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/mode_mg.f90 b/src/LIB/tensorproductmultigrid_Source/mode_mg.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/mode_mg.f90
rename to src/LIB/tensorproductmultigrid_Source/mode_mg.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/mode_mg_read_param.f90 b/src/LIB/tensorproductmultigrid_Source/mode_mg_read_param.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/mode_mg_read_param.f90
rename to src/LIB/tensorproductmultigrid_Source/mode_mg_read_param.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/mode_mnh_allocate_mg_halo.f90 b/src/LIB/tensorproductmultigrid_Source/mode_mnh_allocate_mg_halo.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/mode_mnh_allocate_mg_halo.f90
rename to src/LIB/tensorproductmultigrid_Source/mode_mnh_allocate_mg_halo.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/mode_openacc_set_device.f90 b/src/LIB/tensorproductmultigrid_Source/mode_openacc_set_device.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/mode_openacc_set_device.f90
rename to src/LIB/tensorproductmultigrid_Source/mode_openacc_set_device.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/multigrid.f90 b/src/LIB/tensorproductmultigrid_Source/multigrid.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/multigrid.f90
rename to src/LIB/tensorproductmultigrid_Source/multigrid.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/parameters.f90 b/src/LIB/tensorproductmultigrid_Source/parameters.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/parameters.f90
rename to src/LIB/tensorproductmultigrid_Source/parameters.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/profiles.f90 b/src/LIB/tensorproductmultigrid_Source/profiles.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/profiles.f90
rename to src/LIB/tensorproductmultigrid_Source/profiles.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/solver.f90 b/src/LIB/tensorproductmultigrid_Source/solver.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/solver.f90
rename to src/LIB/tensorproductmultigrid_Source/solver.f90
diff --git a/src/ZSOLVER/tensorproductmultigrid_Source/timer.f90 b/src/LIB/tensorproductmultigrid_Source/timer.f90
similarity index 100%
rename from src/ZSOLVER/tensorproductmultigrid_Source/timer.f90
rename to src/LIB/tensorproductmultigrid_Source/timer.f90