Separating real-time directory preparation from data generation.
Merge remote-tracking branch 'origin/master'