diff --git a/src/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90
similarity index 100%
rename from src/DAMASK_grid.f90
rename to src/grid/DAMASK_grid.f90
diff --git a/src/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90
similarity index 100%
rename from src/grid_damage_spectral.f90
rename to src/grid/grid_damage_spectral.f90
diff --git a/src/grid_mech_FEM.f90 b/src/grid/grid_mech_FEM.f90
similarity index 100%
rename from src/grid_mech_FEM.f90
rename to src/grid/grid_mech_FEM.f90
diff --git a/src/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90
similarity index 100%
rename from src/grid_mech_spectral_basic.f90
rename to src/grid/grid_mech_spectral_basic.f90
diff --git a/src/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90
similarity index 100%
rename from src/grid_mech_spectral_polarisation.f90
rename to src/grid/grid_mech_spectral_polarisation.f90
diff --git a/src/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90
similarity index 100%
rename from src/grid_thermal_spectral.f90
rename to src/grid/grid_thermal_spectral.f90
diff --git a/src/spectral_utilities.f90 b/src/grid/spectral_utilities.f90
similarity index 100%
rename from src/spectral_utilities.f90
rename to src/grid/spectral_utilities.f90
diff --git a/src/DAMASK_FEM.f90 b/src/mesh/DAMASK_FEM.f90
similarity index 100%
rename from src/DAMASK_FEM.f90
rename to src/mesh/DAMASK_FEM.f90
diff --git a/src/FEM_mech.f90 b/src/mesh/FEM_mech.f90
similarity index 100%
rename from src/FEM_mech.f90
rename to src/mesh/FEM_mech.f90
diff --git a/src/FEM_utilities.f90 b/src/mesh/FEM_utilities.f90
similarity index 100%
rename from src/FEM_utilities.f90
rename to src/mesh/FEM_utilities.f90
diff --git a/src/FEM_zoo.f90 b/src/mesh/FEM_zoo.f90
similarity index 100%
rename from src/FEM_zoo.f90
rename to src/mesh/FEM_zoo.f90
diff --git a/src/mesh_FEM.f90 b/src/mesh/mesh_FEM.f90
similarity index 100%
rename from src/mesh_FEM.f90
rename to src/mesh/mesh_FEM.f90