diff --git a/BWR.ipynb b/BWR/BWR.ipynb
similarity index 100%
rename from BWR.ipynb
rename to BWR/BWR.ipynb
diff --git a/chain_simple.xml b/Depletion/chain_simple.xml
similarity index 100%
rename from chain_simple.xml
rename to Depletion/chain_simple.xml
diff --git a/depletion.ipynb b/Depletion/depletion.ipynb
similarity index 100%
rename from depletion.ipynb
rename to Depletion/depletion.ipynb
diff --git a/RBMK.ipynb b/RBMK/RBMK.ipynb
similarity index 100%
rename from RBMK.ipynb
rename to RBMK/RBMK.ipynb
diff --git a/SFR.ipynb b/SFR/SFR.ipynb
similarity index 100%
rename from SFR.ipynb
rename to SFR/SFR.ipynb
diff --git a/TRIGA.ipynb b/TRIGA/TRIGA.ipynb
similarity index 100%
rename from TRIGA.ipynb
rename to TRIGA/TRIGA.ipynb
diff --git a/VHTR.ipynb b/VHTR/VHTR.ipynb
similarity index 100%
rename from VHTR.ipynb
rename to VHTR/VHTR.ipynb
diff --git a/VVER.ipynb b/VVER/VVER.ipynb
similarity index 100%
rename from VVER.ipynb
rename to VVER/VVER.ipynb
diff --git a/hexagonal-lattice.ipynb b/examples/hexagon/hexagonal-lattice.ipynb
similarity index 100%
rename from hexagonal-lattice.ipynb
rename to examples/hexagon/hexagonal-lattice.ipynb
diff --git a/post-processing.ipynb b/examples/post_process/post-processing.ipynb
similarity index 100%
rename from post-processing.ipynb
rename to examples/post_process/post-processing.ipynb
diff --git a/source-convergence/benchmark-1/openmc/geometry.xml b/stress-test/benchmark-1/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-1/openmc/geometry.xml
rename to stress-test/benchmark-1/geometry.xml
diff --git a/source-convergence/benchmark-1/openmc/materials.xml b/stress-test/benchmark-1/materials.xml
similarity index 100%
rename from source-convergence/benchmark-1/openmc/materials.xml
rename to stress-test/benchmark-1/materials.xml
diff --git a/source-convergence/benchmark-1/openmc/plots.xml b/stress-test/benchmark-1/plots.xml
similarity index 100%
rename from source-convergence/benchmark-1/openmc/plots.xml
rename to stress-test/benchmark-1/plots.xml
diff --git a/source-convergence/benchmark-1/openmc/settings.xml b/stress-test/benchmark-1/settings.xml
similarity index 100%
rename from source-convergence/benchmark-1/openmc/settings.xml
rename to stress-test/benchmark-1/settings.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_1/geometry.xml b/stress-test/benchmark-2/case1_1/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_1/geometry.xml
rename to stress-test/benchmark-2/case1_1/geometry.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_1/materials.xml b/stress-test/benchmark-2/case1_1/materials.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_1/materials.xml
rename to stress-test/benchmark-2/case1_1/materials.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_1/settings.xml b/stress-test/benchmark-2/case1_1/settings.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_1/settings.xml
rename to stress-test/benchmark-2/case1_1/settings.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_2/geometry.xml b/stress-test/benchmark-2/case1_2/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_2/geometry.xml
rename to stress-test/benchmark-2/case1_2/geometry.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_2/materials.xml b/stress-test/benchmark-2/case1_2/materials.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_2/materials.xml
rename to stress-test/benchmark-2/case1_2/materials.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_2/settings.xml b/stress-test/benchmark-2/case1_2/settings.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_2/settings.xml
rename to stress-test/benchmark-2/case1_2/settings.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_3/geometry.xml b/stress-test/benchmark-2/case1_3/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_3/geometry.xml
rename to stress-test/benchmark-2/case1_3/geometry.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_3/materials.xml b/stress-test/benchmark-2/case1_3/materials.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_3/materials.xml
rename to stress-test/benchmark-2/case1_3/materials.xml
diff --git a/source-convergence/benchmark-2/openmc/case1_3/settings.xml b/stress-test/benchmark-2/case1_3/settings.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case1_3/settings.xml
rename to stress-test/benchmark-2/case1_3/settings.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_1/geometry.xml b/stress-test/benchmark-2/case2_1/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_1/geometry.xml
rename to stress-test/benchmark-2/case2_1/geometry.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_1/materials.xml b/stress-test/benchmark-2/case2_1/materials.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_1/materials.xml
rename to stress-test/benchmark-2/case2_1/materials.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_1/settings.xml b/stress-test/benchmark-2/case2_1/settings.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_1/settings.xml
rename to stress-test/benchmark-2/case2_1/settings.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_2/geometry.xml b/stress-test/benchmark-2/case2_2/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_2/geometry.xml
rename to stress-test/benchmark-2/case2_2/geometry.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_2/materials.xml b/stress-test/benchmark-2/case2_2/materials.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_2/materials.xml
rename to stress-test/benchmark-2/case2_2/materials.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_2/settings.xml b/stress-test/benchmark-2/case2_2/settings.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_2/settings.xml
rename to stress-test/benchmark-2/case2_2/settings.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_3/geometry.xml b/stress-test/benchmark-2/case2_3/geometry.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_3/geometry.xml
rename to stress-test/benchmark-2/case2_3/geometry.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_3/materials.xml b/stress-test/benchmark-2/case2_3/materials.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_3/materials.xml
rename to stress-test/benchmark-2/case2_3/materials.xml
diff --git a/source-convergence/benchmark-2/openmc/case2_3/settings.xml b/stress-test/benchmark-2/case2_3/settings.xml
similarity index 100%
rename from source-convergence/benchmark-2/openmc/case2_3/settings.xml
rename to stress-test/benchmark-2/case2_3/settings.xml
diff --git a/Part2/Part2-Solutions.ipynb b/stress-test/lattice-computations/BEAVRS.ipynb
similarity index 100%
rename from Part2/Part2-Solutions.ipynb
rename to stress-test/lattice-computations/BEAVRS.ipynb
diff --git a/mc-performance/openmc/build.py b/stress-test/mc-performance/build.py
similarity index 100%
rename from mc-performance/openmc/build.py
rename to stress-test/mc-performance/build.py
diff --git a/mc-performance/openmc/generate_tallies.py b/stress-test/mc-performance/generate_tallies.py
similarity index 100%
rename from mc-performance/openmc/generate_tallies.py
rename to stress-test/mc-performance/generate_tallies.py
diff --git a/mg-criticality/make_library.py b/stress-test/mg-criticality/make_library.py
similarity index 100%
rename from mg-criticality/make_library.py
rename to stress-test/mg-criticality/make_library.py
diff --git a/mg-criticality/make_model.py b/stress-test/mg-criticality/make_model.py
similarity index 100%
rename from mg-criticality/make_model.py
rename to stress-test/mg-criticality/make_model.py
diff --git a/mg-criticality/repo.py b/stress-test/mg-criticality/repo.py
similarity index 100%
rename from mg-criticality/repo.py
rename to stress-test/mg-criticality/repo.py
diff --git a/mg-criticality/run_cases.py b/stress-test/mg-criticality/run_cases.py
similarity index 100%
rename from mg-criticality/run_cases.py
rename to stress-test/mg-criticality/run_cases.py
diff --git a/mdgxs-part-i.ipynb b/stress-test/multi-group-xs/mdgxs-part-i.ipynb
similarity index 100%
rename from mdgxs-part-i.ipynb
rename to stress-test/multi-group-xs/mdgxs-part-i.ipynb
diff --git a/mdgxs-part-ii.ipynb b/stress-test/multi-group-xs/mdgxs-part-ii.ipynb
similarity index 100%
rename from mdgxs-part-ii.ipynb
rename to stress-test/multi-group-xs/mdgxs-part-ii.ipynb
diff --git a/mgxs-part-i.ipynb b/stress-test/multi-group-xs/mgxs-part-i.ipynb
similarity index 100%
rename from mgxs-part-i.ipynb
rename to stress-test/multi-group-xs/mgxs-part-i.ipynb
diff --git a/mgxs-part-ii.ipynb b/stress-test/multi-group-xs/mgxs-part-ii.ipynb
similarity index 100%
rename from mgxs-part-ii.ipynb
rename to stress-test/multi-group-xs/mgxs-part-ii.ipynb
diff --git a/mgxs-part-iii.ipynb b/stress-test/multi-group-xs/mgxs-part-iii.ipynb
similarity index 100%
rename from mgxs-part-iii.ipynb
rename to stress-test/multi-group-xs/mgxs-part-iii.ipynb