Possibility to choose folder name instead of date.now(): Little refactoring