Uses now a folder instead of file-prefixes
  Closes #3