diff --git a/installation/AMD Core Math Library/acml-4-4-0-ifort-64bit.tgz b/installation/ACML/acml-4-4-0-ifort-64bit.tgz
similarity index 100%
rename from installation/AMD Core Math Library/acml-4-4-0-ifort-64bit.tgz
rename to installation/ACML/acml-4-4-0-ifort-64bit.tgz
diff --git a/installation/AMD Core Math Library/install.txt b/installation/ACML/install.txt
similarity index 100%
rename from installation/AMD Core Math Library/install.txt
rename to installation/ACML/install.txt
diff --git a/installation/Abaqus_mods/abaqus_v6.env b/installation/mods_Abaqus/abaqus_v6.env
similarity index 100%
rename from installation/Abaqus_mods/abaqus_v6.env
rename to installation/mods_Abaqus/abaqus_v6.env
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user b/installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user.org b/installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user_h b/installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user_h
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user_h
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user_h
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user_mp b/installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user_mp
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/comp_user_mp
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/comp_user_mp
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/include_linux64 b/installation/mods_MarcMentat2010/2010.2/Marc_tools/include_linux64
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/include_linux64
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/include_linux64
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/include_linux64.org b/installation/mods_MarcMentat2010/2010.2/Marc_tools/include_linux64.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/include_linux64.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_h_marc b/installation/mods_MarcMentat2010/2010.2/Marc_tools/run_h_marc
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_h_marc
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/run_h_marc
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_marc b/installation/mods_MarcMentat2010/2010.2/Marc_tools/run_marc
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_marc
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/run_marc
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_marc.org b/installation/mods_MarcMentat2010/2010.2/Marc_tools/run_marc.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/run_marc.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_mp_marc b/installation/mods_MarcMentat2010/2010.2/Marc_tools/run_mp_marc
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Marc_tools/run_mp_marc
rename to installation/mods_MarcMentat2010/2010.2/Marc_tools/run_mp_marc
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/edit_window b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/edit_window
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/edit_window
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/edit_window
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/edit_window.org b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/edit_window.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/edit_window.org
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/edit_window.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit1 b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit1
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit1
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit1
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit1.org b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit1.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit1.org
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit1.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit2 b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit2
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit2
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit2
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit2.org b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit2.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit2.org
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit2.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit3 b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit3
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit3
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit3
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit3.org b/installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit3.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_bin/submit3.org
rename to installation/mods_MarcMentat2010/2010.2/Mentat_bin/submit3.org
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_menus/job_run.ms b/installation/mods_MarcMentat2010/2010.2/Mentat_menus/job_run.ms
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_menus/job_run.ms
rename to installation/mods_MarcMentat2010/2010.2/Mentat_menus/job_run.ms
diff --git a/installation/Marc_Mentat2010_mods/2010.2/Mentat_menus/job_run.ms.org b/installation/mods_MarcMentat2010/2010.2/Mentat_menus/job_run.ms.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010.2/Mentat_menus/job_run.ms.org
rename to installation/mods_MarcMentat2010/2010.2/Mentat_menus/job_run.ms.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user b/installation/mods_MarcMentat2010/2010/Marc_tools/comp_user
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user
rename to installation/mods_MarcMentat2010/2010/Marc_tools/comp_user
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user.org b/installation/mods_MarcMentat2010/2010/Marc_tools/comp_user.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat2010/2010/Marc_tools/comp_user.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user_h b/installation/mods_MarcMentat2010/2010/Marc_tools/comp_user_h
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user_h
rename to installation/mods_MarcMentat2010/2010/Marc_tools/comp_user_h
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user_mp b/installation/mods_MarcMentat2010/2010/Marc_tools/comp_user_mp
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/comp_user_mp
rename to installation/mods_MarcMentat2010/2010/Marc_tools/comp_user_mp
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/include_linux64 b/installation/mods_MarcMentat2010/2010/Marc_tools/include_linux64
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/include_linux64
rename to installation/mods_MarcMentat2010/2010/Marc_tools/include_linux64
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/include_linux64.org b/installation/mods_MarcMentat2010/2010/Marc_tools/include_linux64.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat2010/2010/Marc_tools/include_linux64.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/run_h_marc b/installation/mods_MarcMentat2010/2010/Marc_tools/run_h_marc
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/run_h_marc
rename to installation/mods_MarcMentat2010/2010/Marc_tools/run_h_marc
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/run_marc b/installation/mods_MarcMentat2010/2010/Marc_tools/run_marc
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/run_marc
rename to installation/mods_MarcMentat2010/2010/Marc_tools/run_marc
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/run_marc.org b/installation/mods_MarcMentat2010/2010/Marc_tools/run_marc.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat2010/2010/Marc_tools/run_marc.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Marc_tools/run_mp_marc b/installation/mods_MarcMentat2010/2010/Marc_tools/run_mp_marc
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Marc_tools/run_mp_marc
rename to installation/mods_MarcMentat2010/2010/Marc_tools/run_mp_marc
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/edit_window b/installation/mods_MarcMentat2010/2010/Mentat_bin/edit_window
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/edit_window
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/edit_window
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/edit_window.org b/installation/mods_MarcMentat2010/2010/Mentat_bin/edit_window.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/edit_window.org
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/edit_window.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit1 b/installation/mods_MarcMentat2010/2010/Mentat_bin/submit1
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit1
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/submit1
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit1.org b/installation/mods_MarcMentat2010/2010/Mentat_bin/submit1.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit1.org
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/submit1.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit2 b/installation/mods_MarcMentat2010/2010/Mentat_bin/submit2
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit2
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/submit2
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit2.org b/installation/mods_MarcMentat2010/2010/Mentat_bin/submit2.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit2.org
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/submit2.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit3 b/installation/mods_MarcMentat2010/2010/Mentat_bin/submit3
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit3
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/submit3
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit3.org b/installation/mods_MarcMentat2010/2010/Mentat_bin/submit3.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_bin/submit3.org
rename to installation/mods_MarcMentat2010/2010/Mentat_bin/submit3.org
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_menus/job_run.ms b/installation/mods_MarcMentat2010/2010/Mentat_menus/job_run.ms
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_menus/job_run.ms
rename to installation/mods_MarcMentat2010/2010/Mentat_menus/job_run.ms
diff --git a/installation/Marc_Mentat2010_mods/2010/Mentat_menus/job_run.ms.org b/installation/mods_MarcMentat2010/2010/Mentat_menus/job_run.ms.org
similarity index 100%
rename from installation/Marc_Mentat2010_mods/2010/Mentat_menus/job_run.ms.org
rename to installation/mods_MarcMentat2010/2010/Mentat_menus/job_run.ms.org
diff --git a/installation/Marc_Mentat2010_mods/apply_MPIE_modifications b/installation/mods_MarcMentat2010/apply_MPIE_modifications
similarity index 100%
rename from installation/Marc_Mentat2010_mods/apply_MPIE_modifications
rename to installation/mods_MarcMentat2010/apply_MPIE_modifications
diff --git a/installation/Marc_Mentat2010_mods/installation.txt b/installation/mods_MarcMentat2010/installation.txt
similarity index 100%
rename from installation/Marc_Mentat2010_mods/installation.txt
rename to installation/mods_MarcMentat2010/installation.txt