diff --git a/output/bse_eighth_excitation b/output/H2/BSE/bse_eighth_excitation
similarity index 100%
rename from output/bse_eighth_excitation
rename to output/H2/BSE/bse_eighth_excitation
diff --git a/output/bse_fifth_excitation b/output/H2/BSE/bse_fifth_excitation
similarity index 100%
rename from output/bse_fifth_excitation
rename to output/H2/BSE/bse_fifth_excitation
diff --git a/output/bse_first_excitation b/output/H2/BSE/bse_first_excitation
similarity index 100%
rename from output/bse_first_excitation
rename to output/H2/BSE/bse_first_excitation
diff --git a/output/bse_fourth_excitation b/output/H2/BSE/bse_fourth_excitation
similarity index 100%
rename from output/bse_fourth_excitation
rename to output/H2/BSE/bse_fourth_excitation
diff --git a/output/bse_ninth_excitation b/output/H2/BSE/bse_ninth_excitation
similarity index 100%
rename from output/bse_ninth_excitation
rename to output/H2/BSE/bse_ninth_excitation
diff --git a/output/bse_second_excitation b/output/H2/BSE/bse_second_excitation
similarity index 100%
rename from output/bse_second_excitation
rename to output/H2/BSE/bse_second_excitation
diff --git a/output/bse_seventh_excitation b/output/H2/BSE/bse_seventh_excitation
similarity index 100%
rename from output/bse_seventh_excitation
rename to output/H2/BSE/bse_seventh_excitation
diff --git a/output/bse_sixth_excitation b/output/H2/BSE/bse_sixth_excitation
similarity index 100%
rename from output/bse_sixth_excitation
rename to output/H2/BSE/bse_sixth_excitation
diff --git a/output/bse_tenth_excitation b/output/H2/BSE/bse_tenth_excitation
similarity index 100%
rename from output/bse_tenth_excitation
rename to output/H2/BSE/bse_tenth_excitation
diff --git a/output/bse_third_excitation b/output/H2/BSE/bse_third_excitation
similarity index 100%
rename from output/bse_third_excitation
rename to output/H2/BSE/bse_third_excitation
diff --git a/output/cis_eighth_excitation b/output/H2/CIS/cis_eighth_excitation
similarity index 100%
rename from output/cis_eighth_excitation
rename to output/H2/CIS/cis_eighth_excitation
diff --git a/output/cis_fifth_excitation b/output/H2/CIS/cis_fifth_excitation
similarity index 100%
rename from output/cis_fifth_excitation
rename to output/H2/CIS/cis_fifth_excitation
diff --git a/output/cis_first_excitation b/output/H2/CIS/cis_first_excitation
similarity index 100%
rename from output/cis_first_excitation
rename to output/H2/CIS/cis_first_excitation
diff --git a/output/cis_fourth_excitation b/output/H2/CIS/cis_fourth_excitation
similarity index 100%
rename from output/cis_fourth_excitation
rename to output/H2/CIS/cis_fourth_excitation
diff --git a/output/cis_ninth_excitation b/output/H2/CIS/cis_ninth_excitation
similarity index 100%
rename from output/cis_ninth_excitation
rename to output/H2/CIS/cis_ninth_excitation
diff --git a/output/cis_second_excitation b/output/H2/CIS/cis_second_excitation
similarity index 100%
rename from output/cis_second_excitation
rename to output/H2/CIS/cis_second_excitation
diff --git a/output/cis_seventh_excitation b/output/H2/CIS/cis_seventh_excitation
similarity index 100%
rename from output/cis_seventh_excitation
rename to output/H2/CIS/cis_seventh_excitation
diff --git a/output/cis_sixth_excitation b/output/H2/CIS/cis_sixth_excitation
similarity index 100%
rename from output/cis_sixth_excitation
rename to output/H2/CIS/cis_sixth_excitation
diff --git a/output/cis_tenth_excitation b/output/H2/CIS/cis_tenth_excitation
similarity index 100%
rename from output/cis_tenth_excitation
rename to output/H2/CIS/cis_tenth_excitation
diff --git a/output/cis_third_excitation b/output/H2/CIS/cis_third_excitation
similarity index 100%
rename from output/cis_third_excitation
rename to output/H2/CIS/cis_third_excitation
diff --git a/output/eom_cssd_eighth_excitation b/output/H2/EOM-CCSD/eom_cssd_eighth_excitation
similarity index 100%
rename from output/eom_cssd_eighth_excitation
rename to output/H2/EOM-CCSD/eom_cssd_eighth_excitation
diff --git a/output/eom_cssd_fifth_excitation b/output/H2/EOM-CCSD/eom_cssd_fifth_excitation
similarity index 100%
rename from output/eom_cssd_fifth_excitation
rename to output/H2/EOM-CCSD/eom_cssd_fifth_excitation
diff --git a/output/eom_cssd_first_excitation b/output/H2/EOM-CCSD/eom_cssd_first_excitation
similarity index 100%
rename from output/eom_cssd_first_excitation
rename to output/H2/EOM-CCSD/eom_cssd_first_excitation
diff --git a/output/eom_cssd_fourth_excitation b/output/H2/EOM-CCSD/eom_cssd_fourth_excitation
similarity index 100%
rename from output/eom_cssd_fourth_excitation
rename to output/H2/EOM-CCSD/eom_cssd_fourth_excitation
diff --git a/output/eom_cssd_ninth_excitation b/output/H2/EOM-CCSD/eom_cssd_ninth_excitation
similarity index 100%
rename from output/eom_cssd_ninth_excitation
rename to output/H2/EOM-CCSD/eom_cssd_ninth_excitation
diff --git a/output/eom_cssd_second_excitation b/output/H2/EOM-CCSD/eom_cssd_second_excitation
similarity index 100%
rename from output/eom_cssd_second_excitation
rename to output/H2/EOM-CCSD/eom_cssd_second_excitation
diff --git a/output/eom_cssd_seventh_excitation b/output/H2/EOM-CCSD/eom_cssd_seventh_excitation
similarity index 100%
rename from output/eom_cssd_seventh_excitation
rename to output/H2/EOM-CCSD/eom_cssd_seventh_excitation
diff --git a/output/eom_cssd_sixth_excitation b/output/H2/EOM-CCSD/eom_cssd_sixth_excitation
similarity index 100%
rename from output/eom_cssd_sixth_excitation
rename to output/H2/EOM-CCSD/eom_cssd_sixth_excitation
diff --git a/output/eom_cssd_tenth_excitation b/output/H2/EOM-CCSD/eom_cssd_tenth_excitation
similarity index 100%
rename from output/eom_cssd_tenth_excitation
rename to output/H2/EOM-CCSD/eom_cssd_tenth_excitation
diff --git a/output/eom_cssd_third_excitation b/output/H2/EOM-CCSD/eom_cssd_third_excitation
similarity index 100%
rename from output/eom_cssd_third_excitation
rename to output/H2/EOM-CCSD/eom_cssd_third_excitation
diff --git a/output/eom_ucssd_eighth_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_eighth_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_eighth_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_eighth_triplet_excitation
diff --git a/output/eom_ucssd_fifth_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_fifth_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_fifth_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_fifth_triplet_excitation
diff --git a/output/eom_ucssd_first_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_first_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_first_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_first_triplet_excitation
diff --git a/output/eom_ucssd_fourth_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_fourth_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_fourth_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_fourth_triplet_excitation
diff --git a/output/eom_ucssd_ninth_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_ninth_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_ninth_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_ninth_triplet_excitation
diff --git a/output/eom_ucssd_second_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_second_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_second_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_second_triplet_excitation
diff --git a/output/eom_ucssd_seventh_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_seventh_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_seventh_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_seventh_triplet_excitation
diff --git a/output/eom_ucssd_sixth_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_sixth_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_sixth_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_sixth_triplet_excitation
diff --git a/output/eom_ucssd_tenth_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_tenth_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_tenth_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_tenth_triplet_excitation
diff --git a/output/eom_ucssd_third_triplet_excitation b/output/H2/EOM-CCSD/eom_ucssd_third_triplet_excitation
similarity index 100%
rename from output/eom_ucssd_third_triplet_excitation
rename to output/H2/EOM-CCSD/eom_ucssd_third_triplet_excitation
diff --git a/output/sf_bse_eighth_excitation b/output/H2/SF-BSE/sf_bse_eighth_excitation
similarity index 100%
rename from output/sf_bse_eighth_excitation
rename to output/H2/SF-BSE/sf_bse_eighth_excitation
diff --git a/output/sf_bse_fifth_excitation b/output/H2/SF-BSE/sf_bse_fifth_excitation
similarity index 100%
rename from output/sf_bse_fifth_excitation
rename to output/H2/SF-BSE/sf_bse_fifth_excitation
diff --git a/output/sf_bse_first_excitation b/output/H2/SF-BSE/sf_bse_first_excitation
similarity index 100%
rename from output/sf_bse_first_excitation
rename to output/H2/SF-BSE/sf_bse_first_excitation
diff --git a/output/sf_bse_fourth_excitation b/output/H2/SF-BSE/sf_bse_fourth_excitation
similarity index 100%
rename from output/sf_bse_fourth_excitation
rename to output/H2/SF-BSE/sf_bse_fourth_excitation
diff --git a/output/sf_bse_ninth_excitation b/output/H2/SF-BSE/sf_bse_ninth_excitation
similarity index 100%
rename from output/sf_bse_ninth_excitation
rename to output/H2/SF-BSE/sf_bse_ninth_excitation
diff --git a/output/sf_bse_second_excitation b/output/H2/SF-BSE/sf_bse_second_excitation
similarity index 100%
rename from output/sf_bse_second_excitation
rename to output/H2/SF-BSE/sf_bse_second_excitation
diff --git a/output/sf_bse_seventh_excitation b/output/H2/SF-BSE/sf_bse_seventh_excitation
similarity index 100%
rename from output/sf_bse_seventh_excitation
rename to output/H2/SF-BSE/sf_bse_seventh_excitation
diff --git a/output/sf_bse_sixth_excitation b/output/H2/SF-BSE/sf_bse_sixth_excitation
similarity index 100%
rename from output/sf_bse_sixth_excitation
rename to output/H2/SF-BSE/sf_bse_sixth_excitation
diff --git a/output/sf_bse_tenth_excitation b/output/H2/SF-BSE/sf_bse_tenth_excitation
similarity index 100%
rename from output/sf_bse_tenth_excitation
rename to output/H2/SF-BSE/sf_bse_tenth_excitation
diff --git a/output/sf_bse_third_excitation b/output/H2/SF-BSE/sf_bse_third_excitation
similarity index 100%
rename from output/sf_bse_third_excitation
rename to output/H2/SF-BSE/sf_bse_third_excitation
diff --git a/output/sf_cis_eighth_excitation b/output/H2/SF-CIS/sf_cis_eighth_excitation
similarity index 100%
rename from output/sf_cis_eighth_excitation
rename to output/H2/SF-CIS/sf_cis_eighth_excitation
diff --git a/output/sf_cis_fifth_excitation b/output/H2/SF-CIS/sf_cis_fifth_excitation
similarity index 100%
rename from output/sf_cis_fifth_excitation
rename to output/H2/SF-CIS/sf_cis_fifth_excitation
diff --git a/output/sf_cis_first_excitation b/output/H2/SF-CIS/sf_cis_first_excitation
similarity index 100%
rename from output/sf_cis_first_excitation
rename to output/H2/SF-CIS/sf_cis_first_excitation
diff --git a/output/sf_cis_fourth_excitation b/output/H2/SF-CIS/sf_cis_fourth_excitation
similarity index 100%
rename from output/sf_cis_fourth_excitation
rename to output/H2/SF-CIS/sf_cis_fourth_excitation
diff --git a/output/sf_cis_ninth_excitation b/output/H2/SF-CIS/sf_cis_ninth_excitation
similarity index 100%
rename from output/sf_cis_ninth_excitation
rename to output/H2/SF-CIS/sf_cis_ninth_excitation
diff --git a/output/sf_cis_second_excitation b/output/H2/SF-CIS/sf_cis_second_excitation
similarity index 100%
rename from output/sf_cis_second_excitation
rename to output/H2/SF-CIS/sf_cis_second_excitation
diff --git a/output/sf_cis_seventh_excitation b/output/H2/SF-CIS/sf_cis_seventh_excitation
similarity index 100%
rename from output/sf_cis_seventh_excitation
rename to output/H2/SF-CIS/sf_cis_seventh_excitation
diff --git a/output/sf_cis_sixth_excitation b/output/H2/SF-CIS/sf_cis_sixth_excitation
similarity index 100%
rename from output/sf_cis_sixth_excitation
rename to output/H2/SF-CIS/sf_cis_sixth_excitation
diff --git a/output/sf_cis_tenth_excitation b/output/H2/SF-CIS/sf_cis_tenth_excitation
similarity index 100%
rename from output/sf_cis_tenth_excitation
rename to output/H2/SF-CIS/sf_cis_tenth_excitation
diff --git a/output/sf_cis_third_excitation b/output/H2/SF-CIS/sf_cis_third_excitation
similarity index 100%
rename from output/sf_cis_third_excitation
rename to output/H2/SF-CIS/sf_cis_third_excitation
diff --git a/output/sf_tddft_eighth_excitation b/output/H2/SF-TDDFT/sf_tddft_eighth_excitation
similarity index 100%
rename from output/sf_tddft_eighth_excitation
rename to output/H2/SF-TDDFT/sf_tddft_eighth_excitation
diff --git a/output/sf_tddft_fifth_excitation b/output/H2/SF-TDDFT/sf_tddft_fifth_excitation
similarity index 100%
rename from output/sf_tddft_fifth_excitation
rename to output/H2/SF-TDDFT/sf_tddft_fifth_excitation
diff --git a/output/sf_tddft_first_excitation b/output/H2/SF-TDDFT/sf_tddft_first_excitation
similarity index 100%
rename from output/sf_tddft_first_excitation
rename to output/H2/SF-TDDFT/sf_tddft_first_excitation
diff --git a/output/sf_tddft_fourth_excitation b/output/H2/SF-TDDFT/sf_tddft_fourth_excitation
similarity index 100%
rename from output/sf_tddft_fourth_excitation
rename to output/H2/SF-TDDFT/sf_tddft_fourth_excitation
diff --git a/output/sf_tddft_ninth_excitation b/output/H2/SF-TDDFT/sf_tddft_ninth_excitation
similarity index 100%
rename from output/sf_tddft_ninth_excitation
rename to output/H2/SF-TDDFT/sf_tddft_ninth_excitation
diff --git a/output/sf_tddft_second_excitation b/output/H2/SF-TDDFT/sf_tddft_second_excitation
similarity index 100%
rename from output/sf_tddft_second_excitation
rename to output/H2/SF-TDDFT/sf_tddft_second_excitation
diff --git a/output/sf_tddft_seventh_excitation b/output/H2/SF-TDDFT/sf_tddft_seventh_excitation
similarity index 100%
rename from output/sf_tddft_seventh_excitation
rename to output/H2/SF-TDDFT/sf_tddft_seventh_excitation
diff --git a/output/sf_tddft_sixth_excitation b/output/H2/SF-TDDFT/sf_tddft_sixth_excitation
similarity index 100%
rename from output/sf_tddft_sixth_excitation
rename to output/H2/SF-TDDFT/sf_tddft_sixth_excitation
diff --git a/output/sf_tddft_tenth_excitation b/output/H2/SF-TDDFT/sf_tddft_tenth_excitation
similarity index 100%
rename from output/sf_tddft_tenth_excitation
rename to output/H2/SF-TDDFT/sf_tddft_tenth_excitation
diff --git a/output/sf_tddft_third_excitation b/output/H2/SF-TDDFT/sf_tddft_third_excitation
similarity index 100%
rename from output/sf_tddft_third_excitation
rename to output/H2/SF-TDDFT/sf_tddft_third_excitation
diff --git a/output/tddft_eighth_excitation b/output/H2/TDDFT/tddft_eighth_excitation
similarity index 100%
rename from output/tddft_eighth_excitation
rename to output/H2/TDDFT/tddft_eighth_excitation
diff --git a/output/tddft_fifth_excitation b/output/H2/TDDFT/tddft_fifth_excitation
similarity index 100%
rename from output/tddft_fifth_excitation
rename to output/H2/TDDFT/tddft_fifth_excitation
diff --git a/output/tddft_first_excitation b/output/H2/TDDFT/tddft_first_excitation
similarity index 100%
rename from output/tddft_first_excitation
rename to output/H2/TDDFT/tddft_first_excitation
diff --git a/output/tddft_fourth_excitation b/output/H2/TDDFT/tddft_fourth_excitation
similarity index 100%
rename from output/tddft_fourth_excitation
rename to output/H2/TDDFT/tddft_fourth_excitation
diff --git a/output/tddft_ninth_excitation b/output/H2/TDDFT/tddft_ninth_excitation
similarity index 100%
rename from output/tddft_ninth_excitation
rename to output/H2/TDDFT/tddft_ninth_excitation
diff --git a/output/tddft_second_excitation b/output/H2/TDDFT/tddft_second_excitation
similarity index 100%
rename from output/tddft_second_excitation
rename to output/H2/TDDFT/tddft_second_excitation
diff --git a/output/tddft_seventh_excitation b/output/H2/TDDFT/tddft_seventh_excitation
similarity index 100%
rename from output/tddft_seventh_excitation
rename to output/H2/TDDFT/tddft_seventh_excitation
diff --git a/output/tddft_sixth_excitation b/output/H2/TDDFT/tddft_sixth_excitation
similarity index 100%
rename from output/tddft_sixth_excitation
rename to output/H2/TDDFT/tddft_sixth_excitation
diff --git a/output/tddft_tenth_excitation b/output/H2/TDDFT/tddft_tenth_excitation
similarity index 100%
rename from output/tddft_tenth_excitation
rename to output/H2/TDDFT/tddft_tenth_excitation
diff --git a/output/tddft_third_excitation b/output/H2/TDDFT/tddft_third_excitation
similarity index 100%
rename from output/tddft_third_excitation
rename to output/H2/TDDFT/tddft_third_excitation