diff --git a/README.md b/README.md index c8fe4972fe7cfd100379dd0052363205ff080fe6..af9a84a089f579ac23ffe0e33562e980458de91a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -This is the main repository of the [NOMAD](http://nomad-lab.eu) parser for +This is the main repository of the [NOMAD](https://www.nomad-coe.eu/) parser for [CP2K](https://www.cp2k.org/). # Example diff --git a/parser/parser-cp2k/cp2kparser/scalainterface.py b/parser/parser-cp2k/cp2kparser/scalainterface.py index 30044097b1aa171902a89944cc53db4efd363f4a..0ce2f0c3cc6f284e67167f84a3712cb18f46deb6 100644 --- a/parser/parser-cp2k/cp2kparser/scalainterface.py +++ b/parser/parser-cp2k/cp2kparser/scalainterface.py @@ -13,5 +13,5 @@ if __name__ == "__main__": # Initialise the parser with the main filename and a JSON backend main_file = sys.argv[1] - parser = CP2KParser(main_file, backend=JsonParseEventsWriterBackend) - parser.parse() + parser = CP2KParser(backend=JsonParseEventsWriterBackend) + parser.parse(main_file) diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/BASIS_SET b/regtests/cp2k_2.6.2/BASIS_SET similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/BASIS_SET rename to regtests/cp2k_2.6.2/BASIS_SET diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/GTH_POTENTIALS b/regtests/cp2k_2.6.2/GTH_POTENTIALS similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/GTH_POTENTIALS rename to regtests/cp2k_2.6.2/GTH_POTENTIALS diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/b3lyp/b3lyp.inp b/regtests/cp2k_2.6.2/XC_functional/b3lyp/b3lyp.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/b3lyp/b3lyp.inp rename to regtests/cp2k_2.6.2/XC_functional/b3lyp/b3lyp.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/b3lyp/unittest.out b/regtests/cp2k_2.6.2/XC_functional/b3lyp/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/b3lyp/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/b3lyp/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/blyp/blyp.inp b/regtests/cp2k_2.6.2/XC_functional/blyp/blyp.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/blyp/blyp.inp rename to regtests/cp2k_2.6.2/XC_functional/blyp/blyp.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/blyp/unittest.out b/regtests/cp2k_2.6.2/XC_functional/blyp/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/blyp/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/blyp/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/hcth120/hcth120.inp b/regtests/cp2k_2.6.2/XC_functional/hcth120/hcth120.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/hcth120/hcth120.inp rename to regtests/cp2k_2.6.2/XC_functional/hcth120/hcth120.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/hcth120/unittest.out b/regtests/cp2k_2.6.2/XC_functional/hcth120/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/hcth120/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/hcth120/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/lda/lda.inp b/regtests/cp2k_2.6.2/XC_functional/lda/lda.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/lda/lda.inp rename to regtests/cp2k_2.6.2/XC_functional/lda/lda.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/lda/unittest.out b/regtests/cp2k_2.6.2/XC_functional/lda/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/lda/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/lda/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/olyp/olyp.inp b/regtests/cp2k_2.6.2/XC_functional/olyp/olyp.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/olyp/olyp.inp rename to regtests/cp2k_2.6.2/XC_functional/olyp/olyp.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/olyp/unittest.out b/regtests/cp2k_2.6.2/XC_functional/olyp/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/olyp/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/olyp/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pade/pade.inp b/regtests/cp2k_2.6.2/XC_functional/pade/pade.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pade/pade.inp rename to regtests/cp2k_2.6.2/XC_functional/pade/pade.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pade/unittest.out b/regtests/cp2k_2.6.2/XC_functional/pade/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pade/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/pade/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe/pbe.inp b/regtests/cp2k_2.6.2/XC_functional/pbe/pbe.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe/pbe.inp rename to regtests/cp2k_2.6.2/XC_functional/pbe/pbe.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe/unittest.out b/regtests/cp2k_2.6.2/XC_functional/pbe/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/pbe/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe0/pbe0.inp b/regtests/cp2k_2.6.2/XC_functional/pbe0/pbe0.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe0/pbe0.inp rename to regtests/cp2k_2.6.2/XC_functional/pbe0/pbe0.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe0/unittest.out b/regtests/cp2k_2.6.2/XC_functional/pbe0/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/XC_functional/pbe0/unittest.out rename to regtests/cp2k_2.6.2/XC_functional/pbe0/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/default/default.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/default/default.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/default/default.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/default/default.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/default/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/default/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/default/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/default/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/none/none.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/none/none.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/none/none.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/none/none.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/none/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/none/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/none/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/none/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/x/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/x/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/x/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/x/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/x/x.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/x/x.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/x/x.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/x/x.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xy/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/xy/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xy/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/xy/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xy/xy.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/xy/xy.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xy/xy.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/xy/xy.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xyz/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/xyz/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xyz/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/xyz/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xyz/xyz.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/xyz/xyz.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xyz/xyz.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/xyz/xyz.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xz/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/xz/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xz/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/xz/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xz/xz.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/xz/xz.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/xz/xz.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/xz/xz.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/y/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/y/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/y/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/y/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/y/y.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/y/y.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/y/y.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/y/y.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/yz/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/yz/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/yz/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/yz/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/yz/yz.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/yz/yz.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/yz/yz.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/yz/yz.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/z/unittest.out b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/z/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/z/unittest.out rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/z/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/z/z.inp b/regtests/cp2k_2.6.2/configuration_periodic_dimensions/z/z.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/configuration_periodic_dimensions/z/z.inp rename to regtests/cp2k_2.6.2/configuration_periodic_dimensions/z/z.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/converged/Si_bulk8-nonbonded_nl_p0-1.out b/regtests/cp2k_2.6.2/convergence/converged/Si_bulk8-nonbonded_nl_p0-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/converged/Si_bulk8-nonbonded_nl_p0-1.out rename to regtests/cp2k_2.6.2/convergence/converged/Si_bulk8-nonbonded_nl_p0-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/converged/converged.inp b/regtests/cp2k_2.6.2/convergence/converged/converged.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/converged/converged.inp rename to regtests/cp2k_2.6.2/convergence/converged/converged.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/converged/unittest.out b/regtests/cp2k_2.6.2/convergence/converged/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/converged/unittest.out rename to regtests/cp2k_2.6.2/convergence/converged/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/non_converged/non_converged.inp b/regtests/cp2k_2.6.2/convergence/non_converged/non_converged.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/non_converged/non_converged.inp rename to regtests/cp2k_2.6.2/convergence/non_converged/non_converged.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/non_converged/unittest.out b/regtests/cp2k_2.6.2/convergence/non_converged/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/convergence/non_converged/unittest.out rename to regtests/cp2k_2.6.2/convergence/non_converged/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_no_input/unittest.out b/regtests/cp2k_2.6.2/electronic_structure_method/dft_no_input/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_no_input/unittest.out rename to regtests/cp2k_2.6.2/electronic_structure_method/dft_no_input/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-BFGS.Hessian b/regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-BFGS.Hessian similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-BFGS.Hessian rename to regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-BFGS.Hessian diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-pos-1.xyz b/regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-pos-1.xyz rename to regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag.inp b/regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag.inp rename to regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/H2O-rks-diag.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/RESTART-rks-diag b/regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/RESTART-rks-diag similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/RESTART-rks-diag rename to regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/RESTART-rks-diag diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/unittest.out b/regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/dft_plus_u/unittest.out rename to regtests/cp2k_2.6.2/electronic_structure_method/dft_plus_u/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/mp2/H2O-01.inp b/regtests/cp2k_2.6.2/electronic_structure_method/mp2/H2O-01.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/mp2/H2O-01.inp rename to regtests/cp2k_2.6.2/electronic_structure_method/mp2/H2O-01.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/mp2/unittest.out b/regtests/cp2k_2.6.2/electronic_structure_method/mp2/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/mp2/unittest.out rename to regtests/cp2k_2.6.2/electronic_structure_method/mp2/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/rpa/H2O_gas.xyz b/regtests/cp2k_2.6.2/electronic_structure_method/rpa/H2O_gas.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/rpa/H2O_gas.xyz rename to regtests/cp2k_2.6.2/electronic_structure_method/rpa/H2O_gas.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/rpa/RI_RPA_H2O.inp b/regtests/cp2k_2.6.2/electronic_structure_method/rpa/RI_RPA_H2O.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/rpa/RI_RPA_H2O.inp rename to regtests/cp2k_2.6.2/electronic_structure_method/rpa/RI_RPA_H2O.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/rpa/unittest.out b/regtests/cp2k_2.6.2/electronic_structure_method/rpa/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/electronic_structure_method/rpa/unittest.out rename to regtests/cp2k_2.6.2/electronic_structure_method/rpa/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p0-1.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p0-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p0-1.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p0-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p1-1.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p1-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p1-1.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p1-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p2-1.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p2-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p2-1.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p2-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p3-1.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p3-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p3-1.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8-nonbonded_nl_p3-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p1.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p1.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p2.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p2.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p2.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p2.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p3.out b/regtests/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p3.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p3.out rename to regtests/cp2k_2.6.2/energy_force/Si_bulk8_localLog_p3.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/si_bulk8.inp b/regtests/cp2k_2.6.2/energy_force/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/si_bulk8.inp rename to regtests/cp2k_2.6.2/energy_force/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/unittest.out b/regtests/cp2k_2.6.2/energy_force/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/energy_force/unittest.out rename to regtests/cp2k_2.6.2/energy_force/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/invalid_file/unittest.out b/regtests/cp2k_2.6.2/errors/invalid_file/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/invalid_file/unittest.out rename to regtests/cp2k_2.6.2/errors/invalid_file/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/invalid_run_type/unittest.out b/regtests/cp2k_2.6.2/errors/invalid_run_type/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/invalid_run_type/unittest.out rename to regtests/cp2k_2.6.2/errors/invalid_run_type/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_keyword/si_bulk8.inp b/regtests/cp2k_2.6.2/errors/unknown_input_keyword/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_keyword/si_bulk8.inp rename to regtests/cp2k_2.6.2/errors/unknown_input_keyword/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_keyword/unittest.out b/regtests/cp2k_2.6.2/errors/unknown_input_keyword/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_keyword/unittest.out rename to regtests/cp2k_2.6.2/errors/unknown_input_keyword/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section/si_bulk8.inp b/regtests/cp2k_2.6.2/errors/unknown_input_section/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section/si_bulk8.inp rename to regtests/cp2k_2.6.2/errors/unknown_input_section/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section/unittest.out b/regtests/cp2k_2.6.2/errors/unknown_input_section/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section/unittest.out rename to regtests/cp2k_2.6.2/errors/unknown_input_section/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section_parameter/si_bulk8.inp b/regtests/cp2k_2.6.2/errors/unknown_input_section_parameter/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section_parameter/si_bulk8.inp rename to regtests/cp2k_2.6.2/errors/unknown_input_section_parameter/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section_parameter/unittest.out b/regtests/cp2k_2.6.2/errors/unknown_input_section_parameter/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_input_section_parameter/unittest.out rename to regtests/cp2k_2.6.2/errors/unknown_input_section_parameter/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_version/si_bulk8.inp b/regtests/cp2k_2.6.2/errors/unknown_version/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_version/si_bulk8.inp rename to regtests/cp2k_2.6.2/errors/unknown_version/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_version/unittest.out b/regtests/cp2k_2.6.2/errors/unknown_version/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/errors/unknown_version/unittest.out rename to regtests/cp2k_2.6.2/errors/unknown_version/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/force_file/single_point/Si_bulk8-forces-1_0.xyz b/regtests/cp2k_2.6.2/force_file/single_point/Si_bulk8-forces-1_0.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/force_file/single_point/Si_bulk8-forces-1_0.xyz rename to regtests/cp2k_2.6.2/force_file/single_point/Si_bulk8-forces-1_0.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/force_file/single_point/single_point.inp b/regtests/cp2k_2.6.2/force_file/single_point/single_point.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/force_file/single_point/single_point.inp rename to regtests/cp2k_2.6.2/force_file/single_point/single_point.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/force_file/single_point/unittest.out b/regtests/cp2k_2.6.2/force_file/single_point/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/force_file/single_point/unittest.out rename to regtests/cp2k_2.6.2/force_file/single_point/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/H2O-BFGS.Hessian b/regtests/cp2k_2.6.2/geo_opt/bfgs/H2O-BFGS.Hessian similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/H2O-BFGS.Hessian rename to regtests/cp2k_2.6.2/geo_opt/bfgs/H2O-BFGS.Hessian diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/H2O-pos-1.xyz b/regtests/cp2k_2.6.2/geo_opt/bfgs/H2O-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/H2O-pos-1.xyz rename to regtests/cp2k_2.6.2/geo_opt/bfgs/H2O-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/bfgs/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/bfgs/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/unittest.out b/regtests/cp2k_2.6.2/geo_opt/bfgs/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/bfgs/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/bfgs/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/cg/H2O-pos-1.xyz b/regtests/cp2k_2.6.2/geo_opt/cg/H2O-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/cg/H2O-pos-1.xyz rename to regtests/cp2k_2.6.2/geo_opt/cg/H2O-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/cg/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/cg/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/cg/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/cg/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/cg/unittest.out b/regtests/cp2k_2.6.2/geo_opt/cg/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/cg/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/cg/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/each/H2O-pos-1.xyz b/regtests/cp2k_2.6.2/geo_opt/each/H2O-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/each/H2O-pos-1.xyz rename to regtests/cp2k_2.6.2/geo_opt/each/H2O-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/each/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/each/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/each/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/each/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/each/unittest.out b/regtests/cp2k_2.6.2/geo_opt/each/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/each/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/each/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/filename/H2O-customname-pos-1.xyz b/regtests/cp2k_2.6.2/geo_opt/filename/H2O-customname-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/filename/H2O-customname-pos-1.xyz rename to regtests/cp2k_2.6.2/geo_opt/filename/H2O-customname-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/filename/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/filename/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/filename/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/filename/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/filename/unittest.out b/regtests/cp2k_2.6.2/geo_opt/filename/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/filename/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/filename/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/dcd/H2O-geometry-pos-1.dcd b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/dcd/H2O-geometry-pos-1.dcd similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/dcd/H2O-geometry-pos-1.dcd rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/dcd/H2O-geometry-pos-1.dcd diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/dcd/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/dcd/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/dcd/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/dcd/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/dcd/unittest.out b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/dcd/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/dcd/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/dcd/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/pdb/H2O-geometry-pos-1.pdb b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/pdb/H2O-geometry-pos-1.pdb similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/pdb/H2O-geometry-pos-1.pdb rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/pdb/H2O-geometry-pos-1.pdb diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/pdb/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/pdb/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/pdb/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/pdb/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/pdb/unittest.out b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/pdb/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/pdb/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/pdb/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/xyz/H2O-geometry-pos-1.xyz b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/xyz/H2O-geometry-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/xyz/H2O-geometry-pos-1.xyz rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/xyz/H2O-geometry-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/xyz/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/xyz/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/xyz/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/xyz/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/xyz/unittest.out b/regtests/cp2k_2.6.2/geo_opt/geometry_formats/xyz/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/geometry_formats/xyz/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/geometry_formats/xyz/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/lbfgs/H2O-pos-1.xyz b/regtests/cp2k_2.6.2/geo_opt/lbfgs/H2O-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/lbfgs/H2O-pos-1.xyz rename to regtests/cp2k_2.6.2/geo_opt/lbfgs/H2O-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/lbfgs/geo_opt.inp b/regtests/cp2k_2.6.2/geo_opt/lbfgs/geo_opt.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/lbfgs/geo_opt.inp rename to regtests/cp2k_2.6.2/geo_opt/lbfgs/geo_opt.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/lbfgs/unittest.out b/regtests/cp2k_2.6.2/geo_opt/lbfgs/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/geo_opt/lbfgs/unittest.out rename to regtests/cp2k_2.6.2/geo_opt/lbfgs/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/comments/si_bulk8.inp b/regtests/cp2k_2.6.2/input_preprocessing/comments/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/comments/si_bulk8.inp rename to regtests/cp2k_2.6.2/input_preprocessing/comments/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/comments/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/comments/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/comments/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/comments/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/include/global.inc b/regtests/cp2k_2.6.2/input_preprocessing/include/global.inc similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/include/global.inc rename to regtests/cp2k_2.6.2/input_preprocessing/include/global.inc diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/include/main.inp b/regtests/cp2k_2.6.2/input_preprocessing/include/main.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/include/main.inp rename to regtests/cp2k_2.6.2/input_preprocessing/include/main.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/include/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/include/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/include/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/include/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/tabseparator/si_bulk8.inp b/regtests/cp2k_2.6.2/input_preprocessing/tabseparator/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/tabseparator/si_bulk8.inp rename to regtests/cp2k_2.6.2/input_preprocessing/tabseparator/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/tabseparator/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/tabseparator/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/tabseparator/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/tabseparator/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable/main.inp b/regtests/cp2k_2.6.2/input_preprocessing/variable/main.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable/main.inp rename to regtests/cp2k_2.6.2/input_preprocessing/variable/main.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/variable/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/variable/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multifile/global.inc b/regtests/cp2k_2.6.2/input_preprocessing/variable_multifile/global.inc similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multifile/global.inc rename to regtests/cp2k_2.6.2/input_preprocessing/variable_multifile/global.inc diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multifile/main.inp b/regtests/cp2k_2.6.2/input_preprocessing/variable_multifile/main.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multifile/main.inp rename to regtests/cp2k_2.6.2/input_preprocessing/variable_multifile/main.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multifile/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/variable_multifile/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multifile/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/variable_multifile/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multiple/PROJECT-nonbonded_nl_p0-1.out b/regtests/cp2k_2.6.2/input_preprocessing/variable_multiple/PROJECT-nonbonded_nl_p0-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multiple/PROJECT-nonbonded_nl_p0-1.out rename to regtests/cp2k_2.6.2/input_preprocessing/variable_multiple/PROJECT-nonbonded_nl_p0-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multiple/main.inp b/regtests/cp2k_2.6.2/input_preprocessing/variable_multiple/main.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multiple/main.inp rename to regtests/cp2k_2.6.2/input_preprocessing/variable_multiple/main.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multiple/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/variable_multiple/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_multiple/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/variable_multiple/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_redifinition/main.inp b/regtests/cp2k_2.6.2/input_preprocessing/variable_redifinition/main.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_redifinition/main.inp rename to regtests/cp2k_2.6.2/input_preprocessing/variable_redifinition/main.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_redifinition/unittest.out b/regtests/cp2k_2.6.2/input_preprocessing/variable_redifinition/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/input_preprocessing/variable_redifinition/unittest.out rename to regtests/cp2k_2.6.2/input_preprocessing/variable_redifinition/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/kinds/Si_bulk8-nonbonded_nl_p0-1.out b/regtests/cp2k_2.6.2/kinds/Si_bulk8-nonbonded_nl_p0-1.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/kinds/Si_bulk8-nonbonded_nl_p0-1.out rename to regtests/cp2k_2.6.2/kinds/Si_bulk8-nonbonded_nl_p0-1.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/kinds/si_bulk8.inp b/regtests/cp2k_2.6.2/kinds/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/kinds/si_bulk8.inp rename to regtests/cp2k_2.6.2/kinds/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/kinds/unittest.out b/regtests/cp2k_2.6.2/kinds/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/kinds/unittest.out rename to regtests/cp2k_2.6.2/kinds/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md-1.cell b/regtests/cp2k_2.6.2/md/npt/H2O-md-1.cell similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md-1.cell rename to regtests/cp2k_2.6.2/md/npt/H2O-md-1.cell diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md-1.ener b/regtests/cp2k_2.6.2/md/npt/H2O-md-1.ener similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md-1.ener rename to regtests/cp2k_2.6.2/md/npt/H2O-md-1.ener diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md-pos-1.xyz b/regtests/cp2k_2.6.2/md/npt/H2O-md-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md-pos-1.xyz rename to regtests/cp2k_2.6.2/md/npt/H2O-md-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md.inp b/regtests/cp2k_2.6.2/md/npt/H2O-md.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/H2O-md.inp rename to regtests/cp2k_2.6.2/md/npt/H2O-md.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/unittest.out b/regtests/cp2k_2.6.2/md/npt/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/npt/unittest.out rename to regtests/cp2k_2.6.2/md/npt/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-1.cell b/regtests/cp2k_2.6.2/md/nve/H2O-32-1.cell similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-1.cell rename to regtests/cp2k_2.6.2/md/nve/H2O-32-1.cell diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-1.ener b/regtests/cp2k_2.6.2/md/nve/H2O-32-1.ener similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-1.ener rename to regtests/cp2k_2.6.2/md/nve/H2O-32-1.ener diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-1.stress b/regtests/cp2k_2.6.2/md/nve/H2O-32-1.stress similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-1.stress rename to regtests/cp2k_2.6.2/md/nve/H2O-32-1.stress diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-frc-1.xyz b/regtests/cp2k_2.6.2/md/nve/H2O-32-frc-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-frc-1.xyz rename to regtests/cp2k_2.6.2/md/nve/H2O-32-frc-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-pos-1.xyz b/regtests/cp2k_2.6.2/md/nve/H2O-32-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-pos-1.xyz rename to regtests/cp2k_2.6.2/md/nve/H2O-32-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-vel-1.xyz b/regtests/cp2k_2.6.2/md/nve/H2O-32-vel-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32-vel-1.xyz rename to regtests/cp2k_2.6.2/md/nve/H2O-32-vel-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32.inp b/regtests/cp2k_2.6.2/md/nve/H2O-32.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/H2O-32.inp rename to regtests/cp2k_2.6.2/md/nve/H2O-32.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/unittest.out b/regtests/cp2k_2.6.2/md/nve/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nve/unittest.out rename to regtests/cp2k_2.6.2/md/nve/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/H2O-md-1.ener b/regtests/cp2k_2.6.2/md/nvt/H2O-md-1.ener similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/H2O-md-1.ener rename to regtests/cp2k_2.6.2/md/nvt/H2O-md-1.ener diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/H2O-md-pos-1.xyz b/regtests/cp2k_2.6.2/md/nvt/H2O-md-pos-1.xyz similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/H2O-md-pos-1.xyz rename to regtests/cp2k_2.6.2/md/nvt/H2O-md-pos-1.xyz diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/H2O-md.inp b/regtests/cp2k_2.6.2/md/nvt/H2O-md.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/H2O-md.inp rename to regtests/cp2k_2.6.2/md/nvt/H2O-md.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/unittest.out b/regtests/cp2k_2.6.2/md/nvt/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/md/nvt/unittest.out rename to regtests/cp2k_2.6.2/md/nvt/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/ad/ad.inp b/regtests/cp2k_2.6.2/sic/ad/ad.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/ad/ad.inp rename to regtests/cp2k_2.6.2/sic/ad/ad.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/ad/unittest.out b/regtests/cp2k_2.6.2/sic/ad/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/ad/unittest.out rename to regtests/cp2k_2.6.2/sic/ad/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/explicit_orbitals/explicit_orbitals.inp b/regtests/cp2k_2.6.2/sic/explicit_orbitals/explicit_orbitals.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/explicit_orbitals/explicit_orbitals.inp rename to regtests/cp2k_2.6.2/sic/explicit_orbitals/explicit_orbitals.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/explicit_orbitals/unittest.out b/regtests/cp2k_2.6.2/sic/explicit_orbitals/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/explicit_orbitals/unittest.out rename to regtests/cp2k_2.6.2/sic/explicit_orbitals/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_spz/mauri_spz.inp b/regtests/cp2k_2.6.2/sic/mauri_spz/mauri_spz.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_spz/mauri_spz.inp rename to regtests/cp2k_2.6.2/sic/mauri_spz/mauri_spz.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_spz/unittest.out b/regtests/cp2k_2.6.2/sic/mauri_spz/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_spz/unittest.out rename to regtests/cp2k_2.6.2/sic/mauri_spz/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_us/mauri_us.inp b/regtests/cp2k_2.6.2/sic/mauri_us/mauri_us.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_us/mauri_us.inp rename to regtests/cp2k_2.6.2/sic/mauri_us/mauri_us.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_us/unittest.out b/regtests/cp2k_2.6.2/sic/mauri_us/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/mauri_us/unittest.out rename to regtests/cp2k_2.6.2/sic/mauri_us/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/no/no.inp b/regtests/cp2k_2.6.2/sic/no/no.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/no/no.inp rename to regtests/cp2k_2.6.2/sic/no/no.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/sic/no/unittest.out b/regtests/cp2k_2.6.2/sic/no/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/sic/no/unittest.out rename to regtests/cp2k_2.6.2/sic/no/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/analytical/si_bulk8.inp b/regtests/cp2k_2.6.2/stress_tensor/analytical/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/analytical/si_bulk8.inp rename to regtests/cp2k_2.6.2/stress_tensor/analytical/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/analytical/unittest.out b/regtests/cp2k_2.6.2/stress_tensor/analytical/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/analytical/unittest.out rename to regtests/cp2k_2.6.2/stress_tensor/analytical/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_analytical/si_bulk8.inp b/regtests/cp2k_2.6.2/stress_tensor/diagonal_analytical/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_analytical/si_bulk8.inp rename to regtests/cp2k_2.6.2/stress_tensor/diagonal_analytical/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_analytical/unittest.out b/regtests/cp2k_2.6.2/stress_tensor/diagonal_analytical/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_analytical/unittest.out rename to regtests/cp2k_2.6.2/stress_tensor/diagonal_analytical/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_numerical/si_bulk8.inp b/regtests/cp2k_2.6.2/stress_tensor/diagonal_numerical/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_numerical/si_bulk8.inp rename to regtests/cp2k_2.6.2/stress_tensor/diagonal_numerical/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_numerical/unittest.out b/regtests/cp2k_2.6.2/stress_tensor/diagonal_numerical/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/diagonal_numerical/unittest.out rename to regtests/cp2k_2.6.2/stress_tensor/diagonal_numerical/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/none/si_bulk8.inp b/regtests/cp2k_2.6.2/stress_tensor/none/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/none/si_bulk8.inp rename to regtests/cp2k_2.6.2/stress_tensor/none/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/none/unittest.out b/regtests/cp2k_2.6.2/stress_tensor/none/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/none/unittest.out rename to regtests/cp2k_2.6.2/stress_tensor/none/unittest.out diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/numerical/si_bulk8.inp b/regtests/cp2k_2.6.2/stress_tensor/numerical/si_bulk8.inp similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/numerical/si_bulk8.inp rename to regtests/cp2k_2.6.2/stress_tensor/numerical/si_bulk8.inp diff --git a/regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/numerical/unittest.out b/regtests/cp2k_2.6.2/stress_tensor/numerical/unittest.out similarity index 100% rename from regtests/cp2k_2.6.2/cp2k_2.6.2/stress_tensor/numerical/unittest.out rename to regtests/cp2k_2.6.2/stress_tensor/numerical/unittest.out diff --git a/regtests/cp2k_2.6.2/regtests.py b/regtests/regtests.py similarity index 100% rename from regtests/cp2k_2.6.2/regtests.py rename to regtests/regtests.py