diff --git a/src/hierarchical.jl b/src/elements_hierarchical.jl
similarity index 100%
rename from src/hierarchical.jl
rename to src/elements_hierarchical.jl
diff --git a/src/lagrange.jl b/src/elements_lagrange.jl
similarity index 100%
rename from src/lagrange.jl
rename to src/elements_lagrange.jl
diff --git a/src/lagrange_macro.jl b/src/elements_lagrange_macro.jl
similarity index 100%
rename from src/lagrange_macro.jl
rename to src/elements_lagrange_macro.jl
diff --git a/src/nurbs.jl b/src/elements_nurbs.jl
similarity index 100%
rename from src/nurbs.jl
rename to src/elements_nurbs.jl
diff --git a/src/contact.jl b/src/problems_contact.jl
similarity index 100%
rename from src/contact.jl
rename to src/problems_contact.jl
diff --git a/src/contact_2d_autodiff.jl b/src/problems_contact_2d_autodiff.jl
similarity index 100%
rename from src/contact_2d_autodiff.jl
rename to src/problems_contact_2d_autodiff.jl
diff --git a/src/elasticity.jl b/src/problems_elasticity.jl
similarity index 100%
rename from src/elasticity.jl
rename to src/problems_elasticity.jl
diff --git a/src/elasticplastic.jl b/src/problems_elasticplastic.jl
similarity index 100%
rename from src/elasticplastic.jl
rename to src/problems_elasticplastic.jl
diff --git a/src/heat.jl b/src/problems_heat.jl
similarity index 100%
rename from src/heat.jl
rename to src/problems_heat.jl
diff --git a/src/mortar.jl b/src/problems_mortar.jl
similarity index 100%
rename from src/mortar.jl
rename to src/problems_mortar.jl
diff --git a/src/mortar_2d.jl b/src/problems_mortar_2d.jl
similarity index 100%
rename from src/mortar_2d.jl
rename to src/problems_mortar_2d.jl
diff --git a/src/mortar_2d_autodiff.jl b/src/problems_mortar_2d_autodiff.jl
similarity index 100%
rename from src/mortar_2d_autodiff.jl
rename to src/problems_mortar_2d_autodiff.jl
diff --git a/src/mortar_3d.jl b/src/problems_mortar_3d.jl
similarity index 100%
rename from src/mortar_3d.jl
rename to src/problems_mortar_3d.jl
diff --git a/src/mortar_3d_autodiff.jl b/src/problems_mortar_3d_autodiff.jl
similarity index 100%
rename from src/mortar_3d_autodiff.jl
rename to src/problems_mortar_3d_autodiff.jl
diff --git a/src/mortar_forwarddiff_pe.jl b/src/problems_mortar_forwarddiff_pe.jl
similarity index 100%
rename from src/mortar_forwarddiff_pe.jl
rename to src/problems_mortar_forwarddiff_pe.jl
diff --git a/src/modal.jl b/src/solvers_modal.jl
similarity index 100%
rename from src/modal.jl
rename to src/solvers_modal.jl