Add possibility to keep picture dir structure