diff --git a/anel_balancen.f90 b/src/ZSOLVER/anel_balancen.f90
similarity index 100%
rename from anel_balancen.f90
rename to src/ZSOLVER/anel_balancen.f90
diff --git a/flat_inv.f90 b/src/ZSOLVER/flat_inv.f90
similarity index 100%
rename from flat_inv.f90
rename to src/ZSOLVER/flat_inv.f90
diff --git a/ini_dynamics.f90 b/src/ZSOLVER/ini_dynamics.f90
similarity index 100%
rename from ini_dynamics.f90
rename to src/ZSOLVER/ini_dynamics.f90
diff --git a/ini_modeln.f90 b/src/ZSOLVER/ini_modeln.f90
similarity index 100%
rename from ini_modeln.f90
rename to src/ZSOLVER/ini_modeln.f90
diff --git a/ini_spectren.f90 b/src/ZSOLVER/ini_spectren.f90
similarity index 100%
rename from ini_spectren.f90
rename to src/ZSOLVER/ini_spectren.f90
diff --git a/modd_dynn.f90 b/src/ZSOLVER/modd_dynn.f90
similarity index 100%
rename from modd_dynn.f90
rename to src/ZSOLVER/modd_dynn.f90
diff --git a/modeln.f90 b/src/ZSOLVER/modeln.f90
similarity index 100%
rename from modeln.f90
rename to src/ZSOLVER/modeln.f90
diff --git a/pressurez.f90 b/src/ZSOLVER/pressurez.f90
similarity index 100%
rename from pressurez.f90
rename to src/ZSOLVER/pressurez.f90
diff --git a/read_exsegn.f90 b/src/ZSOLVER/read_exsegn.f90
similarity index 100%
rename from read_exsegn.f90
rename to src/ZSOLVER/read_exsegn.f90
diff --git a/spectre.f90 b/src/ZSOLVER/spectre.f90
similarity index 100%
rename from spectre.f90
rename to src/ZSOLVER/spectre.f90
diff --git a/tensorproductmultigrid_Source/communication.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/communication.f90
similarity index 100%
rename from tensorproductmultigrid_Source/communication.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/communication.f90
diff --git a/tensorproductmultigrid_Source/compile_tensor b/src/ZSOLVER/tensorproductmultigrid_Source/compile_tensor
similarity index 100%
rename from tensorproductmultigrid_Source/compile_tensor
rename to src/ZSOLVER/tensorproductmultigrid_Source/compile_tensor
diff --git a/tensorproductmultigrid_Source/conjugategradient.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/conjugategradient.f90
similarity index 100%
rename from tensorproductmultigrid_Source/conjugategradient.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/conjugategradient.f90
diff --git a/tensorproductmultigrid_Source/datatypes.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/datatypes.f90
similarity index 100%
rename from tensorproductmultigrid_Source/datatypes.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/datatypes.f90
diff --git a/tensorproductmultigrid_Source/dblas.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/dblas.f90
similarity index 100%
rename from tensorproductmultigrid_Source/dblas.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/dblas.f90
diff --git a/tensorproductmultigrid_Source/discretisation.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/discretisation.f90
similarity index 100%
rename from tensorproductmultigrid_Source/discretisation.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/discretisation.f90
diff --git a/tensorproductmultigrid_Source/messages.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/messages.f90
similarity index 100%
rename from tensorproductmultigrid_Source/messages.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/messages.f90
diff --git a/tensorproductmultigrid_Source/mg_main.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/mg_main.f90
similarity index 100%
rename from tensorproductmultigrid_Source/mg_main.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/mg_main.f90
diff --git a/tensorproductmultigrid_Source/mg_main_mnh.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/mg_main_mnh.f90
similarity index 100%
rename from tensorproductmultigrid_Source/mg_main_mnh.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/mg_main_mnh.f90
diff --git a/tensorproductmultigrid_Source/mode_mg.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/mode_mg.f90
similarity index 100%
rename from tensorproductmultigrid_Source/mode_mg.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/mode_mg.f90
diff --git a/tensorproductmultigrid_Source/mode_mg_read_param.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/mode_mg_read_param.f90
similarity index 100%
rename from tensorproductmultigrid_Source/mode_mg_read_param.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/mode_mg_read_param.f90
diff --git a/tensorproductmultigrid_Source/multigrid.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/multigrid.f90
similarity index 100%
rename from tensorproductmultigrid_Source/multigrid.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/multigrid.f90
diff --git a/tensorproductmultigrid_Source/parameters.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/parameters.f90
similarity index 100%
rename from tensorproductmultigrid_Source/parameters.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/parameters.f90
diff --git a/tensorproductmultigrid_Source/profiles.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/profiles.f90
similarity index 100%
rename from tensorproductmultigrid_Source/profiles.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/profiles.f90
diff --git a/tensorproductmultigrid_Source/solver.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/solver.f90
similarity index 100%
rename from tensorproductmultigrid_Source/solver.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/solver.f90
diff --git a/tensorproductmultigrid_Source/timer.f90 b/src/ZSOLVER/tensorproductmultigrid_Source/timer.f90
similarity index 100%
rename from tensorproductmultigrid_Source/timer.f90
rename to src/ZSOLVER/tensorproductmultigrid_Source/timer.f90
diff --git a/tridz.f90 b/src/ZSOLVER/tridz.f90
similarity index 100%
rename from tridz.f90
rename to src/ZSOLVER/tridz.f90
diff --git a/zconjgrad.f90 b/src/ZSOLVER/zconjgrad.f90
similarity index 100%
rename from zconjgrad.f90
rename to src/ZSOLVER/zconjgrad.f90
diff --git a/zsolver.f90 b/src/ZSOLVER/zsolver.f90
similarity index 100%
rename from zsolver.f90
rename to src/ZSOLVER/zsolver.f90
diff --git a/zsolver_inv.f90 b/src/ZSOLVER/zsolver_inv.f90
similarity index 100%
rename from zsolver_inv.f90
rename to src/ZSOLVER/zsolver_inv.f90