Harmonize behavior for hierarchic and flat naming strategy

[t-ober]

Within the hierarchic naming strategy we create a folder with the grid name in the base directory so the actual base directory is different as when dealing with a flat grid.

Here is a code example. Notice that we therefore build the csv file sink in a different way in both cases. I think that should me harmonized by probably removing the gridname folder in the hierarchic version.

      val csvSink = if (simbenchConfig.io.output.csv.directoryHierarchy) {
        new CsvFileSink(
          baseTargetDirectory,
          new FileNamingStrategy(
            new EntityPersistenceNamingStrategy(),
            new DefaultDirectoryHierarchy(baseTargetDirectory, simbenchCode)
          ),
          false,
          simbenchConfig.io.output.csv.separator
        )
      } else {
        new CsvFileSink(
          baseTargetDirectory + simbenchCode,
          new FileNamingStrategy(),
          false,
          simbenchConfig.io.output.csv.separator
        )
      }