diff --git a/.github/workflows/acoustics.yml b/.github/workflows/acoustics.yml
index 4ed2cbbb..e6969477 100644
--- a/.github/workflows/acoustics.yml
+++ b/.github/workflows/acoustics.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - acoustics/**
+ - modules/acoustics/**
pull_request:
branches: [ main ]
paths:
- - acoustics/**
+ - modules/acoustics/**
workflow_dispatch:
env:
- MODULE_DIR: 'acoustics'
+ MODULE_DIR: 'modules/acoustics'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/aerodynamics.yml b/.github/workflows/aerodynamics.yml
index 36e6936f..3966f6b4 100644
--- a/.github/workflows/aerodynamics.yml
+++ b/.github/workflows/aerodynamics.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - aerodynamics/**
+ - modules/aerodynamics/**
pull_request:
branches: [ main ]
paths:
- - aerodynamics/**
+ - modules/aerodynamics/**
workflow_dispatch:
env:
- MODULE_DIR: 'aerodynamics'
+ MODULE_DIR: 'modules/aerodynamics'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/bilaplacian.yml b/.github/workflows/bilaplacian.yml
index 5228bdef..75f3a9ff 100644
--- a/.github/workflows/bilaplacian.yml
+++ b/.github/workflows/bilaplacian.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - bilaplacian/**
+ - modules/bilaplacian/**
pull_request:
branches: [ main ]
paths:
- - bilaplacian/**
+ - modules/bilaplacian/**
workflow_dispatch:
env:
- MODULE_DIR: 'bilaplacian'
+ MODULE_DIR: 'modules/bilaplacian'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/elasticity.yml b/.github/workflows/elasticity.yml
index 8ee2959a..782ea1c4 100644
--- a/.github/workflows/elasticity.yml
+++ b/.github/workflows/elasticity.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - elasticity/**
+ - modules/elasticity/**
pull_request:
branches: [ main ]
paths:
- - elasticity/**
+ - modules/elasticity/**
workflow_dispatch:
env:
- MODULE_DIR: 'elasticity'
+ MODULE_DIR: 'modules/elasticity'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/elastodynamics.yml b/.github/workflows/elastodynamics.yml
index c420ca5a..256e0e32 100644
--- a/.github/workflows/elastodynamics.yml
+++ b/.github/workflows/elastodynamics.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - elastodynamics/**
+ - modules/elastodynamics/**
pull_request:
branches: [ main ]
paths:
- - elastodynamics/**
+ - modules/elastodynamics/**
workflow_dispatch:
env:
- MODULE_DIR: 'elastodynamics'
+ MODULE_DIR: 'modules/elastodynamics'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/electrostatics.yml b/.github/workflows/electrostatics.yml
index b5c43ebf..67acfdc9 100644
--- a/.github/workflows/electrostatics.yml
+++ b/.github/workflows/electrostatics.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - electrostatics/**
+ - modules/electrostatics/**
pull_request:
branches: [ main ]
paths:
- - electrostatics/**
+ - modules/electrostatics/**
workflow_dispatch:
env:
- MODULE_DIR: 'electrostatics'
+ MODULE_DIR: 'modules/electrostatics'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/fourier.yml b/.github/workflows/fourier.yml
index b67086ac..3db03f8b 100644
--- a/.github/workflows/fourier.yml
+++ b/.github/workflows/fourier.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - fourier/**
+ - modules/fourier/**
pull_request:
branches: [ main ]
paths:
- - fourier/**
+ - modules/fourier/**
workflow_dispatch:
env:
- MODULE_DIR: 'fourier'
+ MODULE_DIR: 'modules/fourier'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/heat.yml b/.github/workflows/heat.yml
index d32eaadd..6bfaf43a 100644
--- a/.github/workflows/heat.yml
+++ b/.github/workflows/heat.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - heat/**
+ - modules/heat/**
pull_request:
branches: [ main ]
paths:
- - heat/**
+ - modules/heat/**
workflow_dispatch:
env:
- MODULE_DIR: 'heat'
+ MODULE_DIR: 'modules/heat'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/laplace.yml b/.github/workflows/laplace.yml
index cd1c8ccc..5e02601d 100644
--- a/.github/workflows/laplace.yml
+++ b/.github/workflows/laplace.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - laplace/**
+ - modules/laplace/**
pull_request:
branches: [ main ]
paths:
- - laplace/**
+ - modules/laplace/**
workflow_dispatch:
env:
- MODULE_DIR: 'laplace'
+ MODULE_DIR: 'modules/laplace'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/passmo.yml b/.github/workflows/passmo.yml
index 24d0fef0..da74c552 100644
--- a/.github/workflows/passmo.yml
+++ b/.github/workflows/passmo.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - passmo/**
+ - modules/passmo/**
pull_request:
branches: [ main ]
paths:
- - passmo/**
+ - modules/passmo/**
workflow_dispatch:
env:
- MODULE_DIR: 'passmo'
+ MODULE_DIR: 'modules/passmo'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/poisson.yml b/.github/workflows/poisson.yml
index 21237724..b3755c27 100644
--- a/.github/workflows/poisson.yml
+++ b/.github/workflows/poisson.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - poisson/**
+ - modules/poisson/**
pull_request:
branches: [ main ]
paths:
- - poisson/**
+ - modules/poisson/**
workflow_dispatch:
env:
- MODULE_DIR: 'poisson'
+ MODULE_DIR: 'modules/poisson'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/soildynamics.yml b/.github/workflows/soildynamics.yml
index b9b7d9a3..9e451ad6 100644
--- a/.github/workflows/soildynamics.yml
+++ b/.github/workflows/soildynamics.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - soildynamics/**
+ - modules/soildynamics/**
pull_request:
branches: [ main ]
paths:
- - soildynamics/**
+ - modules/soildynamics/**
workflow_dispatch:
env:
- MODULE_DIR: 'soildynamics'
+ MODULE_DIR: 'modules/soildynamics'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/.github/workflows/testlab.yml b/.github/workflows/testlab.yml
index eaebd2ee..e4525cb6 100644
--- a/.github/workflows/testlab.yml
+++ b/.github/workflows/testlab.yml
@@ -4,15 +4,15 @@ on:
push:
branches: [ main ]
paths:
- - testlab/**
+ - modules/testlab/**
pull_request:
branches: [ main ]
paths:
- - testlab/**
+ - modules/testlab/**
workflow_dispatch:
env:
- MODULE_DIR: 'testlab'
+ MODULE_DIR: 'modules/testlab'
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 997763a7..8b2b367d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,16 +19,16 @@ set(MSH_DIR ${CMAKE_SOURCE_DIR}/meshes/msh)
set(BUILD_SHARED_LIBS TRUE)
add_subdirectory(femutils)
-add_subdirectory(acoustics)
-add_subdirectory(aerodynamics)
-add_subdirectory(testlab)
-add_subdirectory(laplace)
-add_subdirectory(poisson)
-add_subdirectory(fourier)
-add_subdirectory(electrostatics)
-add_subdirectory(bilaplacian)
-add_subdirectory(elasticity)
-add_subdirectory(elastodynamics)
-add_subdirectory(soildynamics)
-add_subdirectory(heat)
-add_subdirectory(passmo)
+add_subdirectory(modules/acoustics)
+add_subdirectory(modules/aerodynamics)
+add_subdirectory(modules/testlab)
+add_subdirectory(modules/laplace)
+add_subdirectory(modules/poisson)
+add_subdirectory(modules/fourier)
+add_subdirectory(modules/electrostatics)
+add_subdirectory(modules/bilaplacian)
+add_subdirectory(modules/elasticity)
+add_subdirectory(modules/elastodynamics)
+add_subdirectory(modules/soildynamics)
+add_subdirectory(modules/heat)
+add_subdirectory(modules/passmo)
diff --git a/acoustics/Acoustics.config b/modules/acoustics/Acoustics.config
similarity index 100%
rename from acoustics/Acoustics.config
rename to modules/acoustics/Acoustics.config
diff --git a/acoustics/CMakeLists.txt b/modules/acoustics/CMakeLists.txt
similarity index 100%
rename from acoustics/CMakeLists.txt
rename to modules/acoustics/CMakeLists.txt
diff --git a/acoustics/Fem.axl b/modules/acoustics/Fem.axl
similarity index 100%
rename from acoustics/Fem.axl
rename to modules/acoustics/Fem.axl
diff --git a/acoustics/FemModule.cc b/modules/acoustics/FemModule.cc
similarity index 100%
rename from acoustics/FemModule.cc
rename to modules/acoustics/FemModule.cc
diff --git a/acoustics/FemModule.h b/modules/acoustics/FemModule.h
similarity index 100%
rename from acoustics/FemModule.h
rename to modules/acoustics/FemModule.h
diff --git a/acoustics/Readme.md b/modules/acoustics/Readme.md
similarity index 100%
rename from acoustics/Readme.md
rename to modules/acoustics/Readme.md
diff --git a/acoustics/check/sub_2D.txt b/modules/acoustics/check/sub_2D.txt
similarity index 100%
rename from acoustics/check/sub_2D.txt
rename to modules/acoustics/check/sub_2D.txt
diff --git a/acoustics/inputs/sub.arc b/modules/acoustics/inputs/sub.arc
similarity index 100%
rename from acoustics/inputs/sub.arc
rename to modules/acoustics/inputs/sub.arc
diff --git a/acoustics/inputs/sub.hypre.arc b/modules/acoustics/inputs/sub.hypre.arc
similarity index 100%
rename from acoustics/inputs/sub.hypre.arc
rename to modules/acoustics/inputs/sub.hypre.arc
diff --git a/acoustics/main.cc b/modules/acoustics/main.cc
similarity index 100%
rename from acoustics/main.cc
rename to modules/acoustics/main.cc
diff --git a/aerodynamics/CMakeLists.txt b/modules/aerodynamics/CMakeLists.txt
similarity index 100%
rename from aerodynamics/CMakeLists.txt
rename to modules/aerodynamics/CMakeLists.txt
diff --git a/aerodynamics/Fem.axl b/modules/aerodynamics/Fem.axl
similarity index 100%
rename from aerodynamics/Fem.axl
rename to modules/aerodynamics/Fem.axl
diff --git a/aerodynamics/FemModule.cc b/modules/aerodynamics/FemModule.cc
similarity index 100%
rename from aerodynamics/FemModule.cc
rename to modules/aerodynamics/FemModule.cc
diff --git a/aerodynamics/Readme.md b/modules/aerodynamics/Readme.md
similarity index 100%
rename from aerodynamics/Readme.md
rename to modules/aerodynamics/Readme.md
diff --git a/aerodynamics/aerodynamics.config b/modules/aerodynamics/aerodynamics.config
similarity index 100%
rename from aerodynamics/aerodynamics.config
rename to modules/aerodynamics/aerodynamics.config
diff --git a/aerodynamics/inputs/Joukowski.arc b/modules/aerodynamics/inputs/Joukowski.arc
similarity index 100%
rename from aerodynamics/inputs/Joukowski.arc
rename to modules/aerodynamics/inputs/Joukowski.arc
diff --git a/aerodynamics/main.cc b/modules/aerodynamics/main.cc
similarity index 100%
rename from aerodynamics/main.cc
rename to modules/aerodynamics/main.cc
diff --git a/bilaplacian/Bilaplacian.config b/modules/bilaplacian/Bilaplacian.config
similarity index 100%
rename from bilaplacian/Bilaplacian.config
rename to modules/bilaplacian/Bilaplacian.config
diff --git a/bilaplacian/CMakeLists.txt b/modules/bilaplacian/CMakeLists.txt
similarity index 100%
rename from bilaplacian/CMakeLists.txt
rename to modules/bilaplacian/CMakeLists.txt
diff --git a/bilaplacian/Fem.axl b/modules/bilaplacian/Fem.axl
similarity index 100%
rename from bilaplacian/Fem.axl
rename to modules/bilaplacian/Fem.axl
diff --git a/bilaplacian/FemModule.cc b/modules/bilaplacian/FemModule.cc
similarity index 100%
rename from bilaplacian/FemModule.cc
rename to modules/bilaplacian/FemModule.cc
diff --git a/bilaplacian/Readme.md b/modules/bilaplacian/Readme.md
similarity index 100%
rename from bilaplacian/Readme.md
rename to modules/bilaplacian/Readme.md
diff --git a/bilaplacian/inputs/direct.arc b/modules/bilaplacian/inputs/direct.arc
similarity index 100%
rename from bilaplacian/inputs/direct.arc
rename to modules/bilaplacian/inputs/direct.arc
diff --git a/bilaplacian/inputs/internal_pcg.arc b/modules/bilaplacian/inputs/internal_pcg.arc
similarity index 100%
rename from bilaplacian/inputs/internal_pcg.arc
rename to modules/bilaplacian/inputs/internal_pcg.arc
diff --git a/bilaplacian/main.cc b/modules/bilaplacian/main.cc
similarity index 100%
rename from bilaplacian/main.cc
rename to modules/bilaplacian/main.cc
diff --git a/elasticity/CMakeLists.txt b/modules/elasticity/CMakeLists.txt
similarity index 100%
rename from elasticity/CMakeLists.txt
rename to modules/elasticity/CMakeLists.txt
diff --git a/elasticity/Elasticity.config b/modules/elasticity/Elasticity.config
similarity index 100%
rename from elasticity/Elasticity.config
rename to modules/elasticity/Elasticity.config
diff --git a/elasticity/Fem.axl b/modules/elasticity/Fem.axl
similarity index 100%
rename from elasticity/Fem.axl
rename to modules/elasticity/Fem.axl
diff --git a/elasticity/FemModule.cc b/modules/elasticity/FemModule.cc
similarity index 100%
rename from elasticity/FemModule.cc
rename to modules/elasticity/FemModule.cc
diff --git a/elasticity/FemModule.h b/modules/elasticity/FemModule.h
similarity index 100%
rename from elasticity/FemModule.h
rename to modules/elasticity/FemModule.h
diff --git a/elasticity/Readme.md b/modules/elasticity/Readme.md
similarity index 100%
rename from elasticity/Readme.md
rename to modules/elasticity/Readme.md
diff --git a/elasticity/check/elasticity_point-dirichlet_bar_test_ref.txt b/modules/elasticity/check/elasticity_point-dirichlet_bar_test_ref.txt
similarity index 100%
rename from elasticity/check/elasticity_point-dirichlet_bar_test_ref.txt
rename to modules/elasticity/check/elasticity_point-dirichlet_bar_test_ref.txt
diff --git a/elasticity/check/elasticity_traction_bar_test_ref.txt b/modules/elasticity/check/elasticity_traction_bar_test_ref.txt
similarity index 100%
rename from elasticity/check/elasticity_traction_bar_test_ref.txt
rename to modules/elasticity/check/elasticity_traction_bar_test_ref.txt
diff --git a/elasticity/check/elasticity_traction_bodyforce_bar_test_ref.txt b/modules/elasticity/check/elasticity_traction_bodyforce_bar_test_ref.txt
similarity index 100%
rename from elasticity/check/elasticity_traction_bodyforce_bar_test_ref.txt
rename to modules/elasticity/check/elasticity_traction_bodyforce_bar_test_ref.txt
diff --git a/elasticity/check/test_elasticity_results.txt b/modules/elasticity/check/test_elasticity_results.txt
similarity index 100%
rename from elasticity/check/test_elasticity_results.txt
rename to modules/elasticity/check/test_elasticity_results.txt
diff --git a/elasticity/inputs/bar.2D.DirichletViaRowColumnElimination.arc b/modules/elasticity/inputs/bar.2D.DirichletViaRowColumnElimination.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.DirichletViaRowColumnElimination.arc
rename to modules/elasticity/inputs/bar.2D.DirichletViaRowColumnElimination.arc
diff --git a/elasticity/inputs/bar.2D.DirichletViaRowElimination.arc b/modules/elasticity/inputs/bar.2D.DirichletViaRowElimination.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.DirichletViaRowElimination.arc
rename to modules/elasticity/inputs/bar.2D.DirichletViaRowElimination.arc
diff --git a/elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowColumnElimination.arc b/modules/elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowColumnElimination.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowColumnElimination.arc
rename to modules/elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowColumnElimination.arc
diff --git a/elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowElimination.arc b/modules/elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowElimination.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowElimination.arc
rename to modules/elasticity/inputs/bar.2D.PointDirichlet.DirichletViaRowElimination.arc
diff --git a/elasticity/inputs/bar.2D.PointDirichlet.arc b/modules/elasticity/inputs/bar.2D.PointDirichlet.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.PointDirichlet.arc
rename to modules/elasticity/inputs/bar.2D.PointDirichlet.arc
diff --git a/elasticity/inputs/bar.2D.PointDirichlet.bsr.arc b/modules/elasticity/inputs/bar.2D.PointDirichlet.bsr.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.PointDirichlet.bsr.arc
rename to modules/elasticity/inputs/bar.2D.PointDirichlet.bsr.arc
diff --git a/elasticity/inputs/bar.2D.arc b/modules/elasticity/inputs/bar.2D.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.arc
rename to modules/elasticity/inputs/bar.2D.arc
diff --git a/elasticity/inputs/bar.2D.traction.arc b/modules/elasticity/inputs/bar.2D.traction.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.arc
rename to modules/elasticity/inputs/bar.2D.traction.arc
diff --git a/elasticity/inputs/bar.2D.traction.bodyforce.arc b/modules/elasticity/inputs/bar.2D.traction.bodyforce.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.bodyforce.arc
rename to modules/elasticity/inputs/bar.2D.traction.bodyforce.arc
diff --git a/elasticity/inputs/bar.2D.traction.bodyforce.bsr.arc b/modules/elasticity/inputs/bar.2D.traction.bodyforce.bsr.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.bodyforce.bsr.arc
rename to modules/elasticity/inputs/bar.2D.traction.bodyforce.bsr.arc
diff --git a/elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.arc b/modules/elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.arc
rename to modules/elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.arc
diff --git a/elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.hypre.arc b/modules/elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.hypre.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.hypre.arc
rename to modules/elasticity/inputs/bar.2D.traction.bodyforce.bsr.atomic-free.hypre.arc
diff --git a/elasticity/inputs/bar.2D.traction.bsr.arc b/modules/elasticity/inputs/bar.2D.traction.bsr.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.bsr.arc
rename to modules/elasticity/inputs/bar.2D.traction.bsr.arc
diff --git a/elasticity/inputs/bar.2D.traction.bsr.hypre.arc b/modules/elasticity/inputs/bar.2D.traction.bsr.hypre.arc
similarity index 100%
rename from elasticity/inputs/bar.2D.traction.bsr.hypre.arc
rename to modules/elasticity/inputs/bar.2D.traction.bsr.hypre.arc
diff --git a/elasticity/main.cc b/modules/elasticity/main.cc
similarity index 100%
rename from elasticity/main.cc
rename to modules/elasticity/main.cc
diff --git a/elastodynamics/CMakeLists.txt b/modules/elastodynamics/CMakeLists.txt
similarity index 100%
rename from elastodynamics/CMakeLists.txt
rename to modules/elastodynamics/CMakeLists.txt
diff --git a/elastodynamics/Elastodynamics.config b/modules/elastodynamics/Elastodynamics.config
similarity index 100%
rename from elastodynamics/Elastodynamics.config
rename to modules/elastodynamics/Elastodynamics.config
diff --git a/elastodynamics/Fem.axl b/modules/elastodynamics/Fem.axl
similarity index 100%
rename from elastodynamics/Fem.axl
rename to modules/elastodynamics/Fem.axl
diff --git a/elastodynamics/FemModule.cc b/modules/elastodynamics/FemModule.cc
similarity index 100%
rename from elastodynamics/FemModule.cc
rename to modules/elastodynamics/FemModule.cc
diff --git a/elastodynamics/Readme.md b/modules/elastodynamics/Readme.md
similarity index 100%
rename from elastodynamics/Readme.md
rename to modules/elastodynamics/Readme.md
diff --git a/elastodynamics/data/traction_bar_test_1.txt b/modules/elastodynamics/data/traction_bar_test_1.txt
similarity index 100%
rename from elastodynamics/data/traction_bar_test_1.txt
rename to modules/elastodynamics/data/traction_bar_test_1.txt
diff --git a/elastodynamics/inputs/bar.Galpha.arc b/modules/elastodynamics/inputs/bar.Galpha.arc
similarity index 100%
rename from elastodynamics/inputs/bar.Galpha.arc
rename to modules/elastodynamics/inputs/bar.Galpha.arc
diff --git a/elastodynamics/inputs/bar.arc b/modules/elastodynamics/inputs/bar.arc
similarity index 100%
rename from elastodynamics/inputs/bar.arc
rename to modules/elastodynamics/inputs/bar.arc
diff --git a/elastodynamics/inputs/bar.damping.arc b/modules/elastodynamics/inputs/bar.damping.arc
similarity index 100%
rename from elastodynamics/inputs/bar.damping.arc
rename to modules/elastodynamics/inputs/bar.damping.arc
diff --git a/elastodynamics/inputs/bar.dirichlet.traction.bodyforce.arc b/modules/elastodynamics/inputs/bar.dirichlet.traction.bodyforce.arc
similarity index 100%
rename from elastodynamics/inputs/bar.dirichlet.traction.bodyforce.arc
rename to modules/elastodynamics/inputs/bar.dirichlet.traction.bodyforce.arc
diff --git a/elastodynamics/inputs/bar.transient-traction.arc b/modules/elastodynamics/inputs/bar.transient-traction.arc
similarity index 100%
rename from elastodynamics/inputs/bar.transient-traction.arc
rename to modules/elastodynamics/inputs/bar.transient-traction.arc
diff --git a/elastodynamics/inputs/semi-circle.pointBC.arc b/modules/elastodynamics/inputs/semi-circle.pointBC.arc
similarity index 100%
rename from elastodynamics/inputs/semi-circle.pointBC.arc
rename to modules/elastodynamics/inputs/semi-circle.pointBC.arc
diff --git a/elastodynamics/main.cc b/modules/elastodynamics/main.cc
similarity index 100%
rename from elastodynamics/main.cc
rename to modules/elastodynamics/main.cc
diff --git a/electrostatics/CMakeLists.txt b/modules/electrostatics/CMakeLists.txt
similarity index 100%
rename from electrostatics/CMakeLists.txt
rename to modules/electrostatics/CMakeLists.txt
diff --git a/electrostatics/Electrostatics.config b/modules/electrostatics/Electrostatics.config
similarity index 100%
rename from electrostatics/Electrostatics.config
rename to modules/electrostatics/Electrostatics.config
diff --git a/electrostatics/Fem.axl b/modules/electrostatics/Fem.axl
similarity index 100%
rename from electrostatics/Fem.axl
rename to modules/electrostatics/Fem.axl
diff --git a/electrostatics/FemModule.cc b/modules/electrostatics/FemModule.cc
similarity index 100%
rename from electrostatics/FemModule.cc
rename to modules/electrostatics/FemModule.cc
diff --git a/electrostatics/FemModule.h b/modules/electrostatics/FemModule.h
similarity index 100%
rename from electrostatics/FemModule.h
rename to modules/electrostatics/FemModule.h
diff --git a/electrostatics/Readme.md b/modules/electrostatics/Readme.md
similarity index 100%
rename from electrostatics/Readme.md
rename to modules/electrostatics/Readme.md
diff --git a/electrostatics/check/test_1.txt b/modules/electrostatics/check/test_1.txt
similarity index 100%
rename from electrostatics/check/test_1.txt
rename to modules/electrostatics/check/test_1.txt
diff --git a/electrostatics/check/test_2.txt b/modules/electrostatics/check/test_2.txt
similarity index 100%
rename from electrostatics/check/test_2.txt
rename to modules/electrostatics/check/test_2.txt
diff --git a/electrostatics/inputs/Capacitor.arc b/modules/electrostatics/inputs/Capacitor.arc
similarity index 100%
rename from electrostatics/inputs/Capacitor.arc
rename to modules/electrostatics/inputs/Capacitor.arc
diff --git a/electrostatics/inputs/box-rods.arc b/modules/electrostatics/inputs/box-rods.arc
similarity index 100%
rename from electrostatics/inputs/box-rods.arc
rename to modules/electrostatics/inputs/box-rods.arc
diff --git a/electrostatics/inputs/rod-circle.arc b/modules/electrostatics/inputs/rod-circle.arc
similarity index 100%
rename from electrostatics/inputs/rod-circle.arc
rename to modules/electrostatics/inputs/rod-circle.arc
diff --git a/electrostatics/main.cc b/modules/electrostatics/main.cc
similarity index 100%
rename from electrostatics/main.cc
rename to modules/electrostatics/main.cc
diff --git a/fourier/CMakeLists.txt b/modules/fourier/CMakeLists.txt
similarity index 100%
rename from fourier/CMakeLists.txt
rename to modules/fourier/CMakeLists.txt
diff --git a/fourier/ExternalFunctions.cs b/modules/fourier/ExternalFunctions.cs
similarity index 100%
rename from fourier/ExternalFunctions.cs
rename to modules/fourier/ExternalFunctions.cs
diff --git a/fourier/Fem.axl b/modules/fourier/Fem.axl
similarity index 100%
rename from fourier/Fem.axl
rename to modules/fourier/Fem.axl
diff --git a/fourier/FemModule.cc b/modules/fourier/FemModule.cc
similarity index 100%
rename from fourier/FemModule.cc
rename to modules/fourier/FemModule.cc
diff --git a/fourier/FemModule.h b/modules/fourier/FemModule.h
similarity index 100%
rename from fourier/FemModule.h
rename to modules/fourier/FemModule.h
diff --git a/fourier/Fourier.config b/modules/fourier/Fourier.config
similarity index 100%
rename from fourier/Fourier.config
rename to modules/fourier/Fourier.config
diff --git a/fourier/Readme.md b/modules/fourier/Readme.md
similarity index 100%
rename from fourier/Readme.md
rename to modules/fourier/Readme.md
diff --git a/fourier/check/test1_results.txt b/modules/fourier/check/test1_results.txt
similarity index 100%
rename from fourier/check/test1_results.txt
rename to modules/fourier/check/test1_results.txt
diff --git a/fourier/check/test2_results.txt b/modules/fourier/check/test2_results.txt
similarity index 100%
rename from fourier/check/test2_results.txt
rename to modules/fourier/check/test2_results.txt
diff --git a/fourier/inputs/conduction.10k.arc b/modules/fourier/inputs/conduction.10k.arc
similarity index 100%
rename from fourier/inputs/conduction.10k.arc
rename to modules/fourier/inputs/conduction.10k.arc
diff --git a/fourier/inputs/conduction.arc b/modules/fourier/inputs/conduction.arc
similarity index 100%
rename from fourier/inputs/conduction.arc
rename to modules/fourier/inputs/conduction.arc
diff --git a/fourier/inputs/conduction.heterogeneous.10k.arc b/modules/fourier/inputs/conduction.heterogeneous.10k.arc
similarity index 100%
rename from fourier/inputs/conduction.heterogeneous.10k.arc
rename to modules/fourier/inputs/conduction.heterogeneous.10k.arc
diff --git a/fourier/inputs/conduction.heterogeneous.arc b/modules/fourier/inputs/conduction.heterogeneous.arc
similarity index 100%
rename from fourier/inputs/conduction.heterogeneous.arc
rename to modules/fourier/inputs/conduction.heterogeneous.arc
diff --git a/fourier/inputs/conduction.quad4.arc b/modules/fourier/inputs/conduction.quad4.arc
similarity index 100%
rename from fourier/inputs/conduction.quad4.arc
rename to modules/fourier/inputs/conduction.quad4.arc
diff --git a/fourier/inputs/manufacture.solution.arc b/modules/fourier/inputs/manufacture.solution.arc
similarity index 100%
rename from fourier/inputs/manufacture.solution.arc
rename to modules/fourier/inputs/manufacture.solution.arc
diff --git a/fourier/main.cc b/modules/fourier/main.cc
similarity index 100%
rename from fourier/main.cc
rename to modules/fourier/main.cc
diff --git a/heat/CMakeLists.txt b/modules/heat/CMakeLists.txt
similarity index 100%
rename from heat/CMakeLists.txt
rename to modules/heat/CMakeLists.txt
diff --git a/heat/Fem.axl b/modules/heat/Fem.axl
similarity index 100%
rename from heat/Fem.axl
rename to modules/heat/Fem.axl
diff --git a/heat/FemModule.cc b/modules/heat/FemModule.cc
similarity index 100%
rename from heat/FemModule.cc
rename to modules/heat/FemModule.cc
diff --git a/heat/Heat.config b/modules/heat/Heat.config
similarity index 100%
rename from heat/Heat.config
rename to modules/heat/Heat.config
diff --git a/heat/Readme.md b/modules/heat/Readme.md
similarity index 100%
rename from heat/Readme.md
rename to modules/heat/Readme.md
diff --git a/heat/inputs/conduction.DirichletViaRowColumnElimination.arc b/modules/heat/inputs/conduction.DirichletViaRowColumnElimination.arc
similarity index 95%
rename from heat/inputs/conduction.DirichletViaRowColumnElimination.arc
rename to modules/heat/inputs/conduction.DirichletViaRowColumnElimination.arc
index 1a5fdaac..c1ab4c86 100644
--- a/heat/inputs/conduction.DirichletViaRowColumnElimination.arc
+++ b/modules/heat/inputs/conduction.DirichletViaRowColumnElimination.arc
@@ -15,7 +15,7 @@
- plate.msh
+ meshes/plate.msh
diff --git a/heat/inputs/conduction.DirichletViaRowElimination.arc b/modules/heat/inputs/conduction.DirichletViaRowElimination.arc
similarity index 95%
rename from heat/inputs/conduction.DirichletViaRowElimination.arc
rename to modules/heat/inputs/conduction.DirichletViaRowElimination.arc
index 02ac10cc..f0af7b5d 100644
--- a/heat/inputs/conduction.DirichletViaRowElimination.arc
+++ b/modules/heat/inputs/conduction.DirichletViaRowElimination.arc
@@ -15,7 +15,7 @@
- plate.msh
+ meshes/plate.msh
diff --git a/heat/inputs/conduction.arc b/modules/heat/inputs/conduction.arc
similarity index 94%
rename from heat/inputs/conduction.arc
rename to modules/heat/inputs/conduction.arc
index bfe5e81b..77c1ab54 100644
--- a/heat/inputs/conduction.arc
+++ b/modules/heat/inputs/conduction.arc
@@ -15,7 +15,7 @@
- plate.msh
+ meshes/plate.msh
diff --git a/heat/inputs/conduction.convection.arc b/modules/heat/inputs/conduction.convection.arc
similarity index 96%
rename from heat/inputs/conduction.convection.arc
rename to modules/heat/inputs/conduction.convection.arc
index d79aacc4..05f51685 100644
--- a/heat/inputs/conduction.convection.arc
+++ b/modules/heat/inputs/conduction.convection.arc
@@ -15,7 +15,7 @@
- plate.msh
+ meshes/plate.msh
diff --git a/heat/inputs/conduction.convection.fine.arc b/modules/heat/inputs/conduction.convection.fine.arc
similarity index 95%
rename from heat/inputs/conduction.convection.fine.arc
rename to modules/heat/inputs/conduction.convection.fine.arc
index c72e91a2..7053a1ae 100644
--- a/heat/inputs/conduction.convection.fine.arc
+++ b/modules/heat/inputs/conduction.convection.fine.arc
@@ -16,7 +16,7 @@
- plate.fine.msh
+ meshes/plate.fine.msh
diff --git a/heat/inputs/conduction.fine.arc b/modules/heat/inputs/conduction.fine.arc
similarity index 93%
rename from heat/inputs/conduction.fine.arc
rename to modules/heat/inputs/conduction.fine.arc
index 70497ee8..e0640ee5 100644
--- a/heat/inputs/conduction.fine.arc
+++ b/modules/heat/inputs/conduction.fine.arc
@@ -16,7 +16,7 @@
- plate.fine.msh
+ meshes/plate.fine.msh
diff --git a/heat/main.cc b/modules/heat/main.cc
similarity index 100%
rename from heat/main.cc
rename to modules/heat/main.cc
diff --git a/laplace/CMakeLists.txt b/modules/laplace/CMakeLists.txt
similarity index 100%
rename from laplace/CMakeLists.txt
rename to modules/laplace/CMakeLists.txt
diff --git a/laplace/Fem.axl b/modules/laplace/Fem.axl
similarity index 100%
rename from laplace/Fem.axl
rename to modules/laplace/Fem.axl
diff --git a/laplace/FemModule.cc b/modules/laplace/FemModule.cc
similarity index 100%
rename from laplace/FemModule.cc
rename to modules/laplace/FemModule.cc
diff --git a/laplace/FemModule.h b/modules/laplace/FemModule.h
similarity index 100%
rename from laplace/FemModule.h
rename to modules/laplace/FemModule.h
diff --git a/laplace/Laplace.config b/modules/laplace/Laplace.config
similarity index 100%
rename from laplace/Laplace.config
rename to modules/laplace/Laplace.config
diff --git a/laplace/Readme.md b/modules/laplace/Readme.md
similarity index 100%
rename from laplace/Readme.md
rename to modules/laplace/Readme.md
diff --git a/laplace/check/test3_results.txt b/modules/laplace/check/test3_results.txt
similarity index 100%
rename from laplace/check/test3_results.txt
rename to modules/laplace/check/test3_results.txt
diff --git a/laplace/check/test_3D_L-shape.txt b/modules/laplace/check/test_3D_L-shape.txt
similarity index 100%
rename from laplace/check/test_3D_L-shape.txt
rename to modules/laplace/check/test_3D_L-shape.txt
diff --git a/laplace/inputs/L-shape.3D.arc b/modules/laplace/inputs/L-shape.3D.arc
similarity index 100%
rename from laplace/inputs/L-shape.3D.arc
rename to modules/laplace/inputs/L-shape.3D.arc
diff --git a/laplace/inputs/L-shape.3D.bsr.arc b/modules/laplace/inputs/L-shape.3D.bsr.arc
similarity index 100%
rename from laplace/inputs/L-shape.3D.bsr.arc
rename to modules/laplace/inputs/L-shape.3D.bsr.arc
diff --git a/laplace/inputs/L-shape.3D.bsr.atomicFree.arc b/modules/laplace/inputs/L-shape.3D.bsr.atomicFree.arc
similarity index 100%
rename from laplace/inputs/L-shape.3D.bsr.atomicFree.arc
rename to modules/laplace/inputs/L-shape.3D.bsr.atomicFree.arc
diff --git a/laplace/inputs/PointDirichlet-refined.arc b/modules/laplace/inputs/PointDirichlet-refined.arc
similarity index 100%
rename from laplace/inputs/PointDirichlet-refined.arc
rename to modules/laplace/inputs/PointDirichlet-refined.arc
diff --git a/laplace/inputs/PointDirichlet.arc b/modules/laplace/inputs/PointDirichlet.arc
similarity index 100%
rename from laplace/inputs/PointDirichlet.arc
rename to modules/laplace/inputs/PointDirichlet.arc
diff --git a/laplace/inputs/PointDirichlet.bsr.atomicFree.hypreDirect.arc b/modules/laplace/inputs/PointDirichlet.bsr.atomicFree.hypreDirect.arc
similarity index 100%
rename from laplace/inputs/PointDirichlet.bsr.atomicFree.hypreDirect.arc
rename to modules/laplace/inputs/PointDirichlet.bsr.atomicFree.hypreDirect.arc
diff --git a/laplace/inputs/PointDirichlet.bsr.hypreDirect.arc b/modules/laplace/inputs/PointDirichlet.bsr.hypreDirect.arc
similarity index 100%
rename from laplace/inputs/PointDirichlet.bsr.hypreDirect.arc
rename to modules/laplace/inputs/PointDirichlet.bsr.hypreDirect.arc
diff --git a/laplace/inputs/ring.arc b/modules/laplace/inputs/ring.arc
similarity index 100%
rename from laplace/inputs/ring.arc
rename to modules/laplace/inputs/ring.arc
diff --git a/laplace/main.cc b/modules/laplace/main.cc
similarity index 100%
rename from laplace/main.cc
rename to modules/laplace/main.cc
diff --git a/passmo/CMakeLists.txt b/modules/passmo/CMakeLists.txt
similarity index 100%
rename from passmo/CMakeLists.txt
rename to modules/passmo/CMakeLists.txt
diff --git a/passmo/Elastodynamic.axl b/modules/passmo/Elastodynamic.axl
similarity index 100%
rename from passmo/Elastodynamic.axl
rename to modules/passmo/Elastodynamic.axl
diff --git a/passmo/ElastodynamicModule.cc b/modules/passmo/ElastodynamicModule.cc
similarity index 100%
rename from passmo/ElastodynamicModule.cc
rename to modules/passmo/ElastodynamicModule.cc
diff --git a/passmo/ElastodynamicModule.h b/modules/passmo/ElastodynamicModule.h
similarity index 100%
rename from passmo/ElastodynamicModule.h
rename to modules/passmo/ElastodynamicModule.h
diff --git a/passmo/Passmo.config b/modules/passmo/Passmo.config
similarity index 100%
rename from passmo/Passmo.config
rename to modules/passmo/Passmo.config
diff --git a/passmo/TypesElastodynamic.h b/modules/passmo/TypesElastodynamic.h
similarity index 100%
rename from passmo/TypesElastodynamic.h
rename to modules/passmo/TypesElastodynamic.h
diff --git a/passmo/analytic_func.cc b/modules/passmo/analytic_func.cc
similarity index 100%
rename from passmo/analytic_func.cc
rename to modules/passmo/analytic_func.cc
diff --git a/passmo/analytical_func.h b/modules/passmo/analytical_func.h
similarity index 100%
rename from passmo/analytical_func.h
rename to modules/passmo/analytical_func.h
diff --git a/passmo/inputs/bar2d_quad.arc b/modules/passmo/inputs/bar2d_quad.arc
similarity index 100%
rename from passmo/inputs/bar2d_quad.arc
rename to modules/passmo/inputs/bar2d_quad.arc
diff --git a/passmo/inputs/bar2d_tria.arc b/modules/passmo/inputs/bar2d_tria.arc
similarity index 100%
rename from passmo/inputs/bar2d_tria.arc
rename to modules/passmo/inputs/bar2d_tria.arc
diff --git a/passmo/inputs/bar2d_tria_quad.arc b/modules/passmo/inputs/bar2d_tria_quad.arc
similarity index 100%
rename from passmo/inputs/bar2d_tria_quad.arc
rename to modules/passmo/inputs/bar2d_tria_quad.arc
diff --git a/passmo/inputs/bar3d_hexa.arc b/modules/passmo/inputs/bar3d_hexa.arc
similarity index 100%
rename from passmo/inputs/bar3d_hexa.arc
rename to modules/passmo/inputs/bar3d_hexa.arc
diff --git a/passmo/inputs/bar3d_tetra.arc b/modules/passmo/inputs/bar3d_tetra.arc
similarity index 100%
rename from passmo/inputs/bar3d_tetra.arc
rename to modules/passmo/inputs/bar3d_tetra.arc
diff --git a/passmo/inputs/bar3d_tetra_hexa_pyramids.arc b/modules/passmo/inputs/bar3d_tetra_hexa_pyramids.arc
similarity index 100%
rename from passmo/inputs/bar3d_tetra_hexa_pyramids.arc
rename to modules/passmo/inputs/bar3d_tetra_hexa_pyramids.arc
diff --git a/passmo/main.cc b/modules/passmo/main.cc
similarity index 100%
rename from passmo/main.cc
rename to modules/passmo/main.cc
diff --git a/passmo/tests/bar2d-quad.txt b/modules/passmo/tests/bar2d-quad.txt
similarity index 100%
rename from passmo/tests/bar2d-quad.txt
rename to modules/passmo/tests/bar2d-quad.txt
diff --git a/passmo/tests/bar2d-tria-quad.txt b/modules/passmo/tests/bar2d-tria-quad.txt
similarity index 100%
rename from passmo/tests/bar2d-tria-quad.txt
rename to modules/passmo/tests/bar2d-tria-quad.txt
diff --git a/passmo/tests/bar2d-tria.txt b/modules/passmo/tests/bar2d-tria.txt
similarity index 100%
rename from passmo/tests/bar2d-tria.txt
rename to modules/passmo/tests/bar2d-tria.txt
diff --git a/passmo/tests/bar3d-hexa.txt b/modules/passmo/tests/bar3d-hexa.txt
similarity index 100%
rename from passmo/tests/bar3d-hexa.txt
rename to modules/passmo/tests/bar3d-hexa.txt
diff --git a/passmo/tests/bar3d-tetra.txt b/modules/passmo/tests/bar3d-tetra.txt
similarity index 100%
rename from passmo/tests/bar3d-tetra.txt
rename to modules/passmo/tests/bar3d-tetra.txt
diff --git a/passmo/utilFEM.h b/modules/passmo/utilFEM.h
similarity index 100%
rename from passmo/utilFEM.h
rename to modules/passmo/utilFEM.h
diff --git a/poisson/CMakeLists.txt b/modules/poisson/CMakeLists.txt
similarity index 100%
rename from poisson/CMakeLists.txt
rename to modules/poisson/CMakeLists.txt
diff --git a/poisson/Fem.axl b/modules/poisson/Fem.axl
similarity index 100%
rename from poisson/Fem.axl
rename to modules/poisson/Fem.axl
diff --git a/poisson/FemModule.cc b/modules/poisson/FemModule.cc
similarity index 100%
rename from poisson/FemModule.cc
rename to modules/poisson/FemModule.cc
diff --git a/poisson/FemModule.h b/modules/poisson/FemModule.h
similarity index 100%
rename from poisson/FemModule.h
rename to modules/poisson/FemModule.h
diff --git a/poisson/Poisson.config b/modules/poisson/Poisson.config
similarity index 100%
rename from poisson/Poisson.config
rename to modules/poisson/Poisson.config
diff --git a/poisson/Readme.md b/modules/poisson/Readme.md
similarity index 100%
rename from poisson/Readme.md
rename to modules/poisson/Readme.md
diff --git a/poisson/check/poisson_test_point_dirichlet_2D.txt b/modules/poisson/check/poisson_test_point_dirichlet_2D.txt
similarity index 100%
rename from poisson/check/poisson_test_point_dirichlet_2D.txt
rename to modules/poisson/check/poisson_test_point_dirichlet_2D.txt
diff --git a/poisson/check/poisson_test_ref_circle_2D.txt b/modules/poisson/check/poisson_test_ref_circle_2D.txt
similarity index 100%
rename from poisson/check/poisson_test_ref_circle_2D.txt
rename to modules/poisson/check/poisson_test_ref_circle_2D.txt
diff --git a/poisson/check/poisson_test_ref_sphere_3D.txt b/modules/poisson/check/poisson_test_ref_sphere_3D.txt
similarity index 100%
rename from poisson/check/poisson_test_ref_sphere_3D.txt
rename to modules/poisson/check/poisson_test_ref_sphere_3D.txt
diff --git a/poisson/inputs/circle.2D.arc b/modules/poisson/inputs/circle.2D.arc
similarity index 100%
rename from poisson/inputs/circle.2D.arc
rename to modules/poisson/inputs/circle.2D.arc
diff --git a/poisson/inputs/circle.2D.bsr.arc b/modules/poisson/inputs/circle.2D.bsr.arc
similarity index 100%
rename from poisson/inputs/circle.2D.bsr.arc
rename to modules/poisson/inputs/circle.2D.bsr.arc
diff --git a/poisson/inputs/circle.2D.bsr.atomicFree.arc b/modules/poisson/inputs/circle.2D.bsr.atomicFree.arc
similarity index 100%
rename from poisson/inputs/circle.2D.bsr.atomicFree.arc
rename to modules/poisson/inputs/circle.2D.bsr.atomicFree.arc
diff --git a/poisson/inputs/circle.2D.bsr.atomicFree.hypre.arc b/modules/poisson/inputs/circle.2D.bsr.atomicFree.hypre.arc
similarity index 100%
rename from poisson/inputs/circle.2D.bsr.atomicFree.hypre.arc
rename to modules/poisson/inputs/circle.2D.bsr.atomicFree.hypre.arc
diff --git a/poisson/inputs/circle.2D.bsr.hypre.arc b/modules/poisson/inputs/circle.2D.bsr.hypre.arc
similarity index 100%
rename from poisson/inputs/circle.2D.bsr.hypre.arc
rename to modules/poisson/inputs/circle.2D.bsr.hypre.arc
diff --git a/poisson/inputs/circle.neumann.2D.arc b/modules/poisson/inputs/circle.neumann.2D.arc
similarity index 100%
rename from poisson/inputs/circle.neumann.2D.arc
rename to modules/poisson/inputs/circle.neumann.2D.arc
diff --git a/poisson/inputs/perforatedSquare.pointDirichlet.2D.arc b/modules/poisson/inputs/perforatedSquare.pointDirichlet.2D.arc
similarity index 100%
rename from poisson/inputs/perforatedSquare.pointDirichlet.2D.arc
rename to modules/poisson/inputs/perforatedSquare.pointDirichlet.2D.arc
diff --git a/poisson/inputs/sphere.3D.arc b/modules/poisson/inputs/sphere.3D.arc
similarity index 100%
rename from poisson/inputs/sphere.3D.arc
rename to modules/poisson/inputs/sphere.3D.arc
diff --git a/poisson/inputs/sphere.3D.bsr.arc b/modules/poisson/inputs/sphere.3D.bsr.arc
similarity index 100%
rename from poisson/inputs/sphere.3D.bsr.arc
rename to modules/poisson/inputs/sphere.3D.bsr.arc
diff --git a/poisson/inputs/sphere.3D.bsr.atomicFree.arc b/modules/poisson/inputs/sphere.3D.bsr.atomicFree.arc
similarity index 100%
rename from poisson/inputs/sphere.3D.bsr.atomicFree.arc
rename to modules/poisson/inputs/sphere.3D.bsr.atomicFree.arc
diff --git a/poisson/inputs/sphere.3D.bsr.atomicFree.hypre.arc b/modules/poisson/inputs/sphere.3D.bsr.atomicFree.hypre.arc
similarity index 100%
rename from poisson/inputs/sphere.3D.bsr.atomicFree.hypre.arc
rename to modules/poisson/inputs/sphere.3D.bsr.atomicFree.hypre.arc
diff --git a/poisson/inputs/sphere.3D.bsr.hypre.arc b/modules/poisson/inputs/sphere.3D.bsr.hypre.arc
similarity index 100%
rename from poisson/inputs/sphere.3D.bsr.hypre.arc
rename to modules/poisson/inputs/sphere.3D.bsr.hypre.arc
diff --git a/poisson/inputs/sphere.neumann.3D.arc b/modules/poisson/inputs/sphere.neumann.3D.arc
similarity index 100%
rename from poisson/inputs/sphere.neumann.3D.arc
rename to modules/poisson/inputs/sphere.neumann.3D.arc
diff --git a/poisson/main.cc b/modules/poisson/main.cc
similarity index 100%
rename from poisson/main.cc
rename to modules/poisson/main.cc
diff --git a/soildynamics/CMakeLists.txt b/modules/soildynamics/CMakeLists.txt
similarity index 100%
rename from soildynamics/CMakeLists.txt
rename to modules/soildynamics/CMakeLists.txt
diff --git a/soildynamics/Fem.axl b/modules/soildynamics/Fem.axl
similarity index 100%
rename from soildynamics/Fem.axl
rename to modules/soildynamics/Fem.axl
diff --git a/soildynamics/FemModule.cc b/modules/soildynamics/FemModule.cc
similarity index 100%
rename from soildynamics/FemModule.cc
rename to modules/soildynamics/FemModule.cc
diff --git a/soildynamics/Readme.md b/modules/soildynamics/Readme.md
similarity index 100%
rename from soildynamics/Readme.md
rename to modules/soildynamics/Readme.md
diff --git a/soildynamics/Soildynamics.config b/modules/soildynamics/Soildynamics.config
similarity index 100%
rename from soildynamics/Soildynamics.config
rename to modules/soildynamics/Soildynamics.config
diff --git a/soildynamics/check/test_paraxial_results.txt b/modules/soildynamics/check/test_paraxial_results.txt
similarity index 100%
rename from soildynamics/check/test_paraxial_results.txt
rename to modules/soildynamics/check/test_paraxial_results.txt
diff --git a/soildynamics/check/test_soildynamics_results.txt b/modules/soildynamics/check/test_soildynamics_results.txt
similarity index 100%
rename from soildynamics/check/test_soildynamics_results.txt
rename to modules/soildynamics/check/test_soildynamics_results.txt
diff --git a/soildynamics/data/displacement_loading_dc_east.txt b/modules/soildynamics/data/displacement_loading_dc_east.txt
similarity index 100%
rename from soildynamics/data/displacement_loading_dc_east.txt
rename to modules/soildynamics/data/displacement_loading_dc_east.txt
diff --git a/soildynamics/data/displacement_loading_dc_north.txt b/modules/soildynamics/data/displacement_loading_dc_north.txt
similarity index 100%
rename from soildynamics/data/displacement_loading_dc_north.txt
rename to modules/soildynamics/data/displacement_loading_dc_north.txt
diff --git a/soildynamics/data/displacement_loading_dc_south.txt b/modules/soildynamics/data/displacement_loading_dc_south.txt
similarity index 100%
rename from soildynamics/data/displacement_loading_dc_south.txt
rename to modules/soildynamics/data/displacement_loading_dc_south.txt
diff --git a/soildynamics/data/displacement_loading_dc_west.txt b/modules/soildynamics/data/displacement_loading_dc_west.txt
similarity index 100%
rename from soildynamics/data/displacement_loading_dc_west.txt
rename to modules/soildynamics/data/displacement_loading_dc_west.txt
diff --git a/soildynamics/data/force_loading_dc.txt b/modules/soildynamics/data/force_loading_dc.txt
similarity index 100%
rename from soildynamics/data/force_loading_dc.txt
rename to modules/soildynamics/data/force_loading_dc.txt
diff --git a/soildynamics/data/semi-circle-soil-traction.txt b/modules/soildynamics/data/semi-circle-soil-traction.txt
similarity index 100%
rename from soildynamics/data/semi-circle-soil-traction.txt
rename to modules/soildynamics/data/semi-circle-soil-traction.txt
diff --git a/soildynamics/inputs/Soildynamics.arc b/modules/soildynamics/inputs/Soildynamics.arc
similarity index 100%
rename from soildynamics/inputs/Soildynamics.arc
rename to modules/soildynamics/inputs/Soildynamics.arc
diff --git a/soildynamics/inputs/constant-traction.arc b/modules/soildynamics/inputs/constant-traction.arc
similarity index 100%
rename from soildynamics/inputs/constant-traction.arc
rename to modules/soildynamics/inputs/constant-traction.arc
diff --git a/soildynamics/inputs/double-couple.paraxial.arc b/modules/soildynamics/inputs/double-couple.paraxial.arc
similarity index 100%
rename from soildynamics/inputs/double-couple.paraxial.arc
rename to modules/soildynamics/inputs/double-couple.paraxial.arc
diff --git a/soildynamics/inputs/double-couple.paraxial.soil.arc b/modules/soildynamics/inputs/double-couple.paraxial.soil.arc
similarity index 100%
rename from soildynamics/inputs/double-couple.paraxial.soil.arc
rename to modules/soildynamics/inputs/double-couple.paraxial.soil.arc
diff --git a/soildynamics/inputs/transient-traction.arc b/modules/soildynamics/inputs/transient-traction.arc
similarity index 100%
rename from soildynamics/inputs/transient-traction.arc
rename to modules/soildynamics/inputs/transient-traction.arc
diff --git a/soildynamics/main.cc b/modules/soildynamics/main.cc
similarity index 100%
rename from soildynamics/main.cc
rename to modules/soildynamics/main.cc
diff --git a/testlab/BlCsrBiliAssembly.cc b/modules/testlab/BlCsrBiliAssembly.cc
similarity index 100%
rename from testlab/BlCsrBiliAssembly.cc
rename to modules/testlab/BlCsrBiliAssembly.cc
diff --git a/testlab/CMakeLists.txt b/modules/testlab/CMakeLists.txt
similarity index 100%
rename from testlab/CMakeLists.txt
rename to modules/testlab/CMakeLists.txt
diff --git a/testlab/CooBiliAssembly.cc b/modules/testlab/CooBiliAssembly.cc
similarity index 100%
rename from testlab/CooBiliAssembly.cc
rename to modules/testlab/CooBiliAssembly.cc
diff --git a/testlab/CooGpuBiliAssembly.cc b/modules/testlab/CooGpuBiliAssembly.cc
similarity index 100%
rename from testlab/CooGpuBiliAssembly.cc
rename to modules/testlab/CooGpuBiliAssembly.cc
diff --git a/testlab/CooSortBiliAssembly.cc b/modules/testlab/CooSortBiliAssembly.cc
similarity index 100%
rename from testlab/CooSortBiliAssembly.cc
rename to modules/testlab/CooSortBiliAssembly.cc
diff --git a/testlab/CooSortGpuBiliAssembly.cc b/modules/testlab/CooSortGpuBiliAssembly.cc
similarity index 100%
rename from testlab/CooSortGpuBiliAssembly.cc
rename to modules/testlab/CooSortGpuBiliAssembly.cc
diff --git a/testlab/CsrBiliAssembly.cc b/modules/testlab/CsrBiliAssembly.cc
similarity index 100%
rename from testlab/CsrBiliAssembly.cc
rename to modules/testlab/CsrBiliAssembly.cc
diff --git a/testlab/CsrGpuBiliAssembly.cc b/modules/testlab/CsrGpuBiliAssembly.cc
similarity index 100%
rename from testlab/CsrGpuBiliAssembly.cc
rename to modules/testlab/CsrGpuBiliAssembly.cc
diff --git a/testlab/Fem.axl b/modules/testlab/Fem.axl
similarity index 100%
rename from testlab/Fem.axl
rename to modules/testlab/Fem.axl
diff --git a/testlab/FemModule.cc b/modules/testlab/FemModule.cc
similarity index 100%
rename from testlab/FemModule.cc
rename to modules/testlab/FemModule.cc
diff --git a/testlab/FemModule.h b/modules/testlab/FemModule.h
similarity index 100%
rename from testlab/FemModule.h
rename to modules/testlab/FemModule.h
diff --git a/testlab/LegacyBiliAssembly.cc b/modules/testlab/LegacyBiliAssembly.cc
similarity index 100%
rename from testlab/LegacyBiliAssembly.cc
rename to modules/testlab/LegacyBiliAssembly.cc
diff --git a/testlab/NodeWiseCsrBiliAssembly.cc b/modules/testlab/NodeWiseCsrBiliAssembly.cc
similarity index 100%
rename from testlab/NodeWiseCsrBiliAssembly.cc
rename to modules/testlab/NodeWiseCsrBiliAssembly.cc
diff --git a/testlab/Readme.md b/modules/testlab/Readme.md
similarity index 100%
rename from testlab/Readme.md
rename to modules/testlab/Readme.md
diff --git a/testlab/Testlab.config b/modules/testlab/Testlab.config
similarity index 100%
rename from testlab/Testlab.config
rename to modules/testlab/Testlab.config
diff --git a/testlab/benchmarking/TEST_TEMPLATE_2D.xml b/modules/testlab/benchmarking/TEST_TEMPLATE_2D.xml
similarity index 100%
rename from testlab/benchmarking/TEST_TEMPLATE_2D.xml
rename to modules/testlab/benchmarking/TEST_TEMPLATE_2D.xml
diff --git a/testlab/benchmarking/TEST_TEMPLATE_3D.xml b/modules/testlab/benchmarking/TEST_TEMPLATE_3D.xml
similarity index 100%
rename from testlab/benchmarking/TEST_TEMPLATE_3D.xml
rename to modules/testlab/benchmarking/TEST_TEMPLATE_3D.xml
diff --git a/testlab/benchmarking/get_stats_from_json.py b/modules/testlab/benchmarking/get_stats_from_json.py
similarity index 100%
rename from testlab/benchmarking/get_stats_from_json.py
rename to modules/testlab/benchmarking/get_stats_from_json.py
diff --git a/testlab/benchmarking/plot-results.sh b/modules/testlab/benchmarking/plot-results.sh
similarity index 100%
rename from testlab/benchmarking/plot-results.sh
rename to modules/testlab/benchmarking/plot-results.sh
diff --git a/testlab/benchmarking/run-benchmark.sh b/modules/testlab/benchmarking/run-benchmark.sh
similarity index 100%
rename from testlab/benchmarking/run-benchmark.sh
rename to modules/testlab/benchmarking/run-benchmark.sh
diff --git a/testlab/inputs/Test.L-shape.2D.arc b/modules/testlab/inputs/Test.L-shape.2D.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.arc
rename to modules/testlab/inputs/Test.L-shape.2D.arc
diff --git a/testlab/inputs/Test.L-shape.2D.bsr.arc b/modules/testlab/inputs/Test.L-shape.2D.bsr.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.bsr.arc
rename to modules/testlab/inputs/Test.L-shape.2D.bsr.arc
diff --git a/testlab/inputs/Test.L-shape.2D.bsr.atomic-free.arc b/modules/testlab/inputs/Test.L-shape.2D.bsr.atomic-free.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.bsr.atomic-free.arc
rename to modules/testlab/inputs/Test.L-shape.2D.bsr.atomic-free.arc
diff --git a/testlab/inputs/Test.L-shape.2D.bsr.atomic-free.hypre.arc b/modules/testlab/inputs/Test.L-shape.2D.bsr.atomic-free.hypre.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.bsr.atomic-free.hypre.arc
rename to modules/testlab/inputs/Test.L-shape.2D.bsr.atomic-free.hypre.arc
diff --git a/testlab/inputs/Test.L-shape.2D.bsr.hypre.arc b/modules/testlab/inputs/Test.L-shape.2D.bsr.hypre.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.bsr.hypre.arc
rename to modules/testlab/inputs/Test.L-shape.2D.bsr.hypre.arc
diff --git a/testlab/inputs/Test.L-shape.2D.coo-gpu.arc b/modules/testlab/inputs/Test.L-shape.2D.coo-gpu.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.coo-gpu.arc
rename to modules/testlab/inputs/Test.L-shape.2D.coo-gpu.arc
diff --git a/testlab/inputs/Test.L-shape.2D.coo-sort-gpu.arc b/modules/testlab/inputs/Test.L-shape.2D.coo-sort-gpu.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.coo-sort-gpu.arc
rename to modules/testlab/inputs/Test.L-shape.2D.coo-sort-gpu.arc
diff --git a/testlab/inputs/Test.L-shape.2D.coo-sort.arc b/modules/testlab/inputs/Test.L-shape.2D.coo-sort.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.coo-sort.arc
rename to modules/testlab/inputs/Test.L-shape.2D.coo-sort.arc
diff --git a/testlab/inputs/Test.L-shape.2D.coo.arc b/modules/testlab/inputs/Test.L-shape.2D.coo.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.coo.arc
rename to modules/testlab/inputs/Test.L-shape.2D.coo.arc
diff --git a/testlab/inputs/Test.L-shape.2D.csr-gpu.arc b/modules/testlab/inputs/Test.L-shape.2D.csr-gpu.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.csr-gpu.arc
rename to modules/testlab/inputs/Test.L-shape.2D.csr-gpu.arc
diff --git a/testlab/inputs/Test.L-shape.2D.nwcsr.arc b/modules/testlab/inputs/Test.L-shape.2D.nwcsr.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.2D.nwcsr.arc
rename to modules/testlab/inputs/Test.L-shape.2D.nwcsr.arc
diff --git a/testlab/inputs/Test.L-shape.3D.arc b/modules/testlab/inputs/Test.L-shape.3D.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.3D.arc
rename to modules/testlab/inputs/Test.L-shape.3D.arc
diff --git a/testlab/inputs/Test.L-shape.3D.coo-gpu.arc b/modules/testlab/inputs/Test.L-shape.3D.coo-gpu.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.3D.coo-gpu.arc
rename to modules/testlab/inputs/Test.L-shape.3D.coo-gpu.arc
diff --git a/testlab/inputs/Test.L-shape.3D.coo-sort-gpu.arc b/modules/testlab/inputs/Test.L-shape.3D.coo-sort-gpu.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.3D.coo-sort-gpu.arc
rename to modules/testlab/inputs/Test.L-shape.3D.coo-sort-gpu.arc
diff --git a/testlab/inputs/Test.L-shape.3D.coo-sort.arc b/modules/testlab/inputs/Test.L-shape.3D.coo-sort.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.3D.coo-sort.arc
rename to modules/testlab/inputs/Test.L-shape.3D.coo-sort.arc
diff --git a/testlab/inputs/Test.L-shape.3D.coo.arc b/modules/testlab/inputs/Test.L-shape.3D.coo.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.3D.coo.arc
rename to modules/testlab/inputs/Test.L-shape.3D.coo.arc
diff --git a/testlab/inputs/Test.L-shape.3D.nwcsr.arc b/modules/testlab/inputs/Test.L-shape.3D.nwcsr.arc
similarity index 100%
rename from testlab/inputs/Test.L-shape.3D.nwcsr.arc
rename to modules/testlab/inputs/Test.L-shape.3D.nwcsr.arc
diff --git a/testlab/inputs/Test.circle.2D.blcsr.arc b/modules/testlab/inputs/Test.circle.2D.blcsr.arc
similarity index 100%
rename from testlab/inputs/Test.circle.2D.blcsr.arc
rename to modules/testlab/inputs/Test.circle.2D.blcsr.arc
diff --git a/testlab/inputs/Test.circle.2D.csr.arc b/modules/testlab/inputs/Test.circle.2D.csr.arc
similarity index 100%
rename from testlab/inputs/Test.circle.2D.csr.arc
rename to modules/testlab/inputs/Test.circle.2D.csr.arc
diff --git a/testlab/inputs/Test.direct-solver.arc b/modules/testlab/inputs/Test.direct-solver.arc
similarity index 100%
rename from testlab/inputs/Test.direct-solver.arc
rename to modules/testlab/inputs/Test.direct-solver.arc
diff --git a/testlab/inputs/Test.hypre.arc b/modules/testlab/inputs/Test.hypre.arc
similarity index 100%
rename from testlab/inputs/Test.hypre.arc
rename to modules/testlab/inputs/Test.hypre.arc
diff --git a/testlab/inputs/Test.hypre_direct.arc b/modules/testlab/inputs/Test.hypre_direct.arc
similarity index 100%
rename from testlab/inputs/Test.hypre_direct.arc
rename to modules/testlab/inputs/Test.hypre_direct.arc
diff --git a/testlab/inputs/Test.neumann.arc b/modules/testlab/inputs/Test.neumann.arc
similarity index 100%
rename from testlab/inputs/Test.neumann.arc
rename to modules/testlab/inputs/Test.neumann.arc
diff --git a/testlab/inputs/Test.petsc.arc b/modules/testlab/inputs/Test.petsc.arc
similarity index 100%
rename from testlab/inputs/Test.petsc.arc
rename to modules/testlab/inputs/Test.petsc.arc
diff --git a/testlab/inputs/Test.porous.arc b/modules/testlab/inputs/Test.porous.arc
similarity index 100%
rename from testlab/inputs/Test.porous.arc
rename to modules/testlab/inputs/Test.porous.arc
diff --git a/testlab/inputs/Test.sphere.3D.arc b/modules/testlab/inputs/Test.sphere.3D.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.arc
rename to modules/testlab/inputs/Test.sphere.3D.arc
diff --git a/testlab/inputs/Test.sphere.3D.bsr.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.bsr.arc
rename to modules/testlab/inputs/Test.sphere.3D.bsr.arc
diff --git a/testlab/inputs/Test.sphere.3D.bsr.atomic-free.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.bsr.atomic-free.arc
rename to modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.arc
diff --git a/testlab/inputs/Test.sphere.3D.bsr.atomic-free.hypre.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.hypre.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.bsr.atomic-free.hypre.arc
rename to modules/testlab/inputs/Test.sphere.3D.bsr.atomic-free.hypre.arc
diff --git a/testlab/inputs/Test.sphere.3D.bsr.hypre.arc b/modules/testlab/inputs/Test.sphere.3D.bsr.hypre.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.bsr.hypre.arc
rename to modules/testlab/inputs/Test.sphere.3D.bsr.hypre.arc
diff --git a/testlab/inputs/Test.sphere.3D.csr-gpu.arc b/modules/testlab/inputs/Test.sphere.3D.csr-gpu.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.csr-gpu.arc
rename to modules/testlab/inputs/Test.sphere.3D.csr-gpu.arc
diff --git a/testlab/inputs/Test.sphere.3D.csr.arc b/modules/testlab/inputs/Test.sphere.3D.csr.arc
similarity index 100%
rename from testlab/inputs/Test.sphere.3D.csr.arc
rename to modules/testlab/inputs/Test.sphere.3D.csr.arc
diff --git a/testlab/inputs/Test.trilinos.arc b/modules/testlab/inputs/Test.trilinos.arc
similarity index 100%
rename from testlab/inputs/Test.trilinos.arc
rename to modules/testlab/inputs/Test.trilinos.arc
diff --git a/testlab/main.cc b/modules/testlab/main.cc
similarity index 100%
rename from testlab/main.cc
rename to modules/testlab/main.cc
diff --git a/testlab/tests/poisson_test_ref_L-shape_2D.txt b/modules/testlab/tests/poisson_test_ref_L-shape_2D.txt
similarity index 100%
rename from testlab/tests/poisson_test_ref_L-shape_2D.txt
rename to modules/testlab/tests/poisson_test_ref_L-shape_2D.txt
diff --git a/testlab/tests/poisson_test_ref_L-shape_3D.txt b/modules/testlab/tests/poisson_test_ref_L-shape_3D.txt
similarity index 100%
rename from testlab/tests/poisson_test_ref_L-shape_3D.txt
rename to modules/testlab/tests/poisson_test_ref_L-shape_3D.txt
diff --git a/testlab/tests/poisson_test_ref_circle_2D.txt b/modules/testlab/tests/poisson_test_ref_circle_2D.txt
similarity index 100%
rename from testlab/tests/poisson_test_ref_circle_2D.txt
rename to modules/testlab/tests/poisson_test_ref_circle_2D.txt
diff --git a/testlab/tests/poisson_test_ref_sphere_3D.txt b/modules/testlab/tests/poisson_test_ref_sphere_3D.txt
similarity index 100%
rename from testlab/tests/poisson_test_ref_sphere_3D.txt
rename to modules/testlab/tests/poisson_test_ref_sphere_3D.txt
diff --git a/testlab/tests/test4_results.txt b/modules/testlab/tests/test4_results.txt
similarity index 100%
rename from testlab/tests/test4_results.txt
rename to modules/testlab/tests/test4_results.txt